Skip to content

Commit d4f5f75

Browse files
hramosfacebook-github-bot
authored andcommitted
Use Xcode 11.6.0 and CocoaPods 1.9.3 (facebook#28837)
Summary: Pull Request resolved: facebook#28837 CocoaPods 1.9.3 is the version that is distributed by Circle CI to macOS machines alongside Xcode 11.6.0. The upgrade to CocoaPods and Xcode is therefore tightly coupled due to our dependency on Circle for our open source CI. With the upgrade to Xcode 11.6.0, we also bump our target OS to ensure iOS tests use an iOS Simulator that is part of the image. Reference: * Circle CI macOS Xcode 11.6.0 image manifest (new version): https://circle-macos-docs.s3.amazonaws.com/image-manifest/v3299/index.html * Circle CI macOS Xcode 11.3.1 image manifest (previous version): https://circle-macos-docs.s3.amazonaws.com/image-manifest/v2244/index.html > Source: https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions Changelog: [Internal] Bump Xcode version used for iOS tests. Reviewed By: fkgozali Differential Revision: D21415049 fbshipit-source-id: a88849d54e30740b009442eb96f5593bc85b51da
1 parent 345baf4 commit d4f5f75

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ executors:
5050
reactnativeios:
5151
<<: *defaults
5252
macos:
53-
xcode: &_XCODE_VERSION "11.3.1"
53+
xcode: &_XCODE_VERSION "11.6.0"
5454

5555
# -------------------------
5656
# COMMANDS

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.8.4'
4+
gem 'cocoapods', '= 1.9.3'

packages/rn-tester/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def frameworks_pre_install(installer)
5050
installer.pod_targets.each do |pod|
5151
if static_frameworks.include?(pod.name)
5252
def pod.build_type
53-
Pod::Target::BuildType.static_library
53+
Pod::BuildType.static_library
5454
end
5555
end
5656
end

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: f7fa200d8c49f97b54c9421079e781fb900b5cae
529529
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
530530

531-
PODFILE CHECKSUM: 3045d3456f0f2268f15db9a527839e6a19e6071c
531+
PODFILE CHECKSUM: c38c19657f5aaa2d604f5f4c607f030b60452997
532532

533-
COCOAPODS: 1.8.4
533+
COCOAPODS: 1.9.3

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 = "1140"
3+
LastUpgradeVersion = "1160"
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 = "1140"
3+
LastUpgradeVersion = "1160"
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 = "1140"
3+
LastUpgradeVersion = "1160"
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.3"
20+
export IOS_TARGET_OS="13.6"
2121
export IOS_DEVICE="iPhone 8"
2222
export TVOS_DEVICE="Apple TV"
2323
export SDK_IOS="iphonesimulator"

0 commit comments

Comments
 (0)