Skip to content

Commit 538446e

Browse files
hramosfacebook-github-bot
authored andcommitted
Bump Xcode to 12.1.0, bump CocoaPods 1.10.0 (#30250)
Summary: Pull Request resolved: #30250 Upgrade the version of Xcode used in Circle CI to Xcode 12.1.0, and target iOS 14.1 in tests. Reference: * Circle CI Xcode 12.1 container manifest (new version): https://circle-macos-docs.s3.amazonaws.com/image-manifest/v3985/index.html * Circle CI Xcode 11.6.0 container manifest (previous version): https://circle-macos-docs.s3.amazonaws.com/image-manifest/v3299/index.html > Source: https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions The default version of CocoaPods used in the Xcode 12.1 container image has changed. Use `bundle exec` with `pod install` to ensure we use the same version of CocoaPods as prescribed in the Gemfile. Changelog: [iOS][Changed] - Update iOS project template for Xcode 12.1.0 [iOS][Changed] - Bump CocoaPods 1.10.0 [Internal] Bump Xcode version used for iOS tests. Reviewed By: fkgozali Differential Revision: D24545010 fbshipit-source-id: 4a39781352bc5a85dae55ed5cd4e1ed6043a4aeb
1 parent dd9fd2a commit 538446e

File tree

11 files changed

+48
-25
lines changed

11 files changed

+48
-25
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ executors:
5050
reactnativeios:
5151
<<: *defaults
5252
macos:
53-
xcode: &_XCODE_VERSION "11.6.0"
53+
xcode: &_XCODE_VERSION "12.1.0"
5454

5555
# -------------------------
5656
# COMMANDS
@@ -419,11 +419,11 @@ jobs:
419419
steps:
420420
- run:
421421
name: Generate RNTesterPods Workspace
422-
command: cd packages/rn-tester && pod install --verbose
422+
command: cd packages/rn-tester && bundle exec pod install --verbose
423423

424424
- run:
425425
name: Generate RNTesterPods Xcode Workspace
426-
command: pushd packages/rn-tester && pod install --verbose && popd
426+
command: pushd packages/rn-tester && bundle exec pod install --verbose && popd
427427

428428
# -------------------------
429429
# Runs iOS unit tests

packages/rn-tester/Gemfile

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

4-
gem 'cocoapods', '= 1.9.3'
4+
gem 'cocoapods', '= 1.10.0'

packages/rn-tester/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def pods()
1818

1919
# Additional Pods which aren't included in the default Podfile
2020
pod 'React-RCTPushNotification', :path => "#{prefix_path}/Libraries/PushNotificationIOS"
21-
pod 'Yoga',:path => "#{prefix_path}/ReactCommon/yoga", :modular_headers => true
21+
pod 'Yoga', :path => "#{prefix_path}/ReactCommon/yoga", :modular_headers => true
2222
# Additional Pods which are classed as unstable
2323
#
2424
# To use fabric: add `fabric_enabled` option to the use_react_native method above, like below

packages/rn-tester/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,6 @@ SPEC CHECKSUMS:
528528
Yoga: 69ef0b2bba5387523f793957a9f80dbd61e89631
529529
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
530530

531-
PODFILE CHECKSUM: 7e23479b52619cbbd3aa612f09f0e4bd0c2ed208
531+
PODFILE CHECKSUM: 1d1cdc29892e8a27b768e0e7ce1ead435a53bf0c
532532

533-
COCOAPODS: 1.9.3
533+
COCOAPODS: 1.10.0

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -454,7 +454,7 @@
454454
83CBB9F71A601CBA00E9B192 /* Project object */ = {
455455
isa = PBXProject;
456456
attributes = {
457-
LastUpgradeCheck = 1160;
457+
LastUpgradeCheck = 1210;
458458
ORGANIZATIONNAME = Facebook;
459459
TargetAttributes = {
460460
E7DB209E22B2BA84005AC45F = {
@@ -467,7 +467,7 @@
467467
};
468468
};
469469
buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "RNTesterPods" */;
470-
compatibilityVersion = "Xcode 9.3";
470+
compatibilityVersion = "Xcode 12.0";
471471
developmentRegion = en;
472472
hasScannedForEncodings = 0;
473473
knownRegions = (
@@ -586,7 +586,7 @@
586586
);
587587
runOnlyForDeploymentPostprocessing = 0;
588588
shellPath = /bin/sh;
589-
shellScript = "set -e\n\nexport NODE_BINARY=node\nexport PROJECT_ROOT=$SRCROOT/..\nexport SOURCEMAP_FILE=../sourcemap.ios.map\n# export FORCE_BUNDLING=true\n\"$SRCROOT/../../scripts/react-native-xcode.sh\" $SRCROOT/../../packages/rn-tester/js/RNTesterApp.ios.js\n";
589+
shellScript = "set -e\n\nexport NODE_BINARY=node\nexport PROJECT_ROOT=\"$SRCROOT/../../\"\nexport SOURCEMAP_FILE=../sourcemap.ios.map\n# export FORCE_BUNDLING=true\n\"$SRCROOT/../../scripts/react-native-xcode.sh\" $SRCROOT/../../packages/rn-tester/js/RNTesterApp.ios.js\n";
590590
};
591591
C1C7A9D58CE1D09515F20577 /* [CP] Copy Pods Resources */ = {
592592
isa = PBXShellScriptBuildPhase;
@@ -781,6 +781,7 @@
781781
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
782782
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
783783
DEVELOPMENT_TEAM = "";
784+
EXCLUDED_ARCHS = "";
784785
INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
785786
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
786787
LD_RUNPATH_SEARCH_PATHS = (
@@ -836,6 +837,7 @@
836837
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
837838
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
838839
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
840+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
839841
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
840842
CLANG_WARN_STRICT_PROTOTYPES = YES;
841843
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -918,6 +920,7 @@
918920
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
919921
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
920922
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
923+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
921924
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
922925
CLANG_WARN_STRICT_PROTOTYPES = YES;
923926
CLANG_WARN_SUSPICIOUS_MOVE = YES;

packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTester.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1160"
3+
LastUpgradeVersion = "1210"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "NO"

packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTesterIntegrationTests.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1160"
3+
LastUpgradeVersion = "1210"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "NO"

packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTesterUnitTests.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1160"
3+
LastUpgradeVersion = "1210"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "NO"

scripts/.tests.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export AVD_NAME="testAVD"
1717
export AVD_ABI=x86
1818

1919
## IOS ##
20-
export IOS_TARGET_OS="13.6"
20+
export IOS_TARGET_OS="14.1"
2121
export IOS_DEVICE="iPhone 8"
2222
export SDK_IOS="iphonesimulator"
2323

template/ios/HelloWorld.xcodeproj/project.pbxproj

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -170,7 +170,7 @@
170170
83CBB9F71A601CBA00E9B192 /* Project object */ = {
171171
isa = PBXProject;
172172
attributes = {
173-
LastUpgradeCheck = 1200;
173+
LastUpgradeCheck = 1210;
174174
TargetAttributes = {
175175
00E356ED1AD99517003FC87E = {
176176
CreatedOnToolsVersion = 6.2;
@@ -182,7 +182,7 @@
182182
};
183183
};
184184
buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "HelloWorld" */;
185-
compatibilityVersion = "Xcode 3.2";
185+
compatibilityVersion = "Xcode 12.0";
186186
developmentRegion = en;
187187
hasScannedForEncodings = 0;
188188
knownRegions = (
@@ -294,7 +294,11 @@
294294
);
295295
INFOPLIST_FILE = HelloWorldTests/Info.plist;
296296
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
297-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
297+
LD_RUNPATH_SEARCH_PATHS = (
298+
"$(inherited)",
299+
"@executable_path/Frameworks",
300+
"@loader_path/Frameworks",
301+
);
298302
OTHER_LDFLAGS = (
299303
"-ObjC",
300304
"-lc++",
@@ -313,7 +317,11 @@
313317
COPY_PHASE_STRIP = NO;
314318
INFOPLIST_FILE = HelloWorldTests/Info.plist;
315319
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
316-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
320+
LD_RUNPATH_SEARCH_PATHS = (
321+
"$(inherited)",
322+
"@executable_path/Frameworks",
323+
"@loader_path/Frameworks",
324+
);
317325
OTHER_LDFLAGS = (
318326
"-ObjC",
319327
"-lc++",
@@ -333,7 +341,10 @@
333341
CURRENT_PROJECT_VERSION = 1;
334342
ENABLE_BITCODE = NO;
335343
INFOPLIST_FILE = HelloWorld/Info.plist;
336-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
344+
LD_RUNPATH_SEARCH_PATHS = (
345+
"$(inherited)",
346+
"@executable_path/Frameworks",
347+
);
337348
OTHER_LDFLAGS = (
338349
"$(inherited)",
339350
"-ObjC",
@@ -354,7 +365,10 @@
354365
CLANG_ENABLE_MODULES = YES;
355366
CURRENT_PROJECT_VERSION = 1;
356367
INFOPLIST_FILE = HelloWorld/Info.plist;
357-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
368+
LD_RUNPATH_SEARCH_PATHS = (
369+
"$(inherited)",
370+
"@executable_path/Frameworks",
371+
);
358372
OTHER_LDFLAGS = (
359373
"$(inherited)",
360374
"-ObjC",
@@ -416,7 +430,10 @@
416430
GCC_WARN_UNUSED_FUNCTION = YES;
417431
GCC_WARN_UNUSED_VARIABLE = YES;
418432
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
419-
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
433+
LD_RUNPATH_SEARCH_PATHS = (
434+
/usr/lib/swift,
435+
"$(inherited)",
436+
);
420437
LIBRARY_SEARCH_PATHS = (
421438
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
422439
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
@@ -470,7 +487,10 @@
470487
GCC_WARN_UNUSED_FUNCTION = YES;
471488
GCC_WARN_UNUSED_VARIABLE = YES;
472489
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
473-
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
490+
LD_RUNPATH_SEARCH_PATHS = (
491+
/usr/lib/swift,
492+
"$(inherited)",
493+
);
474494
LIBRARY_SEARCH_PATHS = (
475495
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
476496
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",

template/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1200"
3+
LastUpgradeVersion = "1210"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)