Skip to content

Commit 0dcf6c2

Browse files
Kyle-YeKyle-Ye
authored
Update AvailabilityVersions from 143.7 to 151-patch (#592)
1 parent de74d39 commit 0dcf6c2

File tree

4 files changed

+115
-11
lines changed

4 files changed

+115
-11
lines changed

‎Docs/AvailabilityVersions/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The OpenSwiftUI project uses a semantic versioning system defined in `Semantics.
1010

1111
The version information used in `Semantics.swift` is derived from Apple's official availability definitions:
1212

13-
- Current implementation is based on [AvailabilityVersions-143.7](https://github.com/apple-oss-distributions/AvailabilityVersions/blob/AvailabilityVersions-143.7/availability.dsl)
13+
- Current implementation is based on [AvailabilityVersions-151-patch](https://github.com/OpenSwiftUIProject/AvailabilityVersions/blob/AvailabilityVersions-151-patch/availability.dsl)
1414
- The availability DSL file defines the relationships between OS versions and their corresponding version sets
1515

1616
## Versioning Structure
@@ -40,7 +40,7 @@ When updating the project to support new OS versions:
4040
## References
4141

4242
- [The Apple Wiki Timeline](https://theapplewiki.com/wiki/Timeline)
43-
- [Apple OSS Distributions](https://github.com/apple-oss-distributions/AvailabilityVersions)
43+
- [AvailabilityVersions Fork](https://github.com/OpenSwiftUIProject/AvailabilityVersions)
4444

4545
## License
4646

‎Docs/AvailabilityVersions/VersionMap.h‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ struct __attribute__((visibility("hidden"))) VersionSetEntry {
2020
}
2121
};
2222

23-
static const std::array<VersionSetEntry, 44> sVersionMap = {{
23+
static const std::array<VersionSetEntry, 54> sVersionMap = {{
2424
{ .set = 0x007db0901, .ios = 0x00050000, .macos = 0x000a0700 },
2525
{ .set = 0x007dc0901, .ios = 0x00060000, .macos = 0x000a0800 },
2626
{ .set = 0x007dd0901, .ios = 0x00070000, .macos = 0x000a0900 },
@@ -60,11 +60,21 @@ static const std::array<VersionSetEntry, 44> sVersionMap = {{
6060
{ .set = 0x007e62200, .bridgeos = 0x00070200, .driverkit = 0x00160000, .ios = 0x00100300, .macos = 0x000d0200, .tvos = 0x00100300, .watchos = 0x00090300 },
6161
{ .set = 0x007e62300, .bridgeos = 0x00070300, .driverkit = 0x00160400, .ios = 0x00100400, .macos = 0x000d0300, .tvos = 0x00100400, .watchos = 0x00090400 },
6262
{ .set = 0x007e62400, .bridgeos = 0x00070400, .driverkit = 0x00160500, .ios = 0x00100500, .macos = 0x000d0400, .tvos = 0x00100500, .watchos = 0x00090500 },
63-
{ .set = 0x007e62500, .bridgeos = 0x00070600, .driverkit = 0x00160600, .ios = 0x00100600, .macos = 0x000d0500, .tvos = 0x00100600, .watchos = 0x00090600 },
63+
{ .set = 0x007e62500, .bridgeos = 0x00070600, .driverkit = 0x00160600, .ios = 0x00100700, .macos = 0x000d0700, .tvos = 0x00100600, .watchos = 0x00090600 },
6464
{ .set = 0x007e70901, .bridgeos = 0x00080000, .driverkit = 0x00170000, .ios = 0x00110000, .macos = 0x000e0000, .tvos = 0x00110000, .watchos = 0x000a0000 },
6565
{ .set = 0x007e70c01, .bridgeos = 0x00080100, .driverkit = 0x00170100, .ios = 0x00110100, .macos = 0x000e0100, .tvos = 0x00110100, .visionos = 0x00010000, .watchos = 0x000a0100 },
6666
{ .set = 0x007e70d01, .bridgeos = 0x00080200, .driverkit = 0x00170200, .ios = 0x00110200, .macos = 0x000e0200, .tvos = 0x00110200, .visionos = 0x00010000, .watchos = 0x000a0200 },
67-
{ .set = 0x007e70e01, .bridgeos = 0x00080300, .driverkit = 0x00170300, .ios = 0x00110300, .macos = 0x000e0300, .tvos = 0x00110300, .visionos = 0x00010000, .watchos = 0x000a0300 }
67+
{ .set = 0x007e70e01, .bridgeos = 0x00080300, .driverkit = 0x00170300, .ios = 0x00110300, .macos = 0x000e0300, .tvos = 0x00110300, .visionos = 0x00010000, .watchos = 0x000a0300 },
68+
{ .set = 0x007e70f01, .bridgeos = 0x00080400, .driverkit = 0x00170400, .ios = 0x00110400, .macos = 0x000e0400, .tvos = 0x00110400, .visionos = 0x00010100, .watchos = 0x000a0400 },
69+
{ .set = 0x007e71001, .bridgeos = 0x00080500, .driverkit = 0x00170500, .ios = 0x00110500, .macos = 0x000e0500, .tvos = 0x00110500, .visionos = 0x00010200, .watchos = 0x000a0500 },
70+
{ .set = 0x007e71101, .bridgeos = 0x00080600, .driverkit = 0x00170600, .ios = 0x00110700, .macos = 0x000e0700, .tvos = 0x00110600, .visionos = 0x00010300, .watchos = 0x000a0700 },
71+
{ .set = 0x007e80000, .bridgeos = 0x00090000, .driverkit = 0x00180000, .ios = 0x00120000, .macos = 0x000f0000, .tvos = 0x00120000, .visionos = 0x00020000, .watchos = 0x000b0000 },
72+
{ .set = 0x007e80100, .bridgeos = 0x00090100, .driverkit = 0x00180100, .ios = 0x00120100, .macos = 0x000f0100, .tvos = 0x00120100, .visionos = 0x00020100, .watchos = 0x000b0100 },
73+
{ .set = 0x007e80200, .bridgeos = 0x00090200, .driverkit = 0x00180200, .ios = 0x00120200, .macos = 0x000f0200, .tvos = 0x00120200, .visionos = 0x00020200, .watchos = 0x000b0200 },
74+
{ .set = 0x007e80300, .bridgeos = 0x00090300, .driverkit = 0x00180300, .ios = 0x00120300, .macos = 0x000f0300, .tvos = 0x00120300, .visionos = 0x00020300, .watchos = 0x000b0300 },
75+
{ .set = 0x007e80400, .bridgeos = 0x00090400, .driverkit = 0x00180400, .ios = 0x00120400, .macos = 0x000f0400, .tvos = 0x00120400, .visionos = 0x00020400, .watchos = 0x000b0400 },
76+
{ .set = 0x007e80500, .bridgeos = 0x00090500, .driverkit = 0x00180500, .ios = 0x00120500, .macos = 0x000f0500, .tvos = 0x00120500, .visionos = 0x00020500, .watchos = 0x000b0500 },
77+
{ .set = 0x007e80600, .bridgeos = 0x00090600, .driverkit = 0x00180600, .ios = 0x00120600, .macos = 0x000f0600, .tvos = 0x00120600, .visionos = 0x00020600, .watchos = 0x000b0600 }
6878
}};
6979
};
7080

‎Docs/AvailabilityVersions/availability.dsl‎

Lines changed: 91 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
# bleached: Boolean to mark a platform as bleached from the pulic SDKs
2121

2222
platform macos macOS MACOS cmd_aliases=macosx,osx dyld_version_define_name=MACOSX min_max_define_name=MAC_OS_X availability_aliases=macosx -short_version_numbers availability_deprecation_define_name=MACOS version_define_name=MAC -supports_legacy_environment_defines
23+
variant macos macOSApplicationExtension MACOSAPPLICATIONEXTENSION
2324
version macos 10.0
2425
version macos 10.1
2526
version macos 10.2
@@ -29,7 +30,9 @@ version macos 10.5
2930
version macos 10.6
3031
version macos 10.7
3132
platform ios iOS IPHONE dyld_version_define_name=IOS min_max_define_name=IPHONE_OS platform_define_name=IOS availability_deprecation_define_name=IOS -supports_legacy_environment_defines
32-
variant ios iosmac MACCATALYST availability_aliases=macCatalyst
33+
variant ios iOSApplicationExtension IOSAPPLICATIONEXTENSION
34+
variant ios macCatalyst MACCATALYST
35+
variant ios macCatalystApplicationExtension MACCATALYSTAPPLICATIONEXTENSION
3336
version ios 2.0
3437
version ios 2.1
3538
version ios 2.2
@@ -55,6 +58,7 @@ version ios 7.1
5558
version ios 8.0
5659
set fall_2014 2014.9.1 0.0
5760
platform watchos watchOS WATCHOS ios_implicit_min=9.0 min_max_define_name=WATCH_OS -supports_legacy_environment_defines
61+
variant watchos watchOSApplicationExtension WATCHOSAPPLICATIONEXTENSION
5862
version watchos 1.0
5963
version macos 10.10.2
6064
version macos 10.10.3
@@ -65,6 +69,7 @@ version ios 8.3
6569
version ios 8.4
6670
version ios 9.0
6771
platform tvos tvOS TVOS cmd_aliases=appletvos ios_implicit_min=9.0 min_max_define_name=TV_OS -supports_legacy_environment_defines
72+
variant tvos tvOSApplicationExtension TVOSAPPLICATIONEXTENSION
6873
version tvos 9.0
6974
version watchos 2.0
7075
set fall_2015 2015.9.1 0.0
@@ -99,7 +104,7 @@ version macos 10.13
99104
version ios 11.0
100105
version tvos 11.0
101106
version watchos 4.0
102-
platform bridgeos bridgeOS BRIDGEOS ios_implicit_min=11.0 min_max_define_name=BRIDGE_OS
107+
platform bridgeos bridgeOS BRIDGEOS ios_implicit_min=11.0 min_max_define_name=BRIDGE_OS -bleached
103108
version bridgeos 2.0
104109
set fall_2017 2017.9.1 0.0
105110
version macos 10.13.1
@@ -305,18 +310,19 @@ version ios 16.6
305310
version tvos 16.6
306311
version watchos 9.6
307312
version bridgeos 7.6
308-
set 2022_SU_G 2022.37.0 22.6.0
309-
# Security updates shipped after 2022_SU_G
310313
version macos 13.6
311314
version ios 16.7
315+
version macos 13.7
316+
set 2022_SU_G 2022.37.0 22.6.0
312317
version macos 14.0
313318
version ios 17.0
314319
version tvos 17.0
315320
version watchos 10.0
316321
version bridgeos 8.0
317322
version driverkit 23.0
318323
set fall_2023 2023.9.1 23.0.0
319-
platform visionos visionOS VISIONOS min_max_define_name=VISION_OS cmd_aliases=xros availability_aliases=xros ios_implicit_min=17.1
324+
platform visionos visionOS VISIONOS min_max_define_name=VISION_OS cmd_aliases=xros ios_implicit_min=17.1
325+
variant visionos visionOSApplicationExtension VISIONOSAPPLICATIONEXTENSION
320326
version visionos 1.0
321327
version macos 14.1
322328
version ios 17.1
@@ -339,3 +345,83 @@ version watchos 10.3
339345
version bridgeos 8.3
340346
version driverkit 23.3
341347
set 2023_SU_D 2023.14.1 23.3.0
348+
version macos 14.4
349+
version ios 17.4
350+
version tvos 17.4
351+
version watchos 10.4
352+
version bridgeos 8.4
353+
version driverkit 23.4
354+
version visionos 1.1
355+
set 2023_SU_E 2023.15.1 23.4.0
356+
version macos 14.5
357+
version ios 17.5
358+
version tvos 17.5
359+
version watchos 10.5
360+
version bridgeos 8.5
361+
version driverkit 23.5
362+
version visionos 1.2
363+
set 2023_SU_F 2023.16.1 23.5.0
364+
version macos 14.7
365+
version ios 17.7
366+
version tvos 17.6
367+
version watchos 10.7
368+
version bridgeos 8.6
369+
version driverkit 23.6
370+
version visionos 1.3
371+
set 2023_SU_G 2023.17.1 23.6.0
372+
version macos 15.0
373+
version ios 18.0
374+
version tvos 18.0
375+
version watchos 11.0
376+
version bridgeos 9.0
377+
version driverkit 24.0
378+
version visionos 2.0
379+
set fall_2024 2024.0.0 24.0.0
380+
version macos 15.1
381+
version ios 18.1
382+
version tvos 18.1
383+
version watchos 11.1
384+
version bridgeos 9.1
385+
version driverkit 24.1
386+
version visionos 2.1
387+
set 2024_SU_B 2024.1.0 24.1.0
388+
version macos 15.2
389+
version ios 18.2
390+
version tvos 18.2
391+
version watchos 11.2
392+
version bridgeos 9.2
393+
version driverkit 24.2
394+
version visionos 2.2
395+
set 2024_SU_C 2024.2.0 24.2.0
396+
version macos 15.3
397+
version ios 18.3
398+
version tvos 18.3
399+
version watchos 11.3
400+
version bridgeos 9.3
401+
version driverkit 24.3
402+
version visionos 2.3
403+
set 2024_SU_D 2024.3.0 24.3.0
404+
version macos 15.4
405+
version ios 18.4
406+
version tvos 18.4
407+
version watchos 11.4
408+
version bridgeos 9.4
409+
version driverkit 24.4
410+
version visionos 2.4
411+
set 2024_SU_E 2024.4.0 24.4.0
412+
version macos 15.5
413+
version ios 18.5
414+
version tvos 18.5
415+
version watchos 11.5
416+
version bridgeos 9.5
417+
version driverkit 24.5
418+
version visionos 2.5
419+
set 2024_SU_F 2024.5.0 24.5.0
420+
version macos 15.6
421+
version ios 18.6
422+
version tvos 18.6
423+
version watchos 11.6
424+
version bridgeos 9.6
425+
version driverkit 24.6
426+
version visionos 2.6
427+
set 2024_SU_G 2024.6.0 24.6.0

‎Sources/OpenSwiftUICore/Semantic/Semantics.swift‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,14 +322,22 @@ let openSwiftUI_v5_2_os_versions = dyld_build_version_t(version: 0x07E7_0d01)
322322
/// macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, bridgeOS 9.0, driverKit 24.0, visionOS 2.0
323323
let openSwiftUI_v6_0_os_versions = dyld_build_version_t(version: 0x07E8_0000)
324324

325-
/// 2024 (2024.1.0) SDK version set
325+
/// 2024 SU B (2024.1.0) SDK version set
326+
///
327+
/// macOS 15.1, iOS 18.1, watchOS 11.1, tvOS 18.1, bridgeOS 9.1, driverKit 24.1, visionOS 2.1
326328
let openSwiftUI_v6_1_os_versions = dyld_build_version_t(version: 0x07E8_0100)
327329

328330
/// 2024 (2024.2.0) SDK version set
331+
///
332+
/// macOS 15.2, iOS 18.2, watchOS 11.2, tvOS 18.2, bridgeOS 9.2, driverKit 24.2, visionOS 2.2
329333
let openSwiftUI_v6_2_os_versions = dyld_build_version_t(version: 0x07E8_0200)
330334

331335
/// 2024 (2024.4.0) SDK version set
336+
///
337+
/// macOS 15.4, iOS 18.4, watchOS 11.4, tvOS 18.4, bridgeOS 9.4, driverKit 24.4, visionOS 2.4
332338
let openSwiftUI_v6_4_os_versions = dyld_build_version_t(version: 0x07E8_0400)
333339

334340
/// Fall 2025 (2025.0.0) SDK version set
341+
///
342+
/// macOS 26.0, iOS 26.0, watchOS 26.0, tvOS 26.0, bridgeOS 26.0, driverKit 26.0, visionOS 26.0
335343
let openSwiftUI_v7_0_os_versions = dyld_build_version_t(version: 0x07E9_0000)

0 commit comments

Comments
 (0)