Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Update React Native to 0.73.4, change Cocoapods version #2032

Merged
merged 6 commits into from
Feb 16, 2024
Merged

fix: Update React Native to 0.73.4, change Cocoapods version #2032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
466f107
Update React Native to 0.73.4, change cocoapods version
tboba Feb 14, 2024
715761b
Add endlines
tboba Feb 14, 2024
10c44e2
Change cocoapods version in workflows
tboba Feb 15, 2024
2fe313b
Change command for installing cocoapods
tboba Feb 15, 2024
0225109
Change bounds in Gemfile, remove installing gems from workflows
tboba Feb 16, 2024
7c3617c
Revert installing ruby gems, add comment
tboba Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/ios-build-test-fabric.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@ jobs:
working-directory: ${{ env.WORKING_DIRECTORY }}
run: yarn

# This step is required due to the bug introduced in 1.15.0 version of cocoapods
# that breaks the pod installation for cached packages.
# see https://github.com/facebook/react-native/issues/42698
# This step should be removed once this issue will be resolved:
# https://github.com/actions/runner-images/issues/9308
- name: Install Ruby gems
run: gem install cocoapods -v 1.15.2

tboba marked this conversation as resolved.
Show resolved Hide resolved
- name: Install pods
id: install_pods
continue-on-error: true
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/ios-build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ jobs:
- name: Install node dependencies
working-directory: ${{ env.WORKING_DIRECTORY }}
run: yarn
# This step is required due to the bug introduced in 1.15.0 version of cocoapods
# that breaks the pod installation for cached packages.
# see https://github.com/facebook/react-native/issues/42698
# This step should be removed once this issue will be resolved:
# https://github.com/actions/runner-images/issues/9308
- name: Install Ruby gems
run: gem install cocoapods -v 1.15.2
tboba marked this conversation as resolved.
Show resolved Hide resolved
- name: Install pods
id: install_pods
continue-on-error: true
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/ios-e2e-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ jobs:
- name: Install node dependencies
working-directory: ${{ env.WORKING_DIRECTORY }}
run: yarn
# This step is required due to the bug introduced in 1.15.0 version of cocoapods
# that breaks the pod installation for cached packages.
# see https://github.com/facebook/react-native/issues/42698
# This step should be removed once this issue will be resolved:
# https://github.com/actions/runner-images/issues/9308
- name: Install Ruby gems
run: gem install cocoapods -v 1.15.2
tboba marked this conversation as resolved.
Show resolved Hide resolved
- name: Install pods
working-directory: ${{ env.WORKING_DIRECTORY }}/ios
run: pod install
Expand Down
4 changes: 3 additions & 1 deletion Example/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +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'
gem 'cocoapods', '~> 1.12'

gem 'cocoapods', '~> 1.15.2'
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
8 changes: 4 additions & 4 deletions Example/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,9 +687,9 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
boost: a7c83b31436843459a1961bfd74b96033dc77234
boost: 57d2868c099736d80fcd648bf211b4431e51a558
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
FBLazyVector: 5d4a3b7f411219a45a6d952f77d2c0a6c9989da5
FBReactNativeSpec: 3fc2d478e1c4b08276f9dd9128f80ec6d5d85c1f
Flipper: 6edb735e6c3e332975d1b17956bcc584eccf5818
Expand All @@ -701,7 +701,7 @@ SPEC CHECKSUMS:
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
FlipperKit: 2efad7007d6745a3f95e4034d547be637f89d3f6
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 5337263514dd6f09803962437687240c5dc39aa4
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
hermes-engine: 81191603c4eaa01f5e4ae5737a9efcf64756c7b2
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
Expand Down Expand Up @@ -749,4 +749,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 86e380a4262db238c7a45428750af2d88465585c

COCOAPODS: 1.14.3
COCOAPODS: 1.11.3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something went wrong here? 1.11.3 is quite outdated

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be honest I don't know why it's targetting that old version, but I see that in other examples cocoapods version is the same 🤔

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it comes from the version installed on your device

4 changes: 2 additions & 2 deletions FabricExample/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ source 'https://rubygems.org'
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"

gem 'cocoapods', '~> 1.13'
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
gem 'cocoapods', '~> 1.15.2'
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
12 changes: 2 additions & 10 deletions FabricExample/ios/FabricExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,11 +584,7 @@
"-DFOLLY_CFG_NO_COROUTINES=1",
"-DRN_FABRIC_ENABLED",
);
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
OTHER_LDFLAGS = "$(inherited)";
tboba marked this conversation as resolved.
Show resolved Hide resolved
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down Expand Up @@ -660,11 +656,7 @@
"-DFOLLY_CFG_NO_COROUTINES=1",
"-DRN_FABRIC_ENABLED",
);
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down
Loading
Loading