Try Xcode 16.4 (#170274)
Test out experimental branch by testing Xcode 16.4
diff --git a/.ci.yaml b/.ci.yaml
index 6900714..c6d30a0 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -13,11 +13,11 @@
[
{"dependency": "apple_signing", "version": "version:to_2025"}
]
- os: Mac-14
+ os: Mac-15.5
device_type: none
$flutter/osx_sdk : >-
{
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
mac_arm64:
properties:
@@ -29,12 +29,12 @@
[
{"dependency": "apple_signing", "version": "version:to_2025"}
]
- os: Mac-14
+ os: Mac-15.5
device_type: none
cpu: arm64
$flutter/osx_sdk : >-
{
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
mac_benchmark:
properties:
@@ -48,12 +48,12 @@
]
device_type: none
mac_model: "Macmini8,1"
- os: Mac-14
+ os: Mac-15.5
tags: >
["devicelab", "hostonly", "mac"]
$flutter/osx_sdk : >-
{
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
mac_x64:
properties:
@@ -65,12 +65,12 @@
[
{"dependency": "apple_signing", "version": "version:to_2025"}
]
- os: Mac-14
+ os: Mac-15.5
device_type: none
cpu: x86
$flutter/osx_sdk : >-
{
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
mac_build_test:
properties:
@@ -83,12 +83,12 @@
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
{"dependency": "apple_signing", "version": "version:to_2025"}
]
- os: Mac-14
+ os: Mac-15.5
device_type: none
cpu: x86
$flutter/osx_sdk : >-
{
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
mac_ios:
properties:
@@ -101,11 +101,11 @@
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
{"dependency": "apple_signing", "version": "version:to_2025"}
]
- os: Mac-14|Mac-15.1
+ os: Mac-15.5
device_os: iOS-17|iOS-18
$flutter/osx_sdk : >-
{
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
mac_x64_ios:
properties:
@@ -118,12 +118,12 @@
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
{"dependency": "apple_signing", "version": "version:to_2025"}
]
- os: Mac-14|Mac-15.1
+ os: Mac-15.5
cpu: x86
device_os: iOS-17|iOS-18
$flutter/osx_sdk : >-
{
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
mac_arm64_ios:
properties:
@@ -136,12 +136,12 @@
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
{"dependency": "apple_signing", "version": "none"}
]
- os: Mac-14|Mac-15.1
+ os: Mac-15.5
cpu: arm64
device_os: iOS-17|iOS-18
$flutter/osx_sdk : >-
{
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
targets:
diff --git a/engine/src/flutter/.ci.yaml b/engine/src/flutter/.ci.yaml
index 27dc413..03a5430 100644
--- a/engine/src/flutter/.ci.yaml
+++ b/engine/src/flutter/.ci.yaml
@@ -6,10 +6,10 @@
mac:
properties:
device_type: none
- os: Mac-14
+ os: Mac-15.5
$flutter/osx_sdk : >-
{
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
targets:
@@ -65,12 +65,12 @@
config_name: mac_host_engine
$flutter/osx_sdk : >-
{
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
# Do not remove(https://github.com/flutter/flutter/issues/144644)
# Scheduler will fail to get the platform
drone_dimensions:
- - os=Mac-14
+ - os=Mac-15.5
- name: Mac mac_ios_engine
recipe: engine_v2/engine_v2
@@ -81,10 +81,10 @@
config_name: mac_ios_engine
$flutter/osx_sdk : >-
{
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
# Do not remove(https://github.com/flutter/flutter/issues/144644)
# Scheduler will fail to get the platform
drone_dimensions:
- - os=Mac-14
+ - os=Mac-15.5
- cpu=x86
diff --git a/engine/src/flutter/ci/builders/local_engine.json b/engine/src/flutter/ci/builders/local_engine.json
index 61ee3d8..dff8758 100644
--- a/engine/src/flutter/ci/builders/local_engine.json
+++ b/engine/src/flutter/ci/builders/local_engine.json
@@ -3,7 +3,7 @@
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -29,14 +29,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -63,14 +63,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -96,14 +96,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -129,14 +129,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -163,14 +163,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -199,14 +199,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -231,7 +231,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
@@ -344,7 +344,7 @@
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -370,14 +370,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -403,14 +403,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -435,7 +435,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
@@ -494,7 +494,7 @@
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -519,7 +519,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
@@ -578,7 +578,7 @@
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -603,14 +603,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -636,14 +636,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -669,14 +669,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -702,7 +702,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
@@ -815,7 +815,7 @@
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -840,7 +840,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
@@ -899,7 +899,7 @@
{
"cas_archive": false,
"drone_dimensions": [
- "os=Mac-14",
+ "os=Mac-15.5",
"device_type=none"
],
"gclient_variables": {
@@ -924,7 +924,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
@@ -1037,7 +1037,7 @@
"name": "macos/wasm_release",
"drone_dimensions": [
"device_type=none",
- "os=Mac-14"
+ "os=Mac-15.5"
],
"gclient_variables": {
"download_android_deps": false,
@@ -1067,7 +1067,7 @@
"name": "macos/wasm_debug_unopt",
"drone_dimensions": [
"device_type=none",
- "os=Mac-14"
+ "os=Mac-15.5"
],
"gclient_variables": {
"download_android_deps": false,
diff --git a/engine/src/flutter/ci/builders/mac_android_aot_engine.json b/engine/src/flutter/ci/builders/mac_android_aot_engine.json
index 17b794d..9ac5f0e 100644
--- a/engine/src/flutter/ci/builders/mac_android_aot_engine.json
+++ b/engine/src/flutter/ci/builders/mac_android_aot_engine.json
@@ -22,7 +22,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=x86"
],
"gclient_variables": {
@@ -62,7 +62,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
@@ -80,7 +80,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=x86"
],
"gclient_variables": {
@@ -122,7 +122,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
@@ -140,7 +140,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=x86"
],
"gclient_variables": {
@@ -182,7 +182,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
@@ -200,7 +200,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=x86"
],
"gclient_variables": {
@@ -240,7 +240,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
@@ -258,7 +258,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=x86"
],
"gclient_variables": {
@@ -300,7 +300,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
@@ -318,7 +318,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=x86"
],
"gclient_variables": {
@@ -360,7 +360,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
}
diff --git a/engine/src/flutter/ci/builders/mac_clang_tidy.json b/engine/src/flutter/ci/builders/mac_clang_tidy.json
index 29ff251..16394d9 100644
--- a/engine/src/flutter/ci/builders/mac_clang_tidy.json
+++ b/engine/src/flutter/ci/builders/mac_clang_tidy.json
@@ -3,7 +3,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -29,14 +29,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -63,7 +63,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
}
@@ -74,7 +74,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -120,7 +120,7 @@
],
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
@@ -129,7 +129,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -175,7 +175,7 @@
],
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
@@ -184,7 +184,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -230,7 +230,7 @@
],
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
@@ -239,7 +239,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -285,7 +285,7 @@
],
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
@@ -294,7 +294,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -358,7 +358,7 @@
],
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
}
diff --git a/engine/src/flutter/ci/builders/mac_host_engine.json b/engine/src/flutter/ci/builders/mac_host_engine.json
index c8288e1..b760e0c 100644
--- a/engine/src/flutter/ci/builders/mac_host_engine.json
+++ b/engine/src/flutter/ci/builders/mac_host_engine.json
@@ -18,7 +18,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -64,7 +64,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -85,7 +85,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -133,7 +133,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -141,7 +141,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -187,7 +187,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -206,7 +206,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -249,7 +249,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -257,7 +257,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -300,7 +300,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -308,7 +308,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -351,7 +351,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -371,7 +371,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -417,7 +417,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -425,7 +425,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -470,7 +470,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -478,7 +478,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -523,7 +523,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -544,7 +544,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -593,7 +593,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -601,7 +601,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -649,7 +649,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -657,7 +657,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -704,7 +704,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -723,7 +723,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -770,7 +770,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -778,7 +778,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -825,7 +825,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -833,7 +833,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -880,7 +880,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -900,7 +900,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -950,7 +950,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -958,7 +958,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -1007,7 +1007,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
@@ -1015,7 +1015,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -1064,7 +1064,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"timeout": 90
diff --git a/engine/src/flutter/ci/builders/mac_ios_engine.json b/engine/src/flutter/ci/builders/mac_ios_engine.json
index 1f264d9..dfdaa8f 100644
--- a/engine/src/flutter/ci/builders/mac_ios_engine.json
+++ b/engine/src/flutter/ci/builders/mac_ios_engine.json
@@ -15,7 +15,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -55,14 +55,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -104,14 +104,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -151,14 +151,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -198,14 +198,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -245,14 +245,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -294,14 +294,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -345,14 +345,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -394,14 +394,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -443,14 +443,14 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
},
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -492,7 +492,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
}
}
diff --git a/engine/src/flutter/ci/builders/mac_unopt.json b/engine/src/flutter/ci/builders/mac_unopt.json
index 7b964cb..43de9b6 100644
--- a/engine/src/flutter/ci/builders/mac_unopt.json
+++ b/engine/src/flutter/ci/builders/mac_unopt.json
@@ -4,7 +4,7 @@
"cas_archive": false,
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -35,7 +35,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"tests": [
@@ -57,7 +57,7 @@
"cas_archive": false,
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -86,7 +86,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"tests": [
@@ -108,7 +108,7 @@
"cas_archive": false,
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -138,7 +138,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"tests": [
@@ -165,7 +165,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -195,7 +195,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"tests": [
@@ -217,14 +217,14 @@
"properties": {
"$flutter/osx_sdk": {
"runtime_versions": [
- "ios-18-2_16c5032a"
+ "ios-18-2_16f6"
],
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=x86"
],
"gclient_variables": {
@@ -281,7 +281,7 @@
"cas_archive": false,
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -314,7 +314,7 @@
},
"properties": {
"$flutter/osx_sdk": {
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"tests": [
@@ -343,14 +343,14 @@
"properties": {
"$flutter/osx_sdk": {
"runtime_versions": [
- "ios-18-2_16c5032a"
+ "ios-18-2_16f6"
],
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {
@@ -411,14 +411,14 @@
"properties": {
"$flutter/osx_sdk": {
"runtime_versions": [
- "ios-18-2_16c5032a"
+ "ios-18-2_16f6"
],
- "sdk_version": "16c5032a"
+ "sdk_version": "16f6"
}
},
"drone_dimensions": [
"device_type=none",
- "os=Mac-14",
+ "os=Mac-15.5",
"cpu=arm64"
],
"gclient_variables": {