Skip to content

Commit aa0cef2

Browse files
keithaaronsky
keith
and
aaronsky
authored
Move to Xcode 26 in CI (#2813)
Co-authored-by: Aaron Sky <[email protected]>
1 parent d240302 commit aa0cef2

File tree

9 files changed

+7
-606
lines changed

9 files changed

+7
-606
lines changed

‎.bazelci/presubmit.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@ 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
11+
- xcrun simctl runtime dyld_shared_cache update --all
1412
post_shell_commands:
15-
- xcrun simctl runtime match set iphoneos18.5 --default
1613
- xcrun simctl runtime match list
1714
build_targets:
1815
- "tools/..."

‎examples/watchos/HelloWorld/BUILD‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ objc_library(
5353
"WatchApp2Sources/ExtensionDelegate.h",
5454
"WatchApp2Sources/ExtensionDelegate.m",
5555
],
56+
tags = ["manual"],
5657
deps = [":WatchSharedSources"],
5758
)
5859

@@ -63,6 +64,7 @@ objc_library(
6364
"SingleTargetWatchSources/AppDelegate.m",
6465
"SingleTargetWatchSources/main.m",
6566
],
67+
tags = ["manual"],
6668
deps = [":WatchSharedSources"],
6769
)
6870

‎test/starlark_tests/apple_static_library_tests.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ def apple_static_library_test_suite(name):
339339
tags = [name],
340340
)
341341

342-
# Test that the output binary is identified as visionOS simulator (PLATFORM_XROSSIMULATOR) via
342+
# Test that the output binary is identified as visionOS simulator (PLATFORM_VISIONOSSIMULATOR) via
343343
# the Mach-O load command LC_BUILD_VERSION for an arm64 binary.
344344
binary_contents_test(
345345
name = "{}_visionos_binary_contents_arm_simulator_platform_test".format(name),
@@ -350,7 +350,7 @@ def apple_static_library_test_suite(name):
350350
},
351351
binary_test_file = "$BINARY",
352352
binary_test_architecture = "arm64",
353-
macho_load_commands_contain = ["cmd LC_BUILD_VERSION", "minos " + common.min_os_visionos.baseline, "platform XROSSIMULATOR"],
353+
macho_load_commands_contain = ["cmd LC_BUILD_VERSION", "minos " + common.min_os_visionos.baseline, "platform VISIONOSSIMULATOR"],
354354
tags = [
355355
name,
356356
],

