Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,25 +95,25 @@ 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:
dependencies: >-
[
{"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:
Expand Down Expand Up @@ -1086,7 +1086,6 @@ targets:

- name: Mac_arm64 macos_platform_tests stable - packages
recipe: packages/packages
presubmit: false
timeout: 60
properties:
channel: stable
Expand Down Expand Up @@ -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
Expand All @@ -1237,7 +1235,6 @@ targets:

- name: Mac_arm64 ios_platform_tests_shard_2 stable
recipe: packages/packages
presubmit: false
timeout: 60
properties:
channel: stable
Expand All @@ -1252,7 +1249,6 @@ targets:

- name: Mac_arm64 ios_platform_tests_shard_3 stable
recipe: packages/packages
presubmit: false
timeout: 60
properties:
channel: stable
Expand All @@ -1267,7 +1263,6 @@ targets:

- name: Mac_arm64 ios_platform_tests_shard_4 stable
recipe: packages/packages
presubmit: false
timeout: 60
properties:
channel: stable
Expand All @@ -1282,7 +1277,6 @@ targets:

- name: Mac_arm64 ios_platform_tests_shard_5 stable
recipe: packages/packages
presubmit: false
timeout: 60
properties:
channel: stable
Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/create_simulator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion .ci/targets/ios_platform_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/pigeon/tool/shared/test_suites.dart
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,8 @@ Future<int> _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',
Expand Down