Skip to content

Commit f455595

Browse files
committed
Move to Xcode 26 in CI
1 parent 1387ba3 commit f455595

File tree

4 files changed

+109
-26
lines changed

4 files changed

+109
-26
lines changed

.bazelci/presubmit.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@ x_defaults:
44
# it doesn't know about; so that is used to avoid repeating common subparts.
55
common: &common
66
platform: macos_arm64
7-
xcode_version: "16.4"
87
shell_commands:
9-
- xcrun simctl runtime list
10-
- xcodebuild -downloadPlatform iOS -buildVersion 18.5
11-
- xcrun simctl runtime match set iphoneos18.5 22F77
8+
- xcodebuild -downloadComponent metalToolchain
129
- xcrun simctl runtime list
1310
- xcrun simctl runtime match list
1411
post_shell_commands:
15-
- xcrun simctl runtime match set iphoneos18.5 --default
1612
- xcrun simctl runtime match list
1713
build_targets:
1814
- "tools/..."
Lines changed: 89 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,130 @@
11
{
22
"images" : [
33
{
4-
"size" : "24x24",
5-
"idiom" : "watch",
64
"filename" : "[email protected]",
7-
"scale" : "2x",
5+
"idiom" : "watch",
86
"role" : "notificationCenter",
7+
"scale" : "2x",
8+
"size" : "24x24",
99
"subtype" : "38mm"
1010
},
1111
{
12-
"size" : "27.5x27.5",
13-
"idiom" : "watch",
1412
"filename" : "[email protected]",
15-
"scale" : "2x",
13+
"idiom" : "watch",
1614
"role" : "notificationCenter",
15+
"scale" : "2x",
16+
"size" : "27.5x27.5",
1717
"subtype" : "42mm"
1818
},
1919
{
20-
"size" : "29x29",
21-
"idiom" : "watch",
2220
"filename" : "[email protected]",
21+
"idiom" : "watch",
2322
"role" : "companionSettings",
24-
"scale" : "2x"
23+
"scale" : "2x",
24+
"size" : "29x29"
2525
},
2626
{
27-
"size" : "29x29",
28-
"idiom" : "watch",
2927
"filename" : "[email protected]",
28+
"idiom" : "watch",
3029
"role" : "companionSettings",
31-
"scale" : "3x"
30+
"scale" : "3x",
31+
"size" : "29x29"
3232
},
3333
{
34-
"size" : "40x40",
3534
"idiom" : "watch",
36-
"filename" : "[email protected]",
35+
"role" : "notificationCenter",
3736
"scale" : "2x",
37+
"size" : "33x33",
38+
"subtype" : "45mm"
39+
},
40+
{
41+
"filename" : "[email protected]",
42+
"idiom" : "watch",
3843
"role" : "appLauncher",
44+
"scale" : "2x",
45+
"size" : "40x40",
3946
"subtype" : "38mm"
4047
},
4148
{
42-
"size" : "86x86",
4349
"idiom" : "watch",
44-
"filename" : "[email protected]",
50+
"role" : "appLauncher",
51+
"scale" : "2x",
52+
"size" : "44x44",
53+
"subtype" : "40mm"
54+
},
55+
{
56+
"idiom" : "watch",
57+
"role" : "appLauncher",
58+
"scale" : "2x",
59+
"size" : "46x46",
60+
"subtype" : "41mm"
61+
},
62+
{
63+
"idiom" : "watch",
64+
"role" : "appLauncher",
65+
"scale" : "2x",
66+
"size" : "50x50",
67+
"subtype" : "44mm"
68+
},
69+
{
70+
"idiom" : "watch",
71+
"role" : "appLauncher",
4572
"scale" : "2x",
73+
"size" : "51x51",
74+
"subtype" : "45mm"
75+
},
76+
{
77+
"idiom" : "watch",
78+
"role" : "appLauncher",
79+
"scale" : "2x",
80+
"size" : "54x54",
81+
"subtype" : "49mm"
82+
},
83+
{
84+
"filename" : "[email protected]",
85+
"idiom" : "watch",
4686
"role" : "quickLook",
87+
"scale" : "2x",
88+
"size" : "86x86",
4789
"subtype" : "38mm"
4890
},
4991
{
92+
"filename" : "[email protected]",
93+
"idiom" : "watch",
94+
"role" : "quickLook",
95+
"scale" : "2x",
5096
"size" : "98x98",
97+
"subtype" : "42mm"
98+
},
99+
{
51100
"idiom" : "watch",
52-
"filename" : "[email protected]",
101+
"role" : "quickLook",
53102
"scale" : "2x",
103+
"size" : "108x108",
104+
"subtype" : "44mm"
105+
},
106+
{
107+
"idiom" : "watch",
54108
"role" : "quickLook",
55-
"subtype" : "42mm"
109+
"scale" : "2x",
110+
"size" : "117x117",
111+
"subtype" : "45mm"
112+
},
113+
{
114+
"idiom" : "watch",
115+
"role" : "quickLook",
116+
"scale" : "2x",
117+
"size" : "129x129",
118+
"subtype" : "49mm"
119+
},
120+
{
121+
"idiom" : "watch-marketing",
122+
"scale" : "1x",
123+
"size" : "1024x1024"
56124
}
57125
],
58126
"info" : {
59-
"version" : 1,
60-
"author" : "xcode"
127+
"author" : "xcode",
128+
"version" : 1
61129
}
62-
}
130+
}

test/testdata/resources/assets.xcassets/star.imageset/Contents.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,13 @@
4141
"scale" : "2x"
4242
},
4343
{
44+
"filename" : "star.png",
4445
"idiom" : "ipad",
4546
"scale" : "1x",
4647
"subtype" : "mac-catalyst"
4748
},
4849
{
50+
"filename" : "star_2x.png",
4951
"idiom" : "ipad",
5052
"scale" : "2x",
5153
"subtype" : "mac-catalyst"
@@ -70,6 +72,11 @@
7072
"idiom" : "mac",
7173
"scale" : "2x"
7274
},
75+
{
76+
"filename" : "star_2x.png",
77+
"idiom" : "vision",
78+
"scale" : "2x"
79+
},
7380
{
7481
"filename" : "star_2x.png",
7582
"idiom" : "watch",

test/testdata/resources/assets.xcassets/tint.colorset/Contents.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,18 @@
182182
},
183183
"idiom" : "mac"
184184
},
185+
{
186+
"color" : {
187+
"color-space" : "srgb",
188+
"components" : {
189+
"alpha" : "1.000",
190+
"blue" : "1.000",
191+
"green" : "1.000",
192+
"red" : "1.000"
193+
}
194+
},
195+
"idiom" : "vision"
196+
},
185197
{
186198
"color" : {
187199
"color-space" : "srgb",

0 commit comments

Comments
 (0)