Skip to content

Commit

Permalink
Use Xcode 11.5.0 and CocoaPods 1.9.1 (facebook#28837)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
hramos authored and facebook-github-bot committed Jul 10, 2020
1 parent e549f69 commit 98d406f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ executors:
reactnativeios:
<<: *defaults
macos:
xcode: &_XCODE_VERSION "11.3.1"
xcode: &_XCODE_VERSION "11.5.0"

# -------------------------
# COMMANDS
Expand Down Expand Up @@ -122,7 +122,7 @@ commands:
description: Homebrew package to install
type: string
steps:
- run:
- run:
name: "Brew: Install << parameters.package >>"
command: HOMEBREW_NO_AUTO_UPDATE=1 brew install << parameters.package >> >/dev/null

Expand Down Expand Up @@ -411,7 +411,7 @@ jobs:
name: Fetch CocoaPods Specs
command: |
curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
- run:
- run:
name: Setup the CocoaPods environment
command: pod setup

Expand All @@ -430,7 +430,7 @@ jobs:
- when:
condition: << parameters.run_unit_tests >>
steps:
- run:
- run:
name: "Run Tests: iOS Unit and Integration Tests"
command: yarn test-ios
# Runs iOS Detox e2e tests
Expand Down Expand Up @@ -474,7 +474,7 @@ jobs:
parameters:
run_disabled_tests:
type: boolean
default: false
default: false
steps:
- restore_cache_checkout:
checkout_type: android
Expand Down
2 changes: 1 addition & 1 deletion RNTester/Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Gemfile
source 'https://rubygems.org'

gem 'cocoapods', '= 1.8.4'
gem 'cocoapods', '= 1.9.1'
2 changes: 1 addition & 1 deletion RNTester/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -545,4 +545,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: ef7626b12bd0cbe95ba1b7a1f3dc7e2d562ab9d2

COCOAPODS: 1.8.4
COCOAPODS: 1.9.1
2 changes: 1 addition & 1 deletion scripts/.tests.env
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export AVD_NAME="testAVD"
export AVD_ABI=x86

## IOS ##
export IOS_TARGET_OS="13.3"
export IOS_TARGET_OS="13.5"
export IOS_DEVICE="iPhone 8"
export TVOS_DEVICE="Apple TV"
export SDK_IOS="iphonesimulator"
Expand Down

0 comments on commit 98d406f

Please sign in to comment.