diff --git a/.ci.yaml b/.ci.yaml index 2ddc8a1cca69..42f29fe3eb3e 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -90,12 +90,12 @@ platform_properties: [ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] - os: Mac-13|Mac-14 + os: Mac-14 device_type: none cpu: arm64 $flutter/osx_sdk : >- { - "sdk_version": "15a240d" + "sdk_version": "16a5171c" } mac_x64: properties: @@ -103,12 +103,12 @@ platform_properties: [ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] - os: Mac-13|Mac-14 + os: Mac-14 device_type: none cpu: x86 $flutter/osx_sdk : >- { - "sdk_version": "15a240d" + "sdk_version": "16a5171c" } targets: diff --git a/.ci/scripts/create_simulator.sh b/.ci/scripts/create_simulator.sh index 1932f20f3047..d7e6b968900d 100755 --- a/.ci/scripts/create_simulator.sh +++ b/.ci/scripts/create_simulator.sh @@ -9,7 +9,7 @@ set -o pipefail # The name here must match remove_simulator.sh readonly DEVICE_NAME=Flutter-iPhone readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-14 -readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-17-0 +readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-18-0 # Delete any existing devices named Flutter-iPhone. Having more than one may # cause issues when builds target the device. diff --git a/.ci/targets/ios_platform_tests.yaml b/.ci/targets/ios_platform_tests.yaml index e679834961f1..a5cccbe786f0 100644 --- a/.ci/targets/ios_platform_tests.yaml +++ b/.ci/targets/ios_platform_tests.yaml @@ -22,7 +22,7 @@ tasks: - name: native test script: .ci/scripts/tool_runner.sh # Simulator name and version must match name and version in create_simulator.sh - args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=17.0"] + args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=18.0"] - name: boot simulator # Ensure simulator is still booted script: .ci/scripts/boot_simulator.sh diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index 8f9bb7a4cb40..576dfdbcf3be 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -296,8 +296,8 @@ Future _runIOSPluginUnitTests(String testPluginPath) async { const String deviceName = 'Pigeon-Test-iPhone'; const String deviceType = 'com.apple.CoreSimulator.SimDeviceType.iPhone-14'; - const String deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-17-0'; - const String deviceOS = '17.0'; + const String deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-18-0'; + const String deviceOS = '18.0'; await _createSimulator(deviceName, deviceType, deviceRuntime); return runXcodeBuild( '$examplePath/ios',