diff --git a/.ci.yaml b/.ci.yaml index 35d4b2ec200..2761467cd78 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -95,12 +95,12 @@ platform_properties: [ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] - os: Mac-15.5|Mac-15.7 + os: Mac-15.7 device_type: none cpu: arm64 $flutter/osx_sdk : >- { - "sdk_version": "16c5032a" + "sdk_version": "17c52" } mac_x64: properties: @@ -108,12 +108,12 @@ platform_properties: [ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] - os: Mac-15.5|Mac-15.7 + os: Mac-15.7 device_type: none - cpu: x86 + cpu: arm64 $flutter/osx_sdk : >- { - "sdk_version": "16c5032a" + "sdk_version": "17c52" } targets: @@ -1086,7 +1086,6 @@ targets: - name: Mac_arm64 macos_platform_tests stable - packages recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -1222,7 +1221,6 @@ targets: # Don't run full platform tests on both channels in pre-submit. - name: Mac_arm64 ios_platform_tests_shard_1 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -1237,7 +1235,6 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_2 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -1252,7 +1249,6 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_3 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -1267,7 +1263,6 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_4 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -1282,7 +1277,6 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_5 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable diff --git a/.ci/scripts/create_simulator.sh b/.ci/scripts/create_simulator.sh index a993f470f37..e4310026600 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-18-2 +readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-26-2 # 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 262de31fb93..4a8a45374e5 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=18.2", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"] + args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=26.2", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"] - 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 fe86925792a..993f276ecd3 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -359,8 +359,8 @@ Future _runIOSPluginUnitTests(String testPluginPath) async { const deviceName = 'Pigeon-Test-iPhone'; const deviceType = 'com.apple.CoreSimulator.SimDeviceType.iPhone-14'; - const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-18-2'; - const deviceOS = '18.2'; + const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-26-2'; + const deviceOS = '26.2'; await _createSimulator(deviceName, deviceType, deviceRuntime); return runXcodeBuild( '$examplePath/ios',