Skip to content

Commit f8158b9

Browse files
authored
Update package versioning (#3819)
SPM recommends `Package.swift` point to the latest version, but we're doing the opposite.
1 parent c0227a1 commit f8158b9

File tree

4 files changed

+46
-46
lines changed

4 files changed

+46
-46
lines changed

ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.resolved

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.9
1+
// swift-tools-version:6.0
22

33
import CompilerPluginSupport
44
import PackageDescription
@@ -77,16 +77,21 @@ let package = Package(
7777
.product(name: "MacroTesting", package: "swift-macro-testing"),
7878
]
7979
),
80-
]
80+
],
81+
swiftLanguageModes: [.v6]
8182
)
8283

83-
#if compiler(>=6)
84-
for target in package.targets where target.type != .system && target.type != .test {
85-
target.swiftSettings = target.swiftSettings ?? []
86-
target.swiftSettings?.append(contentsOf: [
87-
.enableExperimentalFeature("StrictConcurrency"),
88-
.enableUpcomingFeature("ExistentialAny"),
89-
.enableUpcomingFeature("InferSendableFromCaptures"),
90-
])
91-
}
92-
#endif
84+
for target in package.targets {
85+
target.swiftSettings = target.swiftSettings ?? []
86+
target.swiftSettings?.append(contentsOf: [
87+
.enableUpcomingFeature("ExistentialAny")
88+
])
89+
}
90+
91+
for target in package.targets where target.type == .system || target.type == .test {
92+
target.swiftSettings?.append(contentsOf: [
93+
.swiftLanguageMode(.v5),
94+
.enableExperimentalFeature("StrictConcurrency"),
95+
.enableUpcomingFeature("InferSendableFromCaptures"),
96+
])
97+
}
Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:6.0
1+
// swift-tools-version:5.9
22

33
import CompilerPluginSupport
44
import PackageDescription
@@ -77,21 +77,16 @@ let package = Package(
7777
.product(name: "MacroTesting", package: "swift-macro-testing"),
7878
]
7979
),
80-
],
81-
swiftLanguageModes: [.v6]
80+
]
8281
)
8382

84-
for target in package.targets {
85-
target.swiftSettings = target.swiftSettings ?? []
86-
target.swiftSettings?.append(contentsOf: [
87-
.enableUpcomingFeature("ExistentialAny")
88-
])
89-
}
90-
91-
for target in package.targets where target.type == .system || target.type == .test {
92-
target.swiftSettings?.append(contentsOf: [
93-
.swiftLanguageMode(.v5),
94-
.enableExperimentalFeature("StrictConcurrency"),
95-
.enableUpcomingFeature("InferSendableFromCaptures"),
96-
])
97-
}
83+
#if compiler(>=6)
84+
for target in package.targets where target.type != .system && target.type != .test {
85+
target.swiftSettings = target.swiftSettings ?? []
86+
target.swiftSettings?.append(contentsOf: [
87+
.enableExperimentalFeature("StrictConcurrency"),
88+
.enableUpcomingFeature("ExistentialAny"),
89+
.enableUpcomingFeature("InferSendableFromCaptures"),
90+
])
91+
}
92+
#endif

0 commit comments

Comments
 (0)