From 6b7e7514407b6a52a178c404e40e19b913da6018 Mon Sep 17 00:00:00 2001 From: Ian Maia Date: Tue, 7 Oct 2025 18:12:50 +0200 Subject: [PATCH 1/2] Update release-toolkit to fix milestone moving issue --- Gemfile | 4 +++- Gemfile.lock | 18 +++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index abf3d9c2fa18..24d64a6eea99 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,9 @@ gem 'rubocop', '~> 1.65' ### Fastlane Plugins -gem 'fastlane-plugin-wpmreleasetoolkit', '~> 12.3' +# The '>= 13.5.1' after '~> 13.5' ensures that we resolve to any version compatible with 13.5 starting from 13.5.1 +# We need 13.5.1 because of a fix in fetching issues / PRs with a fine-grained GitHub token +gem 'fastlane-plugin-wpmreleasetoolkit', '~> 13.5', '>= 13.5.1' # gem 'fastlane-plugin-wpmreleasetoolkit', path: '../../release-toolkit' # gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', branch: '' diff --git a/Gemfile.lock b/Gemfile.lock index 291b0af22424..bc52f7e17880 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,7 +5,7 @@ GEM base64 nkf rexml - activesupport (8.0.2) + activesupport (8.0.3) base64 benchmark (>= 0.3) bigdecimal @@ -43,8 +43,8 @@ GEM aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) - benchmark (0.4.0) - bigdecimal (3.1.9) + benchmark (0.4.1) + bigdecimal (3.3.0) buildkit (1.6.1) sawyer (>= 0.6) chroma (0.2.0) @@ -58,7 +58,7 @@ GEM commander (4.6.0) highline (~> 2.0.0) concurrent-ruby (1.3.5) - connection_pool (2.5.3) + connection_pool (2.5.4) cork (0.3.0) colored2 (~> 3.1) danger (9.5.1) @@ -86,12 +86,12 @@ GEM danger rubocop (~> 1.0) declarative (0.0.20) - diffy (3.4.3) + diffy (3.4.4) digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) dotenv (2.8.1) - drb (2.2.1) + drb (2.2.3) emoji_regex (3.2.3) excon (0.112.0) faraday (1.10.4) @@ -167,7 +167,7 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.4.1) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) - fastlane-plugin-wpmreleasetoolkit (12.5.0) + fastlane-plugin-wpmreleasetoolkit (13.5.1) activesupport (>= 6.1.7.1) buildkit (~> 1.5) chroma (= 0.2.0) @@ -335,7 +335,7 @@ GEM concurrent-ruby (~> 1.0) uber (0.1.0) unicode-display_width (2.6.0) - uri (1.0.3) + uri (1.0.4) word_wrap (1.0.0) xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) @@ -355,7 +355,7 @@ PLATFORMS DEPENDENCIES danger-dangermattic (~> 1.2) fastlane (~> 2.216) - fastlane-plugin-wpmreleasetoolkit (~> 12.3) + fastlane-plugin-wpmreleasetoolkit (~> 13.5, >= 13.5.1) nokogiri rmagick (~> 4.1) rubocop (~> 1.65) From 90040b42b14cffd9da2a8c3c56ed5557cd0e4a67 Mon Sep 17 00:00:00 2001 From: Ian Maia Date: Wed, 8 Oct 2025 16:17:59 +0200 Subject: [PATCH 2/2] Remove `>= 13.5.1` requirement and clean Gemfile and run `bundle update fastlane-plugin-wpmreleasetoolkit` h/t @AliSoftware https://github.com/woocommerce/woocommerce-android/pull/14715#discussion_r2412106440 --- Gemfile | 4 +--- Gemfile.lock | 49 +++++++++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/Gemfile b/Gemfile index 24d64a6eea99..4c4b0ee69a38 100644 --- a/Gemfile +++ b/Gemfile @@ -9,9 +9,7 @@ gem 'rubocop', '~> 1.65' ### Fastlane Plugins -# The '>= 13.5.1' after '~> 13.5' ensures that we resolve to any version compatible with 13.5 starting from 13.5.1 -# We need 13.5.1 because of a fix in fetching issues / PRs with a fine-grained GitHub token -gem 'fastlane-plugin-wpmreleasetoolkit', '~> 13.5', '>= 13.5.1' +gem 'fastlane-plugin-wpmreleasetoolkit', '~> 13.5' # gem 'fastlane-plugin-wpmreleasetoolkit', path: '../../release-toolkit' # gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', branch: '' diff --git a/Gemfile.lock b/Gemfile.lock index bc52f7e17880..d89ffd810d74 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -23,26 +23,27 @@ GEM artifactory (3.0.17) ast (2.4.3) atomos (0.1.3) - aws-eventstream (1.3.2) - aws-partitions (1.1096.0) - aws-sdk-core (3.223.0) + aws-eventstream (1.4.0) + aws-partitions (1.1169.0) + aws-sdk-core (3.233.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.100.0) - aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-kms (1.113.0) + aws-sdk-core (~> 3, >= 3.231.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.185.0) - aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-s3 (1.199.1) + aws-sdk-core (~> 3, >= 3.231.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.11.0) + aws-sigv4 (1.12.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) - base64 (0.2.0) + base64 (0.3.0) benchmark (0.4.1) bigdecimal (3.3.0) buildkit (1.6.1) @@ -110,12 +111,12 @@ GEM faraday (>= 0.8.0) http-cookie (~> 1.0.0) faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) + faraday-em_synchrony (1.0.1) faraday-excon (1.1.0) faraday-http-cache (2.5.1) faraday (>= 0.8) faraday-httpclient (1.0.1) - faraday-multipart (1.1.0) + faraday-multipart (1.1.1) multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) @@ -125,7 +126,7 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.4.0) - fastlane (2.227.1) + fastlane (2.228.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -235,8 +236,8 @@ GEM concurrent-ruby (~> 1.0) java-properties (0.3.0) jmespath (1.6.2) - json (2.11.3) - jwt (2.10.1) + json (2.15.1) + jwt (2.10.2) base64 kramdown (2.5.1) rexml (>= 3.3.9) @@ -248,15 +249,15 @@ GEM mini_magick (4.13.2) mini_mime (1.1.5) mini_portile2 (2.8.9) - minitest (5.25.5) - multi_json (1.15.0) + minitest (5.26.0) + multi_json (1.17.0) multipart-post (2.4.1) mutex_m (0.3.0) nanaimo (0.4.0) nap (1.1.0) - naturally (2.2.1) + naturally (2.3.0) nkf (0.2.0) - nokogiri (1.18.9) + nokogiri (1.18.10) mini_portile2 (~> 2.8.2) racc (~> 1.4) octokit (6.1.1) @@ -279,17 +280,17 @@ GEM public_suffix (6.0.2) racc (1.8.1) rainbow (3.1.1) - rake (13.2.1) + rake (13.3.0) rake-compiler (1.3.0) rake - rchardet (1.9.0) + rchardet (1.10.0) regexp_parser (2.10.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.4.1) + rexml (3.4.4) rmagick (4.3.0) rouge (3.28.0) rubocop (1.75.4) @@ -314,10 +315,10 @@ GEM faraday (>= 0.17.3, < 3) securerandom (0.4.1) security (0.1.5) - signet (0.20.0) + signet (0.21.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) - jwt (>= 1.5, < 3.0) + jwt (>= 1.5, < 4.0) multi_json (~> 1.10) simctl (1.6.10) CFPropertyList @@ -355,7 +356,7 @@ PLATFORMS DEPENDENCIES danger-dangermattic (~> 1.2) fastlane (~> 2.216) - fastlane-plugin-wpmreleasetoolkit (~> 13.5, >= 13.5.1) + fastlane-plugin-wpmreleasetoolkit (~> 13.5) nokogiri rmagick (~> 4.1) rubocop (~> 1.65)