Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit d80fe1c

Browse files
vashworthvashworth
authored
Update tests to Xcode 15 and iOS 17 simulator (#49833)
Engine part of flutter/flutter#132237. Also, fixes flutter/flutter#125227. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
1 parent 4e9ff29 commit d80fe1c

File tree

53 files changed

+144
-149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+144
-149
lines changed

‎.ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ platform_properties:
3434
os: Mac-13
3535
$flutter/osx_sdk : >-
3636
{
37-
"sdk_version": "14e300c"
37+
"sdk_version": "15a240d"
3838
}
3939
dimensions:
4040
mac_model: "Macmini8,1|Macmini9,1"
@@ -382,7 +382,7 @@ targets:
382382
]
383383
$flutter/osx_sdk : >-
384384
{
385-
"sdk_version": "14e300c"
385+
"sdk_version": "15a240d"
386386
}
387387
drone_dimensions:
388388
- os=Mac-13
@@ -403,7 +403,7 @@ targets:
403403
config_name: mac_ios_engine
404404
$flutter/osx_sdk : >-
405405
{
406-
"sdk_version": "14e300c"
406+
"sdk_version": "15a240d"
407407
}
408408
drone_dimensions:
409409
- os=Mac-13

‎ci/builders/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ in the `config_name` under `properties`:
5656
properties:
5757
config_name: mac_android_aot_engine
5858
$flutter/osx_sdk : >-
59-
{ "sdk_version": "14e300c" }
59+
{ "sdk_version": "15a240d" }
6060
6161
```
6262

‎ci/builders/mac_android_aot_engine.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
},
3636
"properties": {
3737
"$flutter/osx_sdk": {
38-
"sdk_version": "14e300c"
38+
"sdk_version": "15a240d"
3939
}
4040
}
4141
},
@@ -75,7 +75,7 @@
7575
},
7676
"properties": {
7777
"$flutter/osx_sdk": {
78-
"sdk_version": "14e300c"
78+
"sdk_version": "15a240d"
7979
}
8080
}
8181
},
@@ -115,7 +115,7 @@
115115
},
116116
"properties": {
117117
"$flutter/osx_sdk": {
118-
"sdk_version": "14e300c"
118+
"sdk_version": "15a240d"
119119
}
120120
}
121121
},
@@ -154,7 +154,7 @@
154154
},
155155
"properties": {
156156
"$flutter/osx_sdk": {
157-
"sdk_version": "14e300c"
157+
"sdk_version": "15a240d"
158158
}
159159
}
160160
},
@@ -194,7 +194,7 @@
194194
},
195195
"properties": {
196196
"$flutter/osx_sdk": {
197-
"sdk_version": "14e300c"
197+
"sdk_version": "15a240d"
198198
}
199199
}
200200
},
@@ -234,7 +234,7 @@
234234
},
235235
"properties": {
236236
"$flutter/osx_sdk": {
237-
"sdk_version": "14e300c"
237+
"sdk_version": "15a240d"
238238
}
239239
}
240240
}

‎ci/builders/mac_host_engine.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
},
4848
"properties": {
4949
"$flutter/osx_sdk": {
50-
"sdk_version": "14e300c"
50+
"sdk_version": "15a240d"
5151
}
5252
},
5353
"tests": [
@@ -106,7 +106,7 @@
106106
},
107107
"properties": {
108108
"$flutter/osx_sdk": {
109-
"sdk_version": "14e300c"
109+
"sdk_version": "15a240d"
110110
}
111111
},
112112
"tests": [
@@ -176,7 +176,7 @@
176176
},
177177
"properties": {
178178
"$flutter/osx_sdk": {
179-
"sdk_version": "14e300c"
179+
"sdk_version": "15a240d"
180180
}
181181
},
182182
"tests": [
@@ -237,7 +237,7 @@
237237
},
238238
"properties": {
239239
"$flutter/osx_sdk": {
240-
"sdk_version": "14e300c"
240+
"sdk_version": "15a240d"
241241
}
242242
}
243243
},
@@ -280,7 +280,7 @@
280280
},
281281
"properties": {
282282
"$flutter/osx_sdk": {
283-
"sdk_version": "14e300c"
283+
"sdk_version": "15a240d"
284284
}
285285
}
286286
},
@@ -325,7 +325,7 @@
325325
},
326326
"properties": {
327327
"$flutter/osx_sdk": {
328-
"sdk_version": "14e300c"
328+
"sdk_version": "15a240d"
329329
}
330330
}
331331
}

‎ci/builders/mac_ios_engine.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"properties": {
2121
"$flutter/osx_sdk": {
22-
"sdk_version": "14e300c"
22+
"sdk_version": "15a240d"
2323
}
2424
}
2525
},
@@ -42,7 +42,7 @@
4242
},
4343
"properties": {
4444
"$flutter/osx_sdk": {
45-
"sdk_version": "14e300c"
45+
"sdk_version": "15a240d"
4646
}
4747
}
4848
},
@@ -65,7 +65,7 @@
6565
},
6666
"properties": {
6767
"$flutter/osx_sdk": {
68-
"sdk_version": "14e300c"
68+
"sdk_version": "15a240d"
6969
}
7070
}
7171
},
@@ -89,7 +89,7 @@
8989
},
9090
"properties": {
9191
"$flutter/osx_sdk": {
92-
"sdk_version": "14e300c"
92+
"sdk_version": "15a240d"
9393
}
9494
}
9595
},
@@ -113,7 +113,7 @@
113113
},
114114
"properties": {
115115
"$flutter/osx_sdk": {
116-
"sdk_version": "14e300c"
116+
"sdk_version": "15a240d"
117117
}
118118
}
119119
},
@@ -137,7 +137,7 @@
137137
},
138138
"properties": {
139139
"$flutter/osx_sdk": {
140-
"sdk_version": "14e300c"
140+
"sdk_version": "15a240d"
141141
}
142142
}
143143
},
@@ -161,7 +161,7 @@
161161
},
162162
"properties": {
163163
"$flutter/osx_sdk": {
164-
"sdk_version": "14e300c"
164+
"sdk_version": "15a240d"
165165
}
166166
}
167167
},
@@ -185,7 +185,7 @@
185185
},
186186
"properties": {
187187
"$flutter/osx_sdk": {
188-
"sdk_version": "14e300c"
188+
"sdk_version": "15a240d"
189189
}
190190
}
191191
},
@@ -210,7 +210,7 @@
210210
},
211211
"properties": {
212212
"$flutter/osx_sdk": {
213-
"sdk_version": "14e300c"
213+
"sdk_version": "15a240d"
214214
}
215215
}
216216
},
@@ -235,7 +235,7 @@
235235
},
236236
"properties": {
237237
"$flutter/osx_sdk": {
238-
"sdk_version": "14e300c"
238+
"sdk_version": "15a240d"
239239
}
240240
}
241241
}

‎ci/builders/mac_unopt.json

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
"properties": {
3939
"$flutter/osx_sdk": {
40-
"sdk_version": "14e300c"
40+
"sdk_version": "15a240d"
4141
}
4242
},
4343
"tests": [
@@ -67,10 +67,9 @@
6767
"properties": {
6868
"$flutter/osx_sdk": {
6969
"runtime_versions": [
70-
"ios-16-4_14e300c",
71-
"ios-16-2_14c18"
70+
"ios-17-0_15a240d"
7271
],
73-
"sdk_version": "14e300c"
72+
"sdk_version": "15a240d"
7473
}
7574
},
7675
"drone_dimensions": [
@@ -164,7 +163,7 @@
164163
},
165164
"properties": {
166165
"$flutter/osx_sdk": {
167-
"sdk_version": "14e300c"
166+
"sdk_version": "15a240d"
168167
}
169168
}
170169
},
@@ -181,10 +180,9 @@
181180
"properties": {
182181
"$flutter/osx_sdk": {
183182
"runtime_versions": [
184-
"ios-16-4_14e300c",
185-
"ios-16-2_14c18"
183+
"ios-17-0_15a240d"
186184
],
187-
"sdk_version": "14e300c"
185+
"sdk_version": "15a240d"
188186
}
189187
},
190188
"drone_dimensions": [
@@ -255,10 +253,9 @@
255253
"properties": {
256254
"$flutter/osx_sdk": {
257255
"runtime_versions": [
258-
"ios-16-4_14e300c",
259-
"ios-16-2_14c18"
256+
"ios-17-0_15a240d"
260257
],
261-
"sdk_version": "14e300c"
258+
"sdk_version": "15a240d"
262259
}
263260
},
264261
"drone_dimensions": [

0 commit comments

Comments
 (0)