Skip to content

Commit

Permalink
Update Gemfile to require Cocoapods 1.12.0 (#36321)
Browse files Browse the repository at this point in the history
Summary:
Pull Request resolved: #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
  • Loading branch information
cipolleschi authored and facebook-github-bot committed Feb 28, 2023
1 parent 95e20ed commit 0f56cee
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 9 deletions.
8 changes: 6 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -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'
2 changes: 1 addition & 1 deletion packages/rn-tester/Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Gemfile
source 'https://rubygems.org'

gem 'cocoapods', '= 1.11.3'
gem 'cocoapods', '~> 1.12'
gem 'rexml'
2 changes: 1 addition & 1 deletion packages/rn-tester/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1030,4 +1030,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 5f0460f3a7599f90e5d4759fdec7d7343fe7923d

COCOAPODS: 1.11.3
COCOAPODS: 1.12.0
3 changes: 2 additions & 1 deletion scripts/update_podfile_lock.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions template/Gemfile
Original file line number Diff line number Diff line change
@@ -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'

0 comments on commit 0f56cee

Please sign in to comment.