From 17be073116c0beb0d16e835f3db9f5327efa0305 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 11 Jun 2026 12:07:40 +1000 Subject: [PATCH 1/5] Use Ruby 3.4.9 and re-bundle --- .ruby-version | 3 +-- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.ruby-version b/.ruby-version index 19ef286ee..7bcbb3808 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1,2 +1 @@ -3.2.2 - +3.4.9 diff --git a/Gemfile.lock b/Gemfile.lock index 009325290..6a03e39b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -453,4 +453,4 @@ DEPENDENCIES yard BUNDLED WITH - 2.6.8 + 2.7.2 From a98c39d1e81f4eb1dc42a9742e046755a6d2abb3 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 11 Jun 2026 12:12:24 +1000 Subject: [PATCH 2/5] Use Xcode 27.0 beta in CI with new Ruby support --- .buildkite/shared-pipeline-vars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/shared-pipeline-vars b/.buildkite/shared-pipeline-vars index d455cab46..58d56ada2 100644 --- a/.buildkite/shared-pipeline-vars +++ b/.buildkite/shared-pipeline-vars @@ -1,6 +1,6 @@ #!/bin/bash -export IMAGE_ID="xcode-26.1.1" +export IMAGE_ID="xcode-27.0-beta" export CI_TOOLKIT="automattic/a8c-ci-toolkit#5.7.0" export DOCKER_PLUGIN="docker#v5.13.0" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" From 362773dcb03c2340ea85171fd8b968c6202563c2 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 11 Jun 2026 12:12:50 +1000 Subject: [PATCH 3/5] Address a ShellCheck issue --- .buildkite/shared-pipeline-vars | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.buildkite/shared-pipeline-vars b/.buildkite/shared-pipeline-vars index 58d56ada2..a7420686c 100644 --- a/.buildkite/shared-pipeline-vars +++ b/.buildkite/shared-pipeline-vars @@ -4,5 +4,6 @@ export IMAGE_ID="xcode-27.0-beta" export CI_TOOLKIT="automattic/a8c-ci-toolkit#5.7.0" export DOCKER_PLUGIN="docker#v5.13.0" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -export RUBY_VERSION="$(cat "$SCRIPT_DIR/../.ruby-version")" +RUBY_VERSION="$(cat "$SCRIPT_DIR/../.ruby-version")" +export RUBY_VERSION export DOCKER_RUBY_IMAGE="public.ecr.aws/docker/library/ruby:$RUBY_VERSION" From 5a35628c5b88a61d85e44515e6f48491d6eb3311 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 11 Jun 2026 12:14:12 +1000 Subject: [PATCH 4/5] Remove Bundler dependency and use Gemfile for dev Removing the Bundler dependency definition allows us to use the latest bundler version (4.x vs 2.x). Additionally, it is no longer recommended to use the dev dependencies API, it's best to use Gemfile instead. See https://github.com/rubygems/bundler/pull/7222 --- Gemfile | 17 ++++++++++++++--- Gemfile.lock | 3 +-- fastlane-plugin-wpmreleasetoolkit.gemspec | 14 -------------- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/Gemfile b/Gemfile index b38013f18..dc954f2b6 100644 --- a/Gemfile +++ b/Gemfile @@ -4,12 +4,23 @@ source('https://rubygems.org') gemspec +# Only needed for specs (Time.use_zone, String#to_time, Hash#slice!) +gem 'activesupport', '~> 8.1' gem 'buildkite-test_collector', '~> 2.3' gem 'codecov', require: false gem 'danger-dangermattic', '~> 1.0' -gem 'webmock', require: false -gem 'yard' - # Security: https://github.com/lostisland/faraday/pull/1665 # Faraday 2.0 is not compatible with Fastlane gem 'faraday', '~> 1.10', '>= 1.10.5' +# Use at least Fastlane 2.210.0 to ensure compatibility with the Xcode 14 toolchain +# See https://github.com/fastlane/fastlane/releases/tag/2.210.0 +gem 'fastlane', '~> 2.210' +gem 'pry', '~> 0.12.2' +gem 'rmagick', '~> 5.3' +gem 'rspec', '~> 3.8' +gem 'rspec_junit_formatter', '~> 0.4.1' +gem 'rubocop', '~> 1.65' +gem 'rubocop-rspec', '3.0' +gem 'simplecov', '~> 0.16.1' +gem 'webmock', require: false +gem 'yard' diff --git a/Gemfile.lock b/Gemfile.lock index 6a03e39b5..45d67af04 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -436,7 +436,6 @@ PLATFORMS DEPENDENCIES activesupport (~> 8.1) buildkite-test_collector (~> 2.3) - bundler (~> 2.0) codecov danger-dangermattic (~> 1.0) faraday (~> 1.10, >= 1.10.5) @@ -453,4 +452,4 @@ DEPENDENCIES yard BUNDLED WITH - 2.7.2 + 4.0.14 diff --git a/fastlane-plugin-wpmreleasetoolkit.gemspec b/fastlane-plugin-wpmreleasetoolkit.gemspec index a0adb7a6a..0e8dcae71 100644 --- a/fastlane-plugin-wpmreleasetoolkit.gemspec +++ b/fastlane-plugin-wpmreleasetoolkit.gemspec @@ -45,18 +45,4 @@ Gem::Specification.new do |spec| # `google-cloud-storage` is required by fastlane, but we pin it in case it's not in the future spec.add_dependency 'google-cloud-storage', '~> 1.31' - - # Only needed for specs (Time.use_zone, String#to_time, Hash#slice!) - spec.add_development_dependency 'activesupport', '~> 8.1' - spec.add_development_dependency 'bundler', '~> 2.0' - # Use at least Fastlane 2.210.0 to ensure compatibility with the Xcode 14 toolchain - # See https://github.com/fastlane/fastlane/releases/tag/2.210.0 - spec.add_development_dependency 'fastlane', '~> 2.210' - spec.add_development_dependency 'pry', '~> 0.12.2' - spec.add_development_dependency 'rmagick', '~> 5.3' - spec.add_development_dependency 'rspec', '~> 3.8' - spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1' - spec.add_development_dependency 'rubocop', '~> 1.65' - spec.add_development_dependency 'rubocop-rspec', '3.0' - spec.add_development_dependency 'simplecov', '~> 0.16.1' end From fa05c27d2dc333138490c7a07485ade6fed9435c Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 11 Jun 2026 12:27:50 +1000 Subject: [PATCH 5/5] Use latest Fastlane --- Gemfile | 4 +--- Gemfile.lock | 10 +++++----- fastlane-plugin-wpmreleasetoolkit.gemspec | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index dc954f2b6..2c7c50996 100644 --- a/Gemfile +++ b/Gemfile @@ -11,10 +11,8 @@ gem 'codecov', require: false gem 'danger-dangermattic', '~> 1.0' # Security: https://github.com/lostisland/faraday/pull/1665 # Faraday 2.0 is not compatible with Fastlane +# See also https://github.com/fastlane/fastlane/issues/21334 gem 'faraday', '~> 1.10', '>= 1.10.5' -# Use at least Fastlane 2.210.0 to ensure compatibility with the Xcode 14 toolchain -# See https://github.com/fastlane/fastlane/releases/tag/2.210.0 -gem 'fastlane', '~> 2.210' gem 'pry', '~> 0.12.2' gem 'rmagick', '~> 5.3' gem 'rspec', '~> 3.8' diff --git a/Gemfile.lock b/Gemfile.lock index 45d67af04..da239d1fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,7 +6,7 @@ PATH chroma (= 0.2.0) diffy (~> 3.3) dotenv (~> 2.8) - fastlane (~> 2.235) + fastlane (~> 2.236) gettext (~> 3.5) git (~> 1.3) google-cloud-storage (~> 1.31) @@ -158,7 +158,7 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.4.1) - fastlane (2.235.0) + fastlane (2.236.1) CFPropertyList (>= 2.3, < 5.0.0) abbrev (~> 0.1) addressable (>= 2.8, < 3.0.0) @@ -187,9 +187,10 @@ GEM highline (~> 2.0) http-cookie (~> 1.0.5) json (< 3.0.0) - jwt (>= 2.1.0, < 4) + jwt (>= 2.10.3, < 4) logger (>= 1.6, < 2.0) mini_magick (>= 4.9.4, < 5.0.0) + multi_json (~> 1.12) multipart-post (>= 2.0.0, < 3.0.0) mutex_m (~> 0.3) naturally (~> 2.2) @@ -439,7 +440,6 @@ DEPENDENCIES codecov danger-dangermattic (~> 1.0) faraday (~> 1.10, >= 1.10.5) - fastlane (~> 2.210) fastlane-plugin-wpmreleasetoolkit! pry (~> 0.12.2) rmagick (~> 5.3) @@ -452,4 +452,4 @@ DEPENDENCIES yard BUNDLED WITH - 4.0.14 + 4.0.14 diff --git a/fastlane-plugin-wpmreleasetoolkit.gemspec b/fastlane-plugin-wpmreleasetoolkit.gemspec index 0e8dcae71..10be1bd9f 100644 --- a/fastlane-plugin-wpmreleasetoolkit.gemspec +++ b/fastlane-plugin-wpmreleasetoolkit.gemspec @@ -30,7 +30,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'chroma', '0.2.0' spec.add_dependency 'diffy', '~> 3.3' spec.add_dependency 'dotenv', '~> 2.8' - spec.add_dependency 'fastlane', '~> 2.235' + spec.add_dependency 'fastlane', '~> 2.236' spec.add_dependency 'gettext', '~> 3.5' spec.add_dependency 'git', '~> 1.3' spec.add_dependency 'java-properties', '~> 0.3.0'