From d4f5f7517835a3030d78b3237658ffaa5d084397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Tue, 1 Sep 2020 16:42:08 -0700
Subject: [PATCH] Use Xcode 11.6.0 and CocoaPods 1.9.3 (#28837)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/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
---
 .circleci/config.yml                                          | 2 +-
 packages/rn-tester/Gemfile                                    | 2 +-
 packages/rn-tester/Podfile                                    | 2 +-
 packages/rn-tester/Podfile.lock                               | 4 ++--
 .../xcshareddata/xcschemes/RNTester.xcscheme                  | 2 +-
 .../xcshareddata/xcschemes/RNTesterIntegrationTests.xcscheme  | 2 +-
 .../xcshareddata/xcschemes/RNTesterUnitTests.xcscheme         | 2 +-
 scripts/.tests.env                                            | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 705cb827733d16..670200411364b0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -50,7 +50,7 @@ executors:
   reactnativeios:
     <<: *defaults
     macos:
-      xcode: &_XCODE_VERSION "11.3.1"
+      xcode: &_XCODE_VERSION "11.6.0"
 
 # -------------------------
 #        COMMANDS
diff --git a/packages/rn-tester/Gemfile b/packages/rn-tester/Gemfile
index 998d2ba5f851de..b3234140e54d42 100644
--- a/packages/rn-tester/Gemfile
+++ b/packages/rn-tester/Gemfile
@@ -1,4 +1,4 @@
 # Gemfile
 source 'https://rubygems.org'
 
-gem 'cocoapods', '= 1.8.4'
+gem 'cocoapods', '= 1.9.3'
diff --git a/packages/rn-tester/Podfile b/packages/rn-tester/Podfile
index 574cbb4d0d0ccc..9331c0b35c2b31 100644
--- a/packages/rn-tester/Podfile
+++ b/packages/rn-tester/Podfile
@@ -50,7 +50,7 @@ def frameworks_pre_install(installer)
   installer.pod_targets.each do |pod|
     if static_frameworks.include?(pod.name)
       def pod.build_type
-        Pod::Target::BuildType.static_library
+        Pod::BuildType.static_library
       end
     end
   end
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
index 4aed3559d8229f..1c441013b39483 100644
--- a/packages/rn-tester/Podfile.lock
+++ b/packages/rn-tester/Podfile.lock
@@ -528,6 +528,6 @@ SPEC CHECKSUMS:
   Yoga: f7fa200d8c49f97b54c9421079e781fb900b5cae
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 3045d3456f0f2268f15db9a527839e6a19e6071c
+PODFILE CHECKSUM: c38c19657f5aaa2d604f5f4c607f030b60452997
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.9.3
diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTester.xcscheme b/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTester.xcscheme
index 938a25682dbd5c..7342976848dd0d 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1160"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTesterIntegrationTests.xcscheme b/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTesterIntegrationTests.xcscheme
index 2917ce39532f09..013137ced9ab18 100644
--- a/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTesterIntegrationTests.xcscheme
+++ b/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTesterIntegrationTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1160"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTesterUnitTests.xcscheme b/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTesterUnitTests.xcscheme
index 6b3629386d51a7..6c7d9489a0e4e4 100644
--- a/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTesterUnitTests.xcscheme
+++ b/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTesterUnitTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1160"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
diff --git a/scripts/.tests.env b/scripts/.tests.env
index 14f8bda02f12dd..0d9a9376dda3de 100644
--- a/scripts/.tests.env
+++ b/scripts/.tests.env
@@ -17,7 +17,7 @@ export AVD_NAME="testAVD"
 export AVD_ABI=x86
 
 ## IOS ##
-export IOS_TARGET_OS="13.3"
+export IOS_TARGET_OS="13.6"
 export IOS_DEVICE="iPhone 8"
 export TVOS_DEVICE="Apple TV"
 export SDK_IOS="iphonesimulator"