Skip to content

Require Swift 6 #1173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+30 −51
Open

Require Swift 6 #1173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b34dd3
Increased Swift versions and put swiftLanguageMode to v5 per target
akbashev Nov 2, 2024
da0205d
We won't need 5.10 after merging
akbashev Nov 2, 2024
84aac27
Merge branch 'main' into require-swift-6
akbashev May 14, 2025
3cfa6d2
Disable 5.10 builds
akbashev May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
with:
linux_5_9_enabled: false
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
linux_5_10_enabled: false
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_nightly_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
Expand All @@ -33,6 +33,7 @@ jobs:
env:
MATRIX_LINUX_COMMAND: swift package --disable-sandbox multi-node test
MATRIX_LINUX_5_9_ENABLED: false
MATRIX_LINUX_5_10_ENABLED: false

integration-tests:
name: Integration tests
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
with:
linux_5_9_enabled: false
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
linux_5_10_enabled: false
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_nightly_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
Expand All @@ -37,6 +37,7 @@ jobs:
env:
MATRIX_LINUX_COMMAND: swift package --disable-sandbox multi-node test
MATRIX_LINUX_5_9_ENABLED: false
MATRIX_LINUX_5_10_ENABLED: false

integration-tests:
name: Integration tests
Expand Down
42 changes: 26 additions & 16 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.10
// swift-tools-version:6.0
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand Down Expand Up @@ -46,7 +46,8 @@ var targets: [PackageDescription.Target] = [
.product(name: "ServiceDiscovery", package: "swift-service-discovery"),
.product(name: "Backtrace", package: "swift-backtrace"),
.product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
]
],
swiftSettings: [.swiftLanguageMode(.v5)]
),

// ==== ------------------------------------------------------------------------------------------------------------
Expand All @@ -59,7 +60,8 @@ var targets: [PackageDescription.Target] = [
"DistributedCluster",
"DistributedActorsConcurrencyHelpers",
.product(name: "Atomics", package: "swift-atomics"),
]
],
swiftSettings: [.swiftLanguageMode(.v5)]
),

// ==== ----------------------------------------------------------------------------------------------------------------
Expand All @@ -71,15 +73,17 @@ var targets: [PackageDescription.Target] = [
"DistributedCluster",
"DistributedActorsTestKit",
.product(name: "Atomics", package: "swift-atomics"),
]
],
swiftSettings: [.swiftLanguageMode(.v5)]
),

.testTarget(
name: "DistributedActorsTestKitTests",
dependencies: [
"DistributedCluster",
"DistributedActorsTestKit",
]
],
swiftSettings: [.swiftLanguageMode(.v5)]
),

// ==== ------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -108,7 +112,8 @@ var targets: [PackageDescription.Target] = [
.product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
.product(name: "Atomics", package: "swift-atomics"),
.product(name: "OrderedCollections", package: "swift-collections"),
]
],
swiftSettings: [.swiftLanguageMode(.v5)]
),
.executableTarget(
name: "MultiNodeTestKitRunner",
Expand All @@ -119,7 +124,8 @@ var targets: [PackageDescription.Target] = [
// Dependencies:
"MultiNodeTestKit",
.product(name: "ArgumentParser", package: "swift-argument-parser"),
]
],
swiftSettings: [.swiftLanguageMode(.v5)]
),

// ==== ------------------------------------------------------------------------------------------------------------
Expand All @@ -131,7 +137,8 @@ var targets: [PackageDescription.Target] = [
dependencies: [
"MultiNodeTestKit"
],
path: "MultiNodeTests/DistributedActorsMultiNodeTests"
path: "MultiNodeTests/DistributedActorsMultiNodeTests",
swiftSettings: [.swiftLanguageMode(.v5)]
),

// ==== ------------------------------------------------------------------------------------------------------------
Expand All @@ -143,7 +150,8 @@ var targets: [PackageDescription.Target] = [
dependencies: [
"DistributedCluster"
],
path: "IntegrationTests/tests_01_cluster/it_Clustered_swim_suspension_reachability"
path: "IntegrationTests/tests_01_cluster/it_Clustered_swim_suspension_reachability",
swiftSettings: [.swiftLanguageMode(.v5)]
),

// ==== ----------------------------------------------------------------------------------------------------------------
Expand All @@ -155,15 +163,17 @@ var targets: [PackageDescription.Target] = [

.target(
name: "CDistributedActorsMailbox",
dependencies: []
dependencies: [],
swiftSettings: [.swiftLanguageMode(.v5)]
),

.target(
name: "DistributedActorsConcurrencyHelpers",
dependencies: [],
exclude: [
"README.md"
]
"README.md",
],
swiftSettings: [.swiftLanguageMode(.v5)]
),
]

Expand Down Expand Up @@ -233,10 +243,10 @@ platforms = nil
#else
platforms = [
// we require the 'distributed actor' language and runtime feature:
.iOS(.v16),
.macOS(.v14),
.tvOS(.v16),
.watchOS(.v9),
.iOS(.v18),
.macOS(.v15),
.tvOS(.v18),
.watchOS(.v11),
]
#endif

Expand Down
33 changes: 0 additions & 33 deletions docker/docker-compose.2204.510.yaml
View file
Open in desktop

This file was deleted.