Skip to content

Commit 2daedcd

Browse files
committed
Avoid using Cocoapods 1.15 until it fixes an issue affection RN. (#42702)
Summary: Cocoapods 1.15 (#42698) current breaks the build, limit to version >= 1.13 & < 1.15 This is currently broken and affecting users, we'll remove this limit once Cocopods fixes the regression. It's currently blocking 0.73.3. [iOS][Fixed] don't allow cocoapods 1.15. <!-- Help reviewers and the release process by writing your own changelog entry. Pick one each for the category and type tags: [ANDROID|GENERAL|IOS|INTERNAL] [BREAKING|ADDED|CHANGED|DEPRECATED|REMOVED|FIXED|SECURITY] - Message For more details, see: https://reactnative.dev/contributing/changelogs-in-pull-requests Pull Request resolved: #42702 Test Plan: ``` bundle exec pod install ``` Reviewed By: cipolleschi Differential Revision: D53180111 Pulled By: blakef fbshipit-source-id: 4c5dd11db6d208e8d71249443a8f85e601913abd
1 parent 753aee1 commit 2daedcd

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

packages/react-native/template/Gemfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 2.6.10"
55

6-
gem 'cocoapods', '~> 1.13'
7-
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
6+
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
7+
# bound in the template on Cocoapods with next React Native release.
8+
gem 'cocoapods', '>= 1.13', '< 1.15'
9+
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

packages/rn-tester/Gemfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Gemfile
22
source 'https://rubygems.org'
33

4-
gem 'cocoapods', '~> 1.12'
4+
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
5+
ruby ">= 2.6.10"
6+
7+
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
8+
# bound in the template on Cocoapods with next React Native release.
9+
gem 'cocoapods', '>= 1.13', '< 1.15'
510
gem 'rexml'
611
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'

packages/rn-tester/Podfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1370,7 +1370,7 @@ EXTERNAL SOURCES:
13701370
SPEC CHECKSUMS:
13711371
boost: d3f49c53809116a5d38da093a8aa78bf551aed09
13721372
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
1373-
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
1373+
DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
13741374
FBLazyVector: fbc4957d9aa695250b55d879c1d86f79d7e69ab4
13751375
FBReactNativeSpec: 448eeada928188f02d561158d7167983f8cccfc1
13761376
Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44
@@ -1382,7 +1382,7 @@ SPEC CHECKSUMS:
13821382
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
13831383
FlipperKit: 37525a5d056ef9b93d1578e04bc3ea1de940094f
13841384
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
1385-
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
1385+
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
13861386
hermes-engine: b361c9ef5ef3cda53f66e195599b47e1f84ffa35
13871387
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
13881388
OCMock: 9491e4bec59e0b267d52a9184ff5605995e74be8
@@ -1433,7 +1433,7 @@ SPEC CHECKSUMS:
14331433
ReactCommon-Samples: 5ccf2a724444b611b064036cecc78785dbb00efd
14341434
ScreenshotManager: 338d56378199c1e9fb50d896a7ce4400cd250b5e
14351435
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
1436-
Yoga: 13c8ef87792450193e117976337b8527b49e8c03
1436+
Yoga: e64aa65de36c0832d04e8c7bd614396c77a80047
14371437

14381438
PODFILE CHECKSUM: 7d1b558e28efc972a185230c56fef43ed86910a1
14391439

packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -943,8 +943,6 @@
943943
OTHER_LDFLAGS = (
944944
"-ObjC",
945945
"-lc++",
946-
"-Wl",
947-
"-ld_classic",
948946
);
949947
REACT_NATIVE_PATH = "${PODS_ROOT}/../../react-native";
950948
SDKROOT = iphoneos;
@@ -1029,8 +1027,6 @@
10291027
OTHER_LDFLAGS = (
10301028
"-ObjC",
10311029
"-lc++",
1032-
"-Wl",
1033-
"-ld_classic",
10341030
);
10351031
REACT_NATIVE_PATH = "${PODS_ROOT}/../../react-native";
10361032
SDKROOT = iphoneos;

0 commit comments

Comments
 (0)