Skip to content

Commit 98d406f

Browse files
hramosfacebook-github-bot
authored andcommitted
Use Xcode 11.5.0 and CocoaPods 1.9.1 (facebook#28837)
Summary: Pull Request resolved: facebook#28837 CocoaPods 1.9.1 is the latest version, as well as the one distributed by Circle CI to macOS machines alongside Xcode 11.5.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.5.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.5.0 image manifest (new version): https://circle-macos-docs.s3.amazonaws.com/image-manifest/v2960/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: d65cd9e9d693f688152a1e986ae54774883ab0d7
1 parent e549f69 commit 98d406f

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.circleci/config.yml

Lines changed: 5 additions & 5 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.3.1"
53+
xcode: &_XCODE_VERSION "11.5.0"
5454

5555
# -------------------------
5656
# COMMANDS
@@ -122,7 +122,7 @@ commands:
122122
description: Homebrew package to install
123123
type: string
124124
steps:
125-
- run:
125+
- run:
126126
name: "Brew: Install << parameters.package >>"
127127
command: HOMEBREW_NO_AUTO_UPDATE=1 brew install << parameters.package >> >/dev/null
128128

@@ -411,7 +411,7 @@ jobs:
411411
name: Fetch CocoaPods Specs
412412
command: |
413413
curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
414-
- run:
414+
- run:
415415
name: Setup the CocoaPods environment
416416
command: pod setup
417417

@@ -430,7 +430,7 @@ jobs:
430430
- when:
431431
condition: << parameters.run_unit_tests >>
432432
steps:
433-
- run:
433+
- run:
434434
name: "Run Tests: iOS Unit and Integration Tests"
435435
command: yarn test-ios
436436
# Runs iOS Detox e2e tests
@@ -474,7 +474,7 @@ jobs:
474474
parameters:
475475
run_disabled_tests:
476476
type: boolean
477-
default: false
477+
default: false
478478
steps:
479479
- restore_cache_checkout:
480480
checkout_type: android

RNTester/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.1'

RNTester/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,4 +545,4 @@ SPEC CHECKSUMS:
545545

546546
PODFILE CHECKSUM: ef7626b12bd0cbe95ba1b7a1f3dc7e2d562ab9d2
547547

548-
COCOAPODS: 1.8.4
548+
COCOAPODS: 1.9.1

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.5"
2121
export IOS_DEVICE="iPhone 8"
2222
export TVOS_DEVICE="Apple TV"
2323
export SDK_IOS="iphonesimulator"

0 commit comments

Comments
 (0)