From 0f56cee8e1fca9575e83f439274b83e01bdd98e2 Mon Sep 17 00:00:00 2001 From: Riccardo Cipolleschi Date: Tue, 28 Feb 2023 07:14:02 -0800 Subject: [PATCH] Update Gemfile to require Cocoapods 1.12.0 (#36321) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/36321 This change bumps Cocoapods to 1.12.0. This last release fixes a bug for which cocoapods was not working with Ruby 3.2.0 ## Changelog [iOS][Changed] - Bumbed version of Cocoapods to support Ruby 3.2.0 Reviewed By: blakef Differential Revision: D43655787 fbshipit-source-id: 6954ac8271daa7894e57f6d6104ed4d549490695 --- .circleci/config.yml | 8 ++++++-- Gemfile | 4 ++-- packages/rn-tester/Gemfile | 2 +- packages/rn-tester/Podfile.lock | 2 +- scripts/update_podfile_lock.sh | 3 ++- template/Gemfile | 4 ++-- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 30ff5d47c6f860..c0d86ab91560ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -628,7 +628,9 @@ jobs: export USE_HERMES=0 fi - cd packages/rn-tester && bundle exec pod install --verbose + cd packages/rn-tester + bundle install + bundle exec pod install --verbose # ------------------------- # Runs iOS unit tests @@ -969,7 +971,9 @@ jobs: export USE_HERMES=0 fi - cd packages/rn-tester && bundle exec pod install + cd packages/rn-tester + bundle install + bundle exec pod install - run: name: Build RNTester diff --git a/Gemfile b/Gemfile index cb9f3a332b0b1f..34784a7cd94f43 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version -ruby ">= 2.6.10", "< 3.2.0" +ruby ">= 2.6.10" -gem 'cocoapods', '~> 1.11', '>= 1.11.3' +gem 'cocoapods', '~> 1.12' gem 'activesupport', '>= 6.1.7.1' diff --git a/packages/rn-tester/Gemfile b/packages/rn-tester/Gemfile index 7bb000655cb646..a66fd6c04cbc12 100644 --- a/packages/rn-tester/Gemfile +++ b/packages/rn-tester/Gemfile @@ -1,5 +1,5 @@ # Gemfile source 'https://rubygems.org' -gem 'cocoapods', '= 1.11.3' +gem 'cocoapods', '~> 1.12' gem 'rexml' diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index d78e102cca088d..35ec1d8502041d 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -1030,4 +1030,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 5f0460f3a7599f90e5d4759fdec7d7343fe7923d -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.0 diff --git a/scripts/update_podfile_lock.sh b/scripts/update_podfile_lock.sh index fa6db464666ebb..4a65df8c9d909a 100755 --- a/scripts/update_podfile_lock.sh +++ b/scripts/update_podfile_lock.sh @@ -8,7 +8,7 @@ # Usage: # source scripts/update_podfile_lock && update_pods -THIS_DIR=$(cd -P "$(dirname "$(realpath "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd) +THIS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" RNTESTER_DIR="$THIS_DIR/../packages/rn-tester" # Keep this separate for FB internal access. @@ -20,6 +20,7 @@ validate_env () { update_pods () { cd "$RNTESTER_DIR" || exit + bundle install || exit bundle check || exit bundle exec pod install cd "$THIS_DIR" || exit diff --git a/template/Gemfile b/template/Gemfile index 89f68756431a30..1fa2c2e1abdee6 100644 --- a/template/Gemfile +++ b/template/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version -ruby ">= 2.6.10", "< 3.2.0" +ruby ">= 2.6.10" -gem 'cocoapods', '~> 1.11', '>= 1.11.3' +gem 'cocoapods', '~> 1.12'