diff --git a/benchmarks/.bundle/config b/benchmarks/.bundle/config deleted file mode 100644 index 848943bb5..000000000 --- a/benchmarks/.bundle/config +++ /dev/null @@ -1,2 +0,0 @@ -BUNDLE_PATH: "vendor/bundle" -BUNDLE_FORCE_RUBY_PLATFORM: 1 diff --git a/benchmarks/.ruby-version b/benchmarks/.ruby-version new file mode 100644 index 000000000..f9892605c --- /dev/null +++ b/benchmarks/.ruby-version @@ -0,0 +1 @@ +3.4.4 diff --git a/benchmarks/Gemfile.lock b/benchmarks/Gemfile.lock new file mode 100644 index 000000000..abbe46619 --- /dev/null +++ b/benchmarks/Gemfile.lock @@ -0,0 +1,137 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.8) + activesupport (7.2.3.1) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1, < 6) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + algoliasearch (1.27.5) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) + atomos (0.1.3) + base64 (0.3.0) + benchmark (0.5.0) + bigdecimal (4.1.1) + claide (1.1.0) + cocoapods (1.15.2) + addressable (~> 2.8) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.15.2) + cocoapods-deintegrate (>= 1.0.3, < 2.0) + cocoapods-downloader (>= 2.1, < 3.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.6.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (>= 2.3.0, < 3.0) + gh_inspector (~> 1.0) + molinillo (~> 0.8.0) + nap (~> 1.0) + ruby-macho (>= 2.3.0, < 3.0) + xcodeproj (>= 1.23.0, < 2.0) + cocoapods-core (1.15.2) + activesupport (>= 5.0, < 8) + addressable (~> 2.8) + algoliasearch (~> 1.0) + concurrent-ruby (~> 1.1) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + netrc (~> 0.11) + public_suffix (~> 4.0) + typhoeus (~> 1.0) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (2.1) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.2.0) + colored2 (3.1.2) + concurrent-ruby (1.3.3) + connection_pool (3.0.2) + drb (2.2.3) + escape (0.0.4) + ethon (0.18.0) + ffi (>= 1.15.0) + logger + ffi (1.17.4) + ffi (1.17.4-aarch64-linux-gnu) + ffi (1.17.4-aarch64-linux-musl) + ffi (1.17.4-arm-linux-gnu) + ffi (1.17.4-arm-linux-musl) + ffi (1.17.4-arm64-darwin) + ffi (1.17.4-x86-linux-gnu) + ffi (1.17.4-x86-linux-musl) + ffi (1.17.4-x86_64-darwin) + ffi (1.17.4-x86_64-linux-gnu) + ffi (1.17.4-x86_64-linux-musl) + fourflusher (2.3.1) + fuzzy_match (2.0.4) + gh_inspector (1.1.3) + httpclient (2.9.0) + mutex_m + i18n (1.14.8) + concurrent-ruby (~> 1.0) + json (2.19.3) + logger (1.7.0) + minitest (5.27.0) + molinillo (0.8.0) + mutex_m (0.3.0) + nanaimo (0.3.0) + nap (1.1.0) + netrc (0.11.0) + public_suffix (4.0.7) + rexml (3.4.4) + ruby-macho (2.5.1) + securerandom (0.4.1) + typhoeus (1.6.0) + ethon (>= 0.18.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + xcodeproj (1.25.1) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (>= 3.3.6, < 4.0) + +PLATFORMS + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-gnu + arm-linux-musl + arm64-darwin + ruby + x86-linux-gnu + x86-linux-musl + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl + +DEPENDENCIES + activesupport (>= 6.1.7.5, != 7.1.0) + cocoapods (>= 1.13, != 1.15.1, != 1.15.0) + concurrent-ruby (< 1.3.4) + xcodeproj (< 1.26.0) + +RUBY VERSION + ruby 3.4.4p34 + +BUNDLED WITH + 2.6.7 diff --git a/example-new-architecture/Gemfile b/example-new-architecture/Gemfile index 9e5cf5530..f7e6fc661 100644 --- a/example-new-architecture/Gemfile +++ b/example-new-architecture/Gemfile @@ -5,4 +5,5 @@ gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1' gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0' gem 'xcodeproj', '< 1.26.0' gem 'concurrent-ruby', '< 1.3.4' -gem 'rexml', '3.4.2' \ No newline at end of file +gem 'rexml', '3.4.2' +gem 'addressable', '>= 2.9.0' \ No newline at end of file diff --git a/example-new-architecture/Gemfile.lock b/example-new-architecture/Gemfile.lock index fab759cb8..a795dd115 100644 --- a/example-new-architecture/Gemfile.lock +++ b/example-new-architecture/Gemfile.lock @@ -10,8 +10,8 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) @@ -94,6 +94,7 @@ PLATFORMS DEPENDENCIES activesupport (>= 6.1.7.5, != 7.1.0) + addressable (>= 2.9.0) cocoapods (>= 1.13, != 1.15.1, != 1.15.0) concurrent-ruby (< 1.3.4) rexml (= 3.4.2) diff --git a/example/Gemfile b/example/Gemfile index 9e5cf5530..f7e6fc661 100644 --- a/example/Gemfile +++ b/example/Gemfile @@ -5,4 +5,5 @@ gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1' gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0' gem 'xcodeproj', '< 1.26.0' gem 'concurrent-ruby', '< 1.3.4' -gem 'rexml', '3.4.2' \ No newline at end of file +gem 'rexml', '3.4.2' +gem 'addressable', '>= 2.9.0' \ No newline at end of file diff --git a/example/Gemfile.lock b/example/Gemfile.lock index fab759cb8..a795dd115 100644 --- a/example/Gemfile.lock +++ b/example/Gemfile.lock @@ -10,8 +10,8 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) @@ -94,6 +94,7 @@ PLATFORMS DEPENDENCIES activesupport (>= 6.1.7.5, != 7.1.0) + addressable (>= 2.9.0) cocoapods (>= 1.13, != 1.15.1, != 1.15.0) concurrent-ruby (< 1.3.4) rexml (= 3.4.2) diff --git a/package.json b/package.json index c4252205c..1eef5e70c 100644 --- a/package.json +++ b/package.json @@ -87,15 +87,15 @@ "@yarnpkg/parsers/js-yaml": "3.14.2", "cosmiconfig@npm:5.2.1/js-yaml": "3.14.2", "front-matter@npm:4.0.2/js-yaml": "3.14.2", - "node-forge": "^1.3.1", + "node-forge": "^1.4.0", "cacache/glob": "^10.5.0", "@npmcli/arborist": "^9.1.8", "ejs": "3.1.10", "shell-quote": "^1.7.3", "cross-spawn": "7.0.5", - "fast-xml-parser": "4.5.4", - "axios": "1.13.5", - "basic-ftp": ">=5.2.0", + "fast-xml-parser": "4.5.5", + "axios": "1.15.0", + "basic-ftp": ">=5.2.2", "tar": ">=7.5.8", "ajv@^8.12.0": "8.18.0", "minimatch@9.0.3": "9.0.7", @@ -109,7 +109,7 @@ "minimatch@^9.0.5": "9.0.7", "minimatch@^10.0.3": "10.2.3", "minimatch@^10.1.1": "10.2.3", - "lodash": "4.17.23", + "lodash": "4.18.0", "qs": ">=6.14.2", "nanoid": "3.3.8", "send": "0.19.0", @@ -120,6 +120,11 @@ "on-headers": "1.1.0", "tmp": "0.2.4", "jws": "^4.0.1", - "handlebars": ">=4.7.9" + "handlebars": ">=4.7.9", + "@xmldom/xmldom": ">=0.8.12", + "yaml": ">=2.8.3", + "brace-expansion@^2.0.1": "2.0.3", + "brace-expansion@^5.0.2": "5.0.5", + "brace-expansion@^5.0.5": "5.0.5" } } diff --git a/yarn.lock b/yarn.lock index b7b4355f3..eb5f96dab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6111,10 +6111,10 @@ __metadata: languageName: node linkType: hard -"@xmldom/xmldom@npm:^0.8.8": - version: 0.8.10 - resolution: "@xmldom/xmldom@npm:0.8.10" - checksum: 4c136aec31fb3b49aaa53b6fcbfe524d02a1dc0d8e17ee35bd3bf35e9ce1344560481cd1efd086ad1a4821541482528672306d5e37cdbd187f33d7fadd3e2cf0 +"@xmldom/xmldom@npm:>=0.8.12": + version: 0.9.9 + resolution: "@xmldom/xmldom@npm:0.9.9" + checksum: 73bd69379f70b29cdef742eb834c299ef13268e9ce42ea6384a78ade1083c3e0c71c764019d3c8d860a76147c6c84b4cba5e6e5b2123ed2cd806d8621c4c9559 languageName: node linkType: hard @@ -6677,14 +6677,14 @@ __metadata: languageName: node linkType: hard -"axios@npm:1.13.5": - version: 1.13.5 - resolution: "axios@npm:1.13.5" +"axios@npm:1.15.0": + version: 1.15.0 + resolution: "axios@npm:1.15.0" dependencies: follow-redirects: ^1.15.11 form-data: ^4.0.5 - proxy-from-env: ^1.1.0 - checksum: 985024c4a32f837053f198f02a308fd6f8bfb4053a2f21e39e37992bc6d06917f008679c36b3e7f0f0c9060c85ffe37c61e58d2ac662595d68dc1b89cef78de8 + proxy-from-env: ^2.1.0 + checksum: 95a8455554867a083ab3772fcadba42a22ec4bb546dccc66011556d837a07e544ae006675a30a5c43453f3e37e7c0982e934cec482c06b75abead2a2c157448a languageName: node linkType: hard @@ -6921,10 +6921,10 @@ __metadata: languageName: node linkType: hard -"basic-ftp@npm:>=5.2.0": - version: 5.2.0 - resolution: "basic-ftp@npm:5.2.0" - checksum: c49c6ab8df3d80de85f38fb33f54839f4d4bd22ec31e7762fb18c7a9a3ac6ee196b841dd6278a1a8745c39fdf12c6eddcf0b8c92681fa01c92ea8a1951e83780 +"basic-ftp@npm:>=5.2.2": + version: 5.2.2 + resolution: "basic-ftp@npm:5.2.2" + checksum: 11234c0fd6b810ac3641acf3c03338ae8d0d0ca23aaeaa56204bae05b9dd6f93117312b6d729fde56c20c197711dbe5655363a8590c61f7efa399cb63b56e00d languageName: node linkType: hard @@ -7053,40 +7053,31 @@ __metadata: languageName: node linkType: hard -"brace-expansion@npm:^1.1.7": - version: 1.1.12 - resolution: "brace-expansion@npm:1.1.12" - dependencies: - balanced-match: ^1.0.0 - concat-map: 0.0.1 - checksum: 12cb6d6310629e3048cadb003e1aca4d8c9bb5c67c3c321bafdd7e7a50155de081f78ea3e0ed92ecc75a9015e784f301efc8132383132f4f7904ad1ac529c562 - languageName: node - linkType: hard - -"brace-expansion@npm:^2.0.1": - version: 2.0.2 - resolution: "brace-expansion@npm:2.0.2" +"brace-expansion@npm:2.0.3": + version: 2.0.3 + resolution: "brace-expansion@npm:2.0.3" dependencies: balanced-match: ^1.0.0 - checksum: 01dff195e3646bc4b0d27b63d9bab84d2ebc06121ff5013ad6e5356daa5a9d6b60fa26cf73c74797f2dc3fbec112af13578d51f75228c1112b26c790a87b0488 + checksum: e9dd66caaf0784126e1654f1bc19adb28f3ef86f39f2226f833f7700ec727c141f6cd85eaa47bacf3426beda01c9fbc3a2f28174cf59330dc9b58ffaf9e09d96 languageName: node linkType: hard -"brace-expansion@npm:^5.0.2": - version: 5.0.4 - resolution: "brace-expansion@npm:5.0.4" +"brace-expansion@npm:5.0.5": + version: 5.0.5 + resolution: "brace-expansion@npm:5.0.5" dependencies: balanced-match: ^4.0.2 - checksum: ded86c0f0b138734110d67437fee52c1f97bc19175644788b1d71afec2d87d405cf05424ce428f88ae3abe8e09e13ee55f2675534b38076ef70e1e583ed75686 + checksum: 4481b7ffa467b34c14e258167dbd8d9485a2d31d03060e8e8b38142dcde32cdc89c8f55b04d3ae7aae9304fa7eac1dfafd602787cf09c019cc45de3bb6950ffc languageName: node linkType: hard -"brace-expansion@npm:^5.0.5": - version: 5.0.5 - resolution: "brace-expansion@npm:5.0.5" +"brace-expansion@npm:^1.1.7": + version: 1.1.12 + resolution: "brace-expansion@npm:1.1.12" dependencies: - balanced-match: ^4.0.2 - checksum: 4481b7ffa467b34c14e258167dbd8d9485a2d31d03060e8e8b38142dcde32cdc89c8f55b04d3ae7aae9304fa7eac1dfafd602787cf09c019cc45de3bb6950ffc + balanced-match: ^1.0.0 + concat-map: 0.0.1 + checksum: 12cb6d6310629e3048cadb003e1aca4d8c9bb5c67c3c321bafdd7e7a50155de081f78ea3e0ed92ecc75a9015e784f301efc8132383132f4f7904ad1ac529c562 languageName: node linkType: hard @@ -9691,14 +9682,14 @@ __metadata: languageName: node linkType: hard -"fast-xml-parser@npm:4.5.4": - version: 4.5.4 - resolution: "fast-xml-parser@npm:4.5.4" +"fast-xml-parser@npm:4.5.5": + version: 4.5.5 + resolution: "fast-xml-parser@npm:4.5.5" dependencies: strnum: ^1.0.5 bin: fxparser: src/cli/cli.js - checksum: 29db513a5f0ad5ac33691c27d67315ee22e041b5e8fa5982f8bccf46af400e35c576c17f3087f1b8d4cd81fa91519f5fda4b2a31441ff1bf7596ecc5e934f44d + checksum: bfbe4986fd7e00cd577039cb200cc6d34102f3baf839ba98cad4cc4ff777264d9d0630bc128e78c1a9f0de3ec72a278a479fe1cf4345719e23ea86b49a0192fc languageName: node linkType: hard @@ -12874,10 +12865,10 @@ __metadata: languageName: node linkType: hard -"lodash@npm:4.17.23": - version: 4.17.23 - resolution: "lodash@npm:4.17.23" - checksum: 7daad39758a72872e94651630fbb54ba76868f904211089721a64516ce865506a759d9ad3d8ff22a2a49a50a09db5d27c36f22762d21766e47e3ba918d6d7bab +"lodash@npm:4.18.0": + version: 4.18.0 + resolution: "lodash@npm:4.18.0" + checksum: 220e1b40f80425cbde3fcdd0915c0ef87e29cbce5fe9a6c82ad80a1d50cfab713eed7dc97a2f7697b11760796ec45cd1d9daf9767a9bee26da5502af487c9f45 languageName: node linkType: hard @@ -14000,10 +13991,10 @@ __metadata: languageName: node linkType: hard -"node-forge@npm:^1.3.1": - version: 1.3.3 - resolution: "node-forge@npm:1.3.3" - checksum: 045b650d61eeba57588744b7be4671044e83871e2c4dc5d4a38a8eb5af7e55fa790c93ba9db1d1ee14a567d25fde41e97a5132e076cff738622e0916c77b48d2 +"node-forge@npm:^1.4.0": + version: 1.4.0 + resolution: "node-forge@npm:1.4.0" + checksum: c97c634d4d483aae815677db5b1bd14bfea4d873ab48817e020610a2b4d8bc6b3e77994860189b44151ff8e0842c0c4ba6faa80b9a6e6fbd6989865e8eb80b96 languageName: node linkType: hard @@ -15494,6 +15485,13 @@ __metadata: languageName: node linkType: hard +"proxy-from-env@npm:^2.1.0": + version: 2.1.0 + resolution: "proxy-from-env@npm:2.1.0" + checksum: b106ad790f26d47ba4791af3fe8cba5c8d35d85020119c82c05b413eb11b3ab97d2393ecaed51bca97c2788fa256408283dfeb4d970b2ebcae6702310f064e7e + languageName: node + linkType: hard + "pump@npm:^3.0.0": version: 3.0.3 resolution: "pump@npm:3.0.3" @@ -18759,21 +18757,12 @@ __metadata: languageName: node linkType: hard -"yaml@npm:^2.2.1, yaml@npm:^2.2.2": - version: 2.8.0 - resolution: "yaml@npm:2.8.0" - bin: - yaml: bin.mjs - checksum: 66f103ca5a2f02dac0526895cc7ae7626d91aa8c43aad6fdcff15edf68b1199be4012140b390063877913441aaa5288fdf57eca30e06268a8282dd741525e626 - languageName: node - linkType: hard - -"yaml@npm:^2.6.0": - version: 2.8.1 - resolution: "yaml@npm:2.8.1" +"yaml@npm:>=2.8.3": + version: 2.8.3 + resolution: "yaml@npm:2.8.3" bin: yaml: bin.mjs - checksum: 35b46150d48bc1da2fd5b1521a48a4fa36d68deaabe496f3c3fa9646d5796b6b974f3930a02c4b5aee6c85c860d7d7f79009416724465e835f40b87898c36de4 + checksum: 6e33fa9a8a31a8ed7472fbafc83e587956611594ca6ae4dbc1ab0c8a3ad4f6ff061a9842ca34bbb2e7affa9df93322cf0d132fd34338bec308d984495432c905 languageName: node linkType: hard