diff --git a/.circleci/config.yml b/.circleci/config.yml index 96752e64cfbdc1..e111bb9cb44828 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -357,7 +357,7 @@ android_defaults: &android_defaults macos_defaults: &macos_defaults <<: *defaults macos: - xcode: "9.4.0" + xcode: "10.1.0" version: 2 jobs: @@ -446,32 +446,6 @@ jobs: - store_test_results: path: ~/react-native/reports/junit - # Xcode 10: Runs unit tests on iOS and Apple TV devices - test_objc_xcode10: - <<: *defaults - macos: - xcode: "10.0.0" - steps: - - checkout - - run: *setup-artifacts - - run: *yarn - - - run: *boot-simulator-iphone - - run: *boot-simulator-appletv - - run: *brew-install-watchman - - - run: *run-objc-ios-tests - - run: *run-objc-tvos-tests - - # TODO: Fix these failing tests. - - run: *display-broken-tests-warning - - run: *run-podspec-tests - - run: *run-objc-ios-e2e-tests - - run: *run-objc-tvos-e2e-tests - - - store_test_results: - path: ~/react-native/reports/junit - # Runs end to end tests (Detox) test_detox_end_to_end: <<: *macos_defaults @@ -738,8 +712,6 @@ workflows: - checkout_code # Tooling Compatibility Checks - - test_objc_xcode10: - filters: *filter-ignore-gh-pages - test_node10: filters: *filter-ignore-gh-pages diff --git a/scripts/objc-test-ios.sh b/scripts/objc-test-ios.sh index 5e1fe274d1014e..df1a7755dd3a9f 100755 --- a/scripts/objc-test-ios.sh +++ b/scripts/objc-test-ios.sh @@ -21,7 +21,7 @@ cd "$ROOT" export TEST_NAME="iOS" export SCHEME="RNTester" export SDK="iphonesimulator" -export DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=11.4" +export DESTINATION="platform=iOS Simulator,name=iPhone XS,OS=12.1" # If there's a "test" argument, pass it to the test script. . ./scripts/objc-test.sh $1 diff --git a/scripts/objc-test-tvos.sh b/scripts/objc-test-tvos.sh index 2738c7ba41977b..ff68742860d9ed 100755 --- a/scripts/objc-test-tvos.sh +++ b/scripts/objc-test-tvos.sh @@ -21,8 +21,7 @@ cd "$ROOT" export TEST_NAME="tvOS" export SCHEME="RNTester-tvOS" export SDK="appletvsimulator" -export DESTINATION="platform=tvOS Simulator,name=Apple TV,OS=11.4" +export DESTINATION="platform=tvOS Simulator,name=Apple TV,OS=12.1" # If there's a "test" argument, pass it to the test script. . ./scripts/objc-test.sh $1 -