Skip to content

Commit 45abd02

Browse files
committed
Update Package.swift
1 parent 0f91969 commit 45abd02

File tree

1 file changed

+16
-21
lines changed

1 file changed

+16
-21
lines changed

Package.swift

+16-21
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,17 @@ let systemFrameworkSearchFlag = isXcodeEnv ? "-iframework" : "-Fsystem"
2525

2626
let releaseVersion = Context.environment["OPENSWIFTUI_TARGET_RELEASE"].flatMap { Int($0) } ?? 2021
2727
let platforms: [SupportedPlatform] = switch releaseVersion {
28-
case 2023:
28+
case 2024:
29+
#if swift(>=6.0)
30+
[
31+
.iOS(.v18),
32+
.macOS(.v15),
33+
.macCatalyst(.v18),
34+
.tvOS(.v18),
35+
.watchOS(.v10),
36+
.visionOS(.v2),
37+
]
38+
#else // FIXME: Remove when we bump to Swift 6.0
2939
[
3040
.iOS(.v17),
3141
.macOS(.v14),
@@ -34,14 +44,7 @@ case 2023:
3444
.watchOS(.v9),
3545
.visionOS(.v1),
3646
]
37-
case 2022:
38-
[
39-
.iOS(.v16),
40-
.macOS(.v13),
41-
.macCatalyst(.v16),
42-
.tvOS(.v16),
43-
.watchOS(.v8),
44-
]
47+
#endif
4548
case 2021:
4649
[
4750
.iOS(.v15),
@@ -67,18 +70,10 @@ var sharedSwiftSettings: [SwiftSetting] = [
6770
.define("OPENSWIFTUI_RELEASE_\(releaseVersion)"),
6871
]
6972

70-
switch releaseVersion {
71-
case 2023:
72-
sharedSwiftSettings.append(.define("OPENSWIFTUI_SUPPORT_2023_API"))
73-
sharedSwiftSettings.append(.define("OPENSWIFTUI_SUPPORT_2022_API"))
74-
sharedSwiftSettings.append(.define("OPENSWIFTUI_SUPPORT_2021_API"))
75-
case 2022:
76-
sharedSwiftSettings.append(.define("OPENSWIFTUI_SUPPORT_2022_API"))
77-
sharedSwiftSettings.append(.define("OPENSWIFTUI_SUPPORT_2021_API"))
78-
case 2021:
79-
sharedSwiftSettings.append(.define("OPENSWIFTUI_SUPPORT_2021_API"))
80-
default:
81-
break
73+
if releaseVersion >= 2021 {
74+
for year in 2021 ... releaseVersion {
75+
sharedSwiftSettings.append(.define("OPENSWIFTUI_SUPPORT_\(year)_API"))
76+
}
8277
}
8378

8479
let warningsAsErrorsCondition = envEnable("OPENSWIFTUI_WERROR", default: isXcodeEnv && development)

0 commit comments

Comments
 (0)