Skip to content

Commit 96867ca

Browse files
committed
Xcode 26
1 parent f452ca2 commit 96867ca

File tree

4 files changed

+10
-16
lines changed

4 files changed

+10
-16
lines changed

.ci.yaml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,25 +93,25 @@ platform_properties:
9393
[
9494
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
9595
]
96-
os: Mac-14|Mac-15.5
96+
os: Mac-15
9797
device_type: none
9898
cpu: arm64
9999
$flutter/osx_sdk : >-
100100
{
101-
"sdk_version": "16c5032a"
101+
"sdk_version": "17a5285i"
102102
}
103103
mac_x64:
104104
properties:
105105
dependencies: >-
106106
[
107107
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
108108
]
109-
os: Mac-14|Mac-15.5
109+
os: Mac-15
110110
device_type: none
111111
cpu: x86
112112
$flutter/osx_sdk : >-
113113
{
114-
"sdk_version": "16c5032a"
114+
"sdk_version": "17a5285i"
115115
}
116116
117117
targets:
@@ -394,7 +394,7 @@ targets:
394394
### Android tasks ###
395395
- name: Linux_android android_build_all_packages master
396396
recipe: packages/packages
397-
timeout: 60
397+
timeout: 30
398398
properties:
399399
version_file: flutter_master.version
400400
# This builds the all_packages app only in a current JDK.
@@ -407,7 +407,7 @@ targets:
407407
408408
- name: Linux_android android_build_all_packages stable
409409
recipe: packages/packages
410-
timeout: 60
410+
timeout: 30
411411
properties:
412412
add_recipes_cq: "true"
413413
version_file: flutter_stable.version
@@ -1084,7 +1084,6 @@ targets:
10841084
10851085
- name: Mac_arm64 macos_platform_tests stable - packages
10861086
recipe: packages/packages
1087-
presubmit: false
10881087
timeout: 60
10891088
properties:
10901089
channel: stable
@@ -1220,7 +1219,6 @@ targets:
12201219
# Don't run full platform tests on both channels in pre-submit.
12211220
- name: Mac_arm64 ios_platform_tests_shard_1 stable
12221221
recipe: packages/packages
1223-
presubmit: false
12241222
timeout: 60
12251223
properties:
12261224
channel: stable
@@ -1235,7 +1233,6 @@ targets:
12351233
12361234
- name: Mac_arm64 ios_platform_tests_shard_2 stable
12371235
recipe: packages/packages
1238-
presubmit: false
12391236
timeout: 60
12401237
properties:
12411238
channel: stable
@@ -1250,7 +1247,6 @@ targets:
12501247
12511248
- name: Mac_arm64 ios_platform_tests_shard_3 stable
12521249
recipe: packages/packages
1253-
presubmit: false
12541250
timeout: 60
12551251
properties:
12561252
channel: stable
@@ -1265,7 +1261,6 @@ targets:
12651261
12661262
- name: Mac_arm64 ios_platform_tests_shard_4 stable
12671263
recipe: packages/packages
1268-
presubmit: false
12691264
timeout: 60
12701265
properties:
12711266
channel: stable
@@ -1280,7 +1275,6 @@ targets:
12801275
12811276
- name: Mac_arm64 ios_platform_tests_shard_5 stable
12821277
recipe: packages/packages
1283-
presubmit: false
12841278
timeout: 60
12851279
properties:
12861280
channel: stable

.ci/scripts/create_simulator.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set -o pipefail
99
# The name here must match remove_simulator.sh
1010
readonly DEVICE_NAME=Flutter-iPhone
1111
readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-14
12-
readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-18-2
12+
readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-26-0
1313

1414
# Delete any existing devices named Flutter-iPhone. Having more than one may
1515
# cause issues when builds target the device.

.ci/targets/ios_platform_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ tasks:
2222
- name: native test
2323
script: .ci/scripts/tool_runner.sh
2424
# Simulator name and version must match name and version in create_simulator.sh
25-
args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=18.2", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"]
25+
args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=26.0", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"]
2626
- name: boot simulator
2727
# Ensure simulator is still booted
2828
script: .ci/scripts/boot_simulator.sh

packages/pigeon/tool/shared/test_suites.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,8 @@ Future<int> _runIOSPluginUnitTests(String testPluginPath) async {
327327

328328
const String deviceName = 'Pigeon-Test-iPhone';
329329
const String deviceType = 'com.apple.CoreSimulator.SimDeviceType.iPhone-14';
330-
const String deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-18-2';
331-
const String deviceOS = '18.2';
330+
const String deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-26-0';
331+
const String deviceOS = '26.0';
332332
await _createSimulator(deviceName, deviceType, deviceRuntime);
333333
return runXcodeBuild(
334334
'$examplePath/ios',

0 commit comments

Comments
 (0)