‎test/starlark_tests/resources/assets.xcassets/star.imageset/Contents.json‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -14,76 +14,6 @@
1414
"filename" : "star_3x.png",
1515
"idiom" : "universal",
1616
"scale" : "3x"
17-
},
18-
{
19-
"filename" : "star.png",
20-
"idiom" : "iphone",
21-
"scale" : "1x"
22-
},
23-
{
24-
"filename" : "star_2x.png",
25-
"idiom" : "iphone",
26-
"scale" : "2x"
27-
},
28-
{
29-
"filename" : "star_3x.png",
30-
"idiom" : "iphone",
31-
"scale" : "3x"
32-
},
33-
{
34-
"filename" : "star.png",
35-
"idiom" : "ipad",
36-
"scale" : "1x"
37-
},
38-
{
39-
"filename" : "star_2x.png",
40-
"idiom" : "ipad",
41-
"scale" : "2x"
42-
},
43-
{
44-
"idiom" : "ipad",
45-
"scale" : "1x",
46-
"subtype" : "mac-catalyst"
47-
},
48-
{
49-
"idiom" : "ipad",
50-
"scale" : "2x",
51-
"subtype" : "mac-catalyst"
52-
},
53-
{
54-
"filename" : "star_2x.png",
55-
"idiom" : "car",
56-
"scale" : "2x"
57-
},
58-
{
59-
"filename" : "star_3x.png",
60-
"idiom" : "car",
61-
"scale" : "3x"
62-
},
63-
{
64-
"filename" : "star.png",
65-
"idiom" : "mac",
66-
"scale" : "1x"
67-
},
68-
{
69-
"filename" : "star_2x.png",
70-
"idiom" : "mac",
71-
"scale" : "2x"
72-
},
73-
{
74-
"filename" : "star_2x.png",
75-
"idiom" : "watch",
76-
"scale" : "2x"
77-
},
78-
{
79-
"filename" : "star.png",
80-
"idiom" : "tv",
81-
"scale" : "1x"
82-
},
83-
{
84-
"filename" : "star_2x.png",
85-
"idiom" : "tv",
86-
"scale" : "2x"
8717
}
8818
],
8919
"info" : {

‎test/starlark_tests/resources/assets.xcassets/tint.colorset/Contents.json‎

Lines changed: 0 additions & 194 deletions
Original file line numberDiff line numberDiff line change
@@ -29,200 +29,6 @@
2929
}
3030
},
3131
"idiom" : "universal"
32-
},
33-
{
34-
"color" : {
35-
"color-space" : "srgb",
36-
"components" : {
37-
"alpha" : "1.000",
38-
"blue" : "1.000",
39-
"green" : "1.000",
40-
"red" : "1.000"
41-
}
42-
},
43-
"idiom" : "iphone"
44-
},
45-
{
46-
"appearances" : [
47-
{
48-
"appearance" : "luminosity",
49-
"value" : "dark"
50-
}
51-
],
52-
"color" : {
53-
"color-space" : "srgb",
54-
"components" : {
55-
"alpha" : "1.000",
56-
"blue" : "0.000",
57-
"green" : "0.000",
58-
"red" : "0.000"
59-
}
60-
},
61-
"idiom" : "iphone"
62-
},
63-
{
64-
"color" : {
65-
"color-space" : "srgb",
66-
"components" : {
67-
"alpha" : "1.000",
68-
"blue" : "1.000",
69-
"green" : "1.000",
70-
"red" : "1.000"
71-
}
72-
},
73-
"idiom" : "ipad"
74-
},
75-
{
76-
"appearances" : [
77-
{
78-
"appearance" : "luminosity",
79-
"value" : "dark"
80-
}
81-
],
82-
"color" : {
83-
"color-space" : "srgb",
84-
"components" : {
85-
"alpha" : "1.000",
86-
"blue" : "0.000",
87-
"green" : "0.000",
88-
"red" : "0.000"
89-
}
90-
},
91-
"idiom" : "ipad"
92-
},
93-
{
94-
"color" : {
95-
"color-space" : "srgb",
96-
"components" : {
97-
"alpha" : "1.000",
98-
"blue" : "1.000",
99-
"green" : "1.000",
100-
"red" : "1.000"
101-
}
102-
},
103-
"idiom" : "ipad",
104-
"subtype" : "mac-catalyst"
105-
},
106-
{
107-
"appearances" : [
108-
{
109-
"appearance" : "luminosity",
110-
"value" : "dark"
111-
}
112-
],
113-
"color" : {
114-
"color-space" : "srgb",
115-
"components" : {
116-
"alpha" : "1.000",
117-
"blue" : "0.000",
118-
"green" : "0.000",
119-
"red" : "0.000"
120-
}
121-
},
122-
"idiom" : "ipad",
123-
"subtype" : "mac-catalyst"
124-
},
125-
{
126-
"color" : {
127-
"color-space" : "srgb",
128-
"components" : {
129-
"alpha" : "1.000",
130-
"blue" : "1.000",
131-
"green" : "1.000",
132-
"red" : "1.000"
133-
}
134-
},
135-
"idiom" : "car"
136-
},
137-
{
138-
"appearances" : [
139-
{
140-
"appearance" : "luminosity",
141-
"value" : "dark"
142-
}
143-
],
144-
"color" : {
145-
"color-space" : "srgb",
146-
"components" : {
147-
"alpha" : "1.000",
148-
"blue" : "0.000",
149-
"green" : "0.000",
150-
"red" : "0.000"
151-
}
152-
},
153-
"idiom" : "car"
154-
},
155-
{
156-
"color" : {
157-
"color-space" : "srgb",
158-
"components" : {
159-
"alpha" : "1.000",
160-
"blue" : "1.000",
161-
"green" : "1.000",
162-
"red" : "1.000"
163-
}
164-
},
165-
"idiom" : "mac"
166-
},
167-
{
168-
"appearances" : [
169-
{
170-
"appearance" : "luminosity",
171-
"value" : "dark"
172-
}
173-
],
174-
"color" : {
175-
"color-space" : "srgb",
176-
"components" : {
177-
"alpha" : "1.000",
178-
"blue" : "0.000",
179-
"green" : "0.000",
180-
"red" : "0.000"
181-
}
182-
},
183-
"idiom" : "mac"
184-
},
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" : "watch"
196-
},
197-
{
198-
"color" : {
199-
"color-space" : "srgb",
200-
"components" : {
201-
"alpha" : "1.000",
202-
"blue" : "1.000",
203-
"green" : "1.000",
204-
"red" : "1.000"
205-
}
206-
},
207-
"idiom" : "tv"
208-
},
209-
{
210-
"appearances" : [
211-
{
212-
"appearance" : "luminosity",
213-
"value" : "dark"
214-
}
215-
],
216-
"color" : {
217-
"color-space" : "srgb",
218-
"components" : {
219-
"alpha" : "1.000",
220-
"blue" : "0.000",
221-
"green" : "0.000",
222-
"red" : "0.000"
223-
}
224-
},
225-
"idiom" : "tv"
22632
}
22733
],
22834
"info" : {

‎test/starlark_tests/visionos_application_tests.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def visionos_application_test_suite(name):
103103
},
104104
binary_test_file = "$BINARY",
105105
binary_test_architecture = "arm64",
106-
macho_load_commands_contain = ["cmd LC_BUILD_VERSION", "minos " + common.min_os_visionos.baseline, "platform XROSSIMULATOR"],
106+
macho_load_commands_contain = ["cmd LC_BUILD_VERSION", "minos " + common.min_os_visionos.baseline, "platform VISIONOSSIMULATOR"],
107107
tags = [
108108
name,
109109
],

0 commit comments

Comments
 (0)