From d7951d4f89da4ca61b705edad2d885ca92b4163a Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Thu, 20 Apr 2023 08:42:27 -0700 Subject: [PATCH 1/3] update xcode to 14c18 --- .ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index e56f9713192..2d0db05cd45 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -24,24 +24,24 @@ platform_properties: properties: dependencies: >- [ - {"dependency": "xcode", "version": "14a5294e"}, + {"dependency": "xcode", "version": "14c18"}, {"dependency": "gems", "version": "v3.3.14"} ] os: Mac-12 device_type: none cpu: arm64 - xcode: 14a5294e # xcode 14.0 beta 5 + xcode: 14c18 mac_x64: properties: dependencies: >- [ - {"dependency": "xcode", "version": "14a5294e"}, + {"dependency": "xcode", "version": "14c18"}, {"dependency": "gems", "version": "v3.3.14"} ] os: Mac-12 device_type: none cpu: x86 - xcode: 14a5294e # xcode 14.0 beta 5 + xcode: 14c18 targets: ### iOS+macOS tasks *** From 526934c9575414e9e297004b4825ec882eb99ac2 Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Thu, 20 Apr 2023 10:30:25 -0700 Subject: [PATCH 2/3] iPhone 14 --- .ci/targets/ios_platform_tests.yaml | 2 +- packages/pigeon/tool/shared/test_suites.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/targets/ios_platform_tests.yaml b/.ci/targets/ios_platform_tests.yaml index 7727efcfc16..a29d049b97c 100644 --- a/.ci/targets/ios_platform_tests.yaml +++ b/.ci/targets/ios_platform_tests.yaml @@ -15,7 +15,7 @@ tasks: args: ["xcode-analyze", "--ios", "--ios-min-version=13.0"] - name: native test script: script/tool_runner.sh - args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=iPhone 13,OS=latest"] + args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=iPhone 14,OS=latest"] - name: drive examples # `drive-examples` contains integration tests, which changes the UI of the application. # This UI change sometimes affects `xctest`. diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index a6dfda07fca..cfbdae0cda4 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -323,7 +323,7 @@ Future _runIOSPluginUnitTests(String testPluginPath) async { return runXcodeBuild( '$examplePath/ios', sdk: 'iphonesimulator', - destination: 'platform=iOS Simulator,name=iPhone 13', + destination: 'platform=iOS Simulator,name=iPhone 14', extraArguments: ['test'], ); } From 696650f6604930db27ffac0e8ad99b2e8787f860 Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Thu, 20 Apr 2023 12:41:39 -0700 Subject: [PATCH 3/3] update create simulator --- .ci/scripts/create_simulator.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/scripts/create_simulator.sh b/.ci/scripts/create_simulator.sh index 02992d2cbdb..a12bbee0af0 100755 --- a/.ci/scripts/create_simulator.sh +++ b/.ci/scripts/create_simulator.sh @@ -5,8 +5,8 @@ # The name here must match remove_simulator.sh readonly DEVICE_NAME=Flutter-iPhone -readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-13 -readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-16-0 +readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-14 +readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-16-2 xcrun simctl list xcrun simctl create "$DEVICE_NAME" "$DEVICE" "$OS" | xargs xcrun simctl boot