From 7fbfcc33e413d6446f4a9e2ddc3c0baef9ad3d24 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Wed, 30 Jul 2025 12:07:17 -0500 Subject: [PATCH 1/2] test xcode 26 beta 4 --- .ci.yaml | 14 ++++---------- .ci/scripts/create_simulator.sh | 2 +- packages/pigeon/tool/shared/test_suites.dart | 4 ++-- script/tool/lib/src/podspec_check_command.dart | 1 + script/tool/test/podspec_check_command_test.dart | 4 ++++ 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index f22cd9b83e8..244cb2d554f 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -93,12 +93,12 @@ platform_properties: [ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] - os: Mac-14|Mac-15.5 + os: Mac-15 device_type: none cpu: arm64 $flutter/osx_sdk : >- { - "sdk_version": "16c5032a" + "sdk_version": "17a5285i" } mac_x64: properties: @@ -106,12 +106,12 @@ platform_properties: [ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] - os: Mac-14|Mac-15.5 + os: Mac-15 device_type: none cpu: x86 $flutter/osx_sdk : >- { - "sdk_version": "16c5032a" + "sdk_version": "17a5285i" } targets: @@ -1084,7 +1084,6 @@ targets: - name: Mac_arm64 macos_platform_tests stable - packages recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -1220,7 +1219,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 @@ -1235,7 +1233,6 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_2 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -1250,7 +1247,6 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_3 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -1265,7 +1261,6 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_4 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -1280,7 +1275,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 ace8261b635..ff695854ca9 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-0 # Delete any existing devices named Flutter-iPhone. Having more than one may # cause issues when builds target the device. diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index a16afe0c2e7..bbe639ef1bc 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -327,8 +327,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-18-2'; - const String deviceOS = '18.2'; + const String deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-26-0'; + const String deviceOS = '26.0'; await _createSimulator(deviceName, deviceType, deviceRuntime); return runXcodeBuild( '$examplePath/ios', diff --git a/script/tool/lib/src/podspec_check_command.dart b/script/tool/lib/src/podspec_check_command.dart index bd52b547bbd..1b29497f0ac 100644 --- a/script/tool/lib/src/podspec_check_command.dart +++ b/script/tool/lib/src/podspec_check_command.dart @@ -159,6 +159,7 @@ class PodspecCheckCommand extends PackageLoopingCommand { podspecPath, '--configuration=Debug', // Release targets unsupported arm64 simulators. Use Debug to only build against targeted x86_64 simulator devices. '--skip-tests', + '--allow-warnings', if (libraryLint) '--use-libraries' ]; diff --git a/script/tool/test/podspec_check_command_test.dart b/script/tool/test/podspec_check_command_test.dart index c2506de6313..971bddfadab 100644 --- a/script/tool/test/podspec_check_command_test.dart +++ b/script/tool/test/podspec_check_command_test.dart @@ -155,6 +155,7 @@ void main() { .path, '--configuration=Debug', '--skip-tests', + '--allow-warnings', '--use-libraries' ], packagesDir.path), @@ -169,6 +170,7 @@ void main() { .path, '--configuration=Debug', '--skip-tests', + '--allow-warnings', ], packagesDir.path), ]), @@ -209,6 +211,7 @@ void main() { .path, '--configuration=Debug', '--skip-tests', + '--allow-warnings', '--use-libraries' ], packagesDir.path), @@ -223,6 +226,7 @@ void main() { .path, '--configuration=Debug', '--skip-tests', + '--allow-warnings', ], packagesDir.path), ]), From 840756afe0d9bd4ab1fff952864cc240d95e9043 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Wed, 30 Jul 2025 12:30:24 -0500 Subject: [PATCH 2/2] fix incorrect simulator version --- .ci/targets/ios_platform_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/targets/ios_platform_tests.yaml b/.ci/targets/ios_platform_tests.yaml index a2b01241e73..81db8791c80 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.0", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"] - name: boot simulator # Ensure simulator is still booted script: .ci/scripts/boot_simulator.sh