diff --git a/.circleci/config.yml b/.circleci/config.yml index 2b5d7af6cb6a..8a31c9def719 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,7 +34,7 @@ executors: reactnativeios: <<: *defaults macos: - xcode: "10.3.0" + xcode: "11.2.1" # ------------------------- # COMMANDS diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testLayoutExample_1-iOS13@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testLayoutExample_1-iOS13@2x.png new file mode 100644 index 000000000000..271e80d3f6b4 Binary files /dev/null and b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testLayoutExample_1-iOS13@2x.png differ diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testScrollViewExample_1-iOS13@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testScrollViewExample_1-iOS13@2x.png new file mode 100644 index 000000000000..809bc84dcc15 Binary files /dev/null and b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testScrollViewExample_1-iOS13@2x.png differ diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testSwitchExample_1-iOS13@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testSwitchExample_1-iOS13@2x.png new file mode 100644 index 000000000000..aed52e7e36e4 Binary files /dev/null and b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testSwitchExample_1-iOS13@2x.png differ diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTextExample_1-iOS13@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTextExample_1-iOS13@2x.png new file mode 100644 index 000000000000..5b073bd93bff Binary files /dev/null and b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTextExample_1-iOS13@2x.png differ diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testViewExample_1-iOS13@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testViewExample_1-iOS13@2x.png new file mode 100644 index 000000000000..98bc6f34e754 Binary files /dev/null and b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testViewExample_1-iOS13@2x.png differ diff --git a/package.json b/package.json index 8607ff1f16a1..527108938d64 100644 --- a/package.json +++ b/package.json @@ -164,13 +164,13 @@ "binaryPath": "RNTester/build/Build/Products/Release-iphonesimulator/RNTester.app/", "build": "xcodebuild -workspace RNTester/RNTesterPods.xcworkspace -scheme RNTester -configuration Release -sdk iphonesimulator -derivedDataPath RNTester/build -UseModernBuildSystem=NO -quiet", "type": "ios.simulator", - "name": "iPhone 6s" + "name": "iPhone 11" }, "ios.sim.debug": { "binaryPath": "RNTester/build/Build/Products/Debug-iphonesimulator/RNTester.app/", "build": "xcodebuild -workspace RNTester/RNTesterPods.xcworkspace -scheme RNTester -configuration Debug -sdk iphonesimulator -derivedDataPath RNTester/build -UseModernBuildSystem=NO -quiet", "type": "ios.simulator", - "name": "iPhone 6s" + "name": "iPhone 11" } } } diff --git a/scripts/.tests.env b/scripts/.tests.env index 94c746b31fec..6f7c49b288d6 100644 --- a/scripts/.tests.env +++ b/scripts/.tests.env @@ -17,8 +17,8 @@ export AVD_NAME="testAVD" export AVD_ABI=x86 ## IOS ## -export IOS_TARGET_OS="12.4" -export IOS_DEVICE="iPhone 6s" +export IOS_TARGET_OS="13.2.2" +export IOS_DEVICE="iPhone 11" export TVOS_DEVICE="Apple TV" ## CI OVERRIDES ## diff --git a/scripts/objc-test.sh b/scripts/objc-test.sh index d2848dc42a51..7d62fc8cf408 100755 --- a/scripts/objc-test.sh +++ b/scripts/objc-test.sh @@ -14,6 +14,10 @@ SCRIPTS=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) ROOT=$(dirname "$SCRIPTS") +SKIPPED_TESTS=() +# See https://gist.github.com/0xced/56035d2f57254cf518b5 - crashes in iOS 13 +SKIPPED_TESTS+=("-skip-testing:RNTesterUnitTests/testNotUTF8Convertible") + # Create cleanup handler cleanup() { EXIT=$? @@ -56,7 +60,8 @@ runTests() { -workspace RNTester/RNTesterPods.xcworkspace \ -scheme RNTester \ -sdk iphonesimulator \ - -destination "platform=iOS Simulator,name=$IOS_DEVICE,OS=$IOS_TARGET_OS" + -destination "platform=iOS Simulator,name=$IOS_DEVICE,OS=$IOS_TARGET_OS" \ + "${SKIPPED_TESTS[@]}" } buildProject() {