Skip to content

Commit d9198d6

Browse files
authored
Require Swift 6 (#1173)
1 parent 9a8a674 commit d9198d6

File tree

3 files changed

+30
-18
lines changed

3 files changed

+30
-18
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
1313
with:
1414
linux_5_9_enabled: false
15-
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
15+
linux_5_10_enabled: false
1616
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
1717
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
1818
linux_nightly_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
@@ -33,6 +33,7 @@ jobs:
3333
env:
3434
MATRIX_LINUX_COMMAND: swift package --disable-sandbox multi-node test
3535
MATRIX_LINUX_5_9_ENABLED: false
36+
MATRIX_LINUX_5_10_ENABLED: false
3637

3738
integration-tests:
3839
name: Integration tests

.github/workflows/pull_request.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
1818
with:
1919
linux_5_9_enabled: false
20-
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
20+
linux_5_10_enabled: false
2121
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2222
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2323
linux_nightly_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
@@ -38,6 +38,7 @@ jobs:
3838
env:
3939
MATRIX_LINUX_COMMAND: swift package --disable-sandbox multi-node test
4040
MATRIX_LINUX_5_9_ENABLED: false
41+
MATRIX_LINUX_5_10_ENABLED: false
4142

4243
integration-tests:
4344
name: Integration tests

Package.swift

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.10
1+
// swift-tools-version:6.0
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription
@@ -46,7 +46,8 @@ var targets: [PackageDescription.Target] = [
4646
.product(name: "ServiceDiscovery", package: "swift-service-discovery"),
4747
.product(name: "Backtrace", package: "swift-backtrace"),
4848
.product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
49-
]
49+
],
50+
swiftSettings: [.swiftLanguageMode(.v5)]
5051
),
5152

5253
// ==== ------------------------------------------------------------------------------------------------------------
@@ -59,7 +60,8 @@ var targets: [PackageDescription.Target] = [
5960
"DistributedCluster",
6061
"DistributedActorsConcurrencyHelpers",
6162
.product(name: "Atomics", package: "swift-atomics"),
62-
]
63+
],
64+
swiftSettings: [.swiftLanguageMode(.v5)]
6365
),
6466

6567
// ==== ----------------------------------------------------------------------------------------------------------------
@@ -71,15 +73,17 @@ var targets: [PackageDescription.Target] = [
7173
"DistributedCluster",
7274
"DistributedActorsTestKit",
7375
.product(name: "Atomics", package: "swift-atomics"),
74-
]
76+
],
77+
swiftSettings: [.swiftLanguageMode(.v5)]
7578
),
7679

7780
.testTarget(
7881
name: "DistributedActorsTestKitTests",
7982
dependencies: [
8083
"DistributedCluster",
8184
"DistributedActorsTestKit",
82-
]
85+
],
86+
swiftSettings: [.swiftLanguageMode(.v5)]
8387
),
8488

8589
// ==== ------------------------------------------------------------------------------------------------------------
@@ -108,7 +112,8 @@ var targets: [PackageDescription.Target] = [
108112
.product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
109113
.product(name: "Atomics", package: "swift-atomics"),
110114
.product(name: "OrderedCollections", package: "swift-collections"),
111-
]
115+
],
116+
swiftSettings: [.swiftLanguageMode(.v5)]
112117
),
113118
.executableTarget(
114119
name: "MultiNodeTestKitRunner",
@@ -119,7 +124,8 @@ var targets: [PackageDescription.Target] = [
119124
// Dependencies:
120125
"MultiNodeTestKit",
121126
.product(name: "ArgumentParser", package: "swift-argument-parser"),
122-
]
127+
],
128+
swiftSettings: [.swiftLanguageMode(.v5)]
123129
),
124130
.executableTarget(
125131
name: "swift-clusterd",
@@ -138,7 +144,8 @@ var targets: [PackageDescription.Target] = [
138144
dependencies: [
139145
"MultiNodeTestKit"
140146
],
141-
path: "MultiNodeTests/DistributedActorsMultiNodeTests"
147+
path: "MultiNodeTests/DistributedActorsMultiNodeTests",
148+
swiftSettings: [.swiftLanguageMode(.v5)]
142149
),
143150

144151
// ==== ------------------------------------------------------------------------------------------------------------
@@ -150,7 +157,8 @@ var targets: [PackageDescription.Target] = [
150157
dependencies: [
151158
"DistributedCluster"
152159
],
153-
path: "IntegrationTests/tests_01_cluster/it_Clustered_swim_suspension_reachability"
160+
path: "IntegrationTests/tests_01_cluster/it_Clustered_swim_suspension_reachability",
161+
swiftSettings: [.swiftLanguageMode(.v5)]
154162
),
155163

156164
// ==== ----------------------------------------------------------------------------------------------------------------
@@ -162,15 +170,17 @@ var targets: [PackageDescription.Target] = [
162170

163171
.target(
164172
name: "CDistributedActorsMailbox",
165-
dependencies: []
173+
dependencies: [],
174+
swiftSettings: [.swiftLanguageMode(.v5)]
166175
),
167176

168177
.target(
169178
name: "DistributedActorsConcurrencyHelpers",
170179
dependencies: [],
171180
exclude: [
172-
"README.md"
173-
]
181+
"README.md",
182+
],
183+
swiftSettings: [.swiftLanguageMode(.v5)]
174184
),
175185
]
176186

@@ -240,10 +250,10 @@ platforms = nil
240250
#else
241251
platforms = [
242252
// we require the 'distributed actor' language and runtime feature:
243-
.iOS(.v16),
244-
.macOS(.v14),
245-
.tvOS(.v16),
246-
.watchOS(.v9),
253+
.iOS(.v18),
254+
.macOS(.v15),
255+
.tvOS(.v18),
256+
.watchOS(.v11),
247257
]
248258
#endif
249259

0 commit comments

Comments
 (0)