From f2cae649724553f267f0b839fffe388138ca7e17 Mon Sep 17 00:00:00 2001 From: Philipp Hofmann Date: Fri, 22 Nov 2024 10:44:52 +0100 Subject: [PATCH 1/4] Revert "Bump CocoaPods from 1.14.2 to 1.16.2 (#565)" This reverts commit c26e046bd4c51839fd8cc9921afec3ec5cdb2091. --- Gemfile | 2 +- Gemfile.lock | 66 +++++++++++++++++++--------------------------------- 2 files changed, 25 insertions(+), 43 deletions(-) diff --git a/Gemfile b/Gemfile index 93ff5d27..20cf30bf 100644 --- a/Gemfile +++ b/Gemfile @@ -2,4 +2,4 @@ # Pin CocoaPods Version to avoid that bugs in CocoaPods like # https://github.com/CocoaPods/CocoaPods/issues/12081 break our release # workflow. -gem "cocoapods", "= 1.16.2" +gem "cocoapods", "= 1.14.2" diff --git a/Gemfile.lock b/Gemfile.lock index de1979c3..e5f1ec68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,38 +1,25 @@ GEM - remote: https://rubygems.org/ specs: - CFPropertyList (3.0.7) - base64 - nkf + CFPropertyList (3.0.6) rexml - activesupport (7.2.2) - base64 - benchmark (>= 0.3) - bigdecimal - concurrent-ruby (~> 1.0, >= 1.3.1) - connection_pool (>= 2.2.5) - drb + activesupport (7.0.8) + concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) - logger (>= 1.4.2) minitest (>= 5.1) - securerandom (>= 0.3) - tzinfo (~> 2.0, >= 2.0.5) - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) + tzinfo (~> 2.0) + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) - base64 (0.2.0) - benchmark (0.4.0) - bigdecimal (3.1.8) claide (1.1.0) - cocoapods (1.16.2) + cocoapods (1.14.2) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.16.2) + cocoapods-core (= 1.14.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 2.1, < 3.0) + cocoapods-downloader (>= 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.6.0, < 2.0) @@ -44,8 +31,8 @@ GEM molinillo (~> 0.8.0) nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.27.0, < 2.0) - cocoapods-core (1.16.2) + xcodeproj (>= 1.23.0, < 2.0) + cocoapods-core (1.14.2) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -56,7 +43,7 @@ GEM public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-downloader (2.1) + cocoapods-downloader (2.0) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) @@ -65,48 +52,43 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.3.4) - connection_pool (2.4.1) - drb (2.2.1) + concurrent-ruby (1.2.2) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - ffi (1.17.0) + ffi (1.16.2) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.14.6) + i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.8.2) - logger (1.6.1) - minitest (5.25.1) + json (2.6.3) + minitest (5.20.0) molinillo (0.8.0) - nanaimo (0.4.0) + nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) - nkf (0.2.0) public_suffix (4.0.7) - rexml (3.3.9) + rexml (3.2.6) ruby-macho (2.5.1) - securerandom (0.3.2) - typhoeus (1.4.1) + typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - xcodeproj (1.27.0) + xcodeproj (1.23.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.4.0) - rexml (>= 3.3.6, < 4.0) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.16.2) + cocoapods (= 1.14.2) BUNDLED WITH 2.4.20 From 2f12800bd414343ce6ba9b521fad7864644b61cd Mon Sep 17 00:00:00 2001 From: Philipp Hofmann Date: Fri, 22 Nov 2024 10:46:15 +0100 Subject: [PATCH 2/4] add comment --- .ruby-version | 1 + Gemfile | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 00000000..be94e6f5 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +3.2.2 diff --git a/Gemfile b/Gemfile index 20cf30bf..f5ace479 100644 --- a/Gemfile +++ b/Gemfile @@ -2,4 +2,6 @@ # Pin CocoaPods Version to avoid that bugs in CocoaPods like # https://github.com/CocoaPods/CocoaPods/issues/12081 break our release # workflow. +# 1.16.2 has a bug that breaks the release workflow +# Therefore, we stick to 1.14.2. gem "cocoapods", "= 1.14.2" From fc75925c80eac6c38d3b9aebda4ca4787855b65c Mon Sep 17 00:00:00 2001 From: Philipp Hofmann Date: Fri, 22 Nov 2024 10:58:17 +0100 Subject: [PATCH 3/4] remove ruby version --- .ruby-version | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index be94e6f5..00000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -3.2.2 From 51941803741133f0eef86ab1510e8c3d5490de73 Mon Sep 17 00:00:00 2001 From: Philipp Hofmann Date: Fri, 22 Nov 2024 11:03:19 +0100 Subject: [PATCH 4/4] remx --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e5f1ec68..618df0d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,7 +70,7 @@ GEM nap (1.1.0) netrc (0.11.0) public_suffix (4.0.7) - rexml (3.2.6) + rexml (3.3.9) ruby-macho (2.5.1) typhoeus (1.4.0) ethon (>= 0.9.0) @@ -82,7 +82,7 @@ GEM claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.3.0) - rexml (~> 3.2.4) + rexml (3.3.9) PLATFORMS ruby