From 538446e755bdf5cb96a5c89234fe8309a7e5bcef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= Date: Fri, 30 Oct 2020 23:00:34 -0700 Subject: [PATCH] Bump Xcode to 12.1.0, bump CocoaPods 1.10.0 (#30250) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/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 --- .circleci/config.yml | 6 +-- packages/rn-tester/Gemfile | 2 +- packages/rn-tester/Podfile | 2 +- packages/rn-tester/Podfile.lock | 4 +- .../RNTesterPods.xcodeproj/project.pbxproj | 11 ++++-- .../xcshareddata/xcschemes/RNTester.xcscheme | 2 +- .../RNTesterIntegrationTests.xcscheme | 2 +- .../xcschemes/RNTesterUnitTests.xcscheme | 2 +- scripts/.tests.env | 2 +- .../ios/HelloWorld.xcodeproj/project.pbxproj | 38 ++++++++++++++----- .../xcschemes/HelloWorld.xcscheme | 2 +- 11 files changed, 48 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3c65f5bb0c..a3b1fdb281 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,7 +50,7 @@ executors: reactnativeios: <<: *defaults macos: - xcode: &_XCODE_VERSION "11.6.0" + xcode: &_XCODE_VERSION "12.1.0" # ------------------------- # COMMANDS @@ -419,11 +419,11 @@ jobs: steps: - run: name: Generate RNTesterPods Workspace - command: cd packages/rn-tester && pod install --verbose + command: cd packages/rn-tester && bundle exec pod install --verbose - run: name: Generate RNTesterPods Xcode Workspace - command: pushd packages/rn-tester && pod install --verbose && popd + command: pushd packages/rn-tester && bundle exec pod install --verbose && popd # ------------------------- # Runs iOS unit tests diff --git a/packages/rn-tester/Gemfile b/packages/rn-tester/Gemfile index b3234140e5..03d842220c 100644 --- a/packages/rn-tester/Gemfile +++ b/packages/rn-tester/Gemfile @@ -1,4 +1,4 @@ # Gemfile source 'https://rubygems.org' -gem 'cocoapods', '= 1.9.3' +gem 'cocoapods', '= 1.10.0' diff --git a/packages/rn-tester/Podfile b/packages/rn-tester/Podfile index 89ac7b6c81..a41e58ad53 100644 --- a/packages/rn-tester/Podfile +++ b/packages/rn-tester/Podfile @@ -18,7 +18,7 @@ def pods() # Additional Pods which aren't included in the default Podfile pod 'React-RCTPushNotification', :path => "#{prefix_path}/Libraries/PushNotificationIOS" - pod 'Yoga',:path => "#{prefix_path}/ReactCommon/yoga", :modular_headers => true + pod 'Yoga', :path => "#{prefix_path}/ReactCommon/yoga", :modular_headers => true # Additional Pods which are classed as unstable # # To use fabric: add `fabric_enabled` option to the use_react_native method above, like below diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 1bb3c77855..c0f2c94818 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -528,6 +528,6 @@ SPEC CHECKSUMS: Yoga: 69ef0b2bba5387523f793957a9f80dbd61e89631 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 7e23479b52619cbbd3aa612f09f0e4bd0c2ed208 +PODFILE CHECKSUM: 1d1cdc29892e8a27b768e0e7ce1ead435a53bf0c -COCOAPODS: 1.9.3 +COCOAPODS: 1.10.0 diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj index 62c78de704..0d6f7f8f5e 100644 --- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj +++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -454,7 +454,7 @@ 83CBB9F71A601CBA00E9B192 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1160; + LastUpgradeCheck = 1210; ORGANIZATIONNAME = Facebook; TargetAttributes = { E7DB209E22B2BA84005AC45F = { @@ -467,7 +467,7 @@ }; }; buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "RNTesterPods" */; - compatibilityVersion = "Xcode 9.3"; + compatibilityVersion = "Xcode 12.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -586,7 +586,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; + 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"; }; C1C7A9D58CE1D09515F20577 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; @@ -781,6 +781,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; DEVELOPMENT_TEAM = ""; + EXCLUDED_ARCHS = ""; INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -836,6 +837,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -918,6 +920,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTester.xcscheme b/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTester.xcscheme index 7342976848..2731ada4d7 100644 --- a/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTester.xcscheme +++ b/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTester.xcscheme @@ -1,6 +1,6 @@