From aa5618bf09fcbb9f8de3d0a4a733ec6473829122 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Sat, 9 Aug 2025 15:15:50 +0200 Subject: [PATCH] Update ruby to v3 (and bundler to 2.7.1) (#3046) * Update .ruby-version * Update .ruby-version * Update Podfile.lock * Do "bundle update --bundler" * Do "bundle update" * Patch fastlane for uby 3.4 * Downgrade to ruby 3.3 * Revert "Downgrade to ruby 3.3" This reverts commit 488fd163ec645fda116c6cd5938d67754f18744a. * Add generic platform ruby * Do "bundle update --ruby" * Update Gemfile --- .ruby-version | 2 +- Gemfile | 4 ++++ Gemfile.lock | 54 ++++++++++++++++++++++++++++----------------------- 3 files changed, 35 insertions(+), 25 deletions(-) diff --git a/.ruby-version b/.ruby-version index 5b013b97d..4f5e69734 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.6 \ No newline at end of file +3.4.5 diff --git a/Gemfile b/Gemfile index 6c1dd76cd..fb0573443 100644 --- a/Gemfile +++ b/Gemfile @@ -13,5 +13,9 @@ gem "xcodeproj", "< 1.26.0" gem "fastlane" # Temporary workaround for https://github.com/fastlane/fastlane/issues/26682 gem "fastlane-sirp", git: "https://github.com/appbot/fastlane-sirp.git", ref: "sysrandom_fix" +# Currently fastlane support for ruby 3.4.x is not finished, so we need to add +# this here because fastlane does not specifically add this dependency. +gem "abbrev" + gem "nokogiri" gem "rubocop" diff --git a/Gemfile.lock b/Gemfile.lock index cb30f993e..7ab033d0b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,19 +12,19 @@ GEM base64 nkf rexml - activesupport (7.1.5.1) + abbrev (0.1.2) + activesupport (7.2.2.1) base64 benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) logger (>= 1.4.2) minitest (>= 5.1) - mutex_m securerandom (>= 0.3) - tzinfo (~> 2.0) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) algoliasearch (1.27.5) @@ -34,19 +34,20 @@ GEM ast (2.4.3) atomos (0.1.3) aws-eventstream (1.4.0) - aws-partitions (1.1125.0) - aws-sdk-core (3.226.2) + aws-partitions (1.1143.0) + aws-sdk-core (3.229.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) base64 + bigdecimal jmespath (~> 1, >= 1.6.1) logger - aws-sdk-kms (1.106.0) - aws-sdk-core (~> 3, >= 3.225.0) + aws-sdk-kms (1.110.0) + aws-sdk-core (~> 3, >= 3.228.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.192.0) - aws-sdk-core (~> 3, >= 3.225.0) + aws-sdk-s3 (1.196.1) + aws-sdk-core (~> 3, >= 3.228.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) aws-sigv4 (1.12.1) @@ -182,6 +183,7 @@ GEM xcpretty (~> 0.4.1) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) ffi (1.17.2) + ffi (1.17.2-arm64-darwin) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -201,12 +203,12 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-storage_v1 (0.31.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.7.1) + google-cloud-core (1.8.0) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.4.0) + google-cloud-errors (1.5.0) google-cloud-storage (1.47.0) addressable (~> 2.8) digest-crc (~> 0.4) @@ -229,7 +231,7 @@ GEM i18n (1.14.7) concurrent-ruby (~> 1.0) jmespath (1.6.2) - json (2.12.2) + json (2.13.2) jwt (2.10.2) base64 language_server-protocol (3.17.0.5) @@ -240,7 +242,7 @@ GEM mini_portile2 (2.8.9) minitest (5.25.5) molinillo (0.8.0) - multi_json (1.15.0) + multi_json (1.17.0) multipart-post (2.4.1) mutex_m (0.3.0) nanaimo (0.3.0) @@ -248,13 +250,15 @@ GEM naturally (2.3.0) netrc (0.11.0) nkf (0.2.0) - nokogiri (1.15.7) + nokogiri (1.18.9) mini_portile2 (~> 2.8.2) racc (~> 1.4) + nokogiri (1.18.9-arm64-darwin) + racc (~> 1.4) optparse (0.6.0) os (1.1.4) parallel (1.27.0) - parser (3.3.8.0) + parser (3.3.9.0) ast (~> 2.4.1) racc plist (3.7.2) @@ -263,7 +267,7 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.3.0) - regexp_parser (2.10.0) + regexp_parser (2.11.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -271,7 +275,7 @@ GEM retriable (3.1.2) rexml (3.4.1) rouge (3.28.0) - rubocop (1.78.0) + rubocop (1.79.2) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -279,19 +283,19 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.45.1, < 2.0) + rubocop-ast (>= 1.46.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.45.1) + rubocop-ast (1.46.0) parser (>= 3.3.7.2) prism (~> 1.4) ruby-macho (2.5.1) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) rubyzip (2.4.1) - securerandom (0.3.2) + securerandom (0.4.1) security (0.1.5) - signet (0.19.0) + signet (0.20.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -327,9 +331,11 @@ GEM xcpretty (~> 0.2, >= 0.0.7) PLATFORMS + arm64-darwin-24 ruby DEPENDENCIES + abbrev activesupport (>= 6.1.7.5, != 7.1.0) cocoapods (>= 1.13, != 1.15.1, != 1.15.0) concurrent-ruby (< 1.3.4) @@ -340,7 +346,7 @@ DEPENDENCIES xcodeproj (< 1.26.0) RUBY VERSION - ruby 2.7.5p203 + ruby 3.4.5p51 BUNDLED WITH - 2.4.13 + 2.7.1