From f7f1e65d2df0eb3cdfd16be588e5874b6619b54a Mon Sep 17 00:00:00 2001 From: Si Beaumont Date: Fri, 20 Dec 2024 08:36:41 +0000 Subject: [PATCH 1/3] package: Adopt StrictConcurrency=complete --- Package.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 6cce1a8..46e38fe 100644 --- a/Package.swift +++ b/Package.swift @@ -19,7 +19,8 @@ import PackageDescription let swiftSettings: [SwiftSetting] = [ // https://github.com/apple/swift-evolution/blob/main/proposals/0335-existential-any.md // Require `any` for existential types. - .enableUpcomingFeature("ExistentialAny") + .enableUpcomingFeature("ExistentialAny"), + .enableExperimentalFeature("StrictConcurrency=complete"), ] let package = Package( From 4f7323d6be4f9b0f1496044b38d89a0cca12fc73 Mon Sep 17 00:00:00 2001 From: Si Beaumont Date: Tue, 10 Dec 2024 09:14:47 +0000 Subject: [PATCH 2/3] ci: Update flags in CI for our usual strict concurrency --- .github/workflows/pull_request.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 50e00f8..7384e91 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -15,10 +15,9 @@ jobs: name: Unit tests uses: apple/swift-nio/.github/workflows/unit_tests.yml@main with: - linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -strict-concurrency=complete" - # TODO: `enable -Xswiftc -strict-concurrency=complete` + linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" - linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable -Xswiftc -strict-concurrency=complete" + linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" From cfb8568df8f7c5d8c50c5237afc79e89c7e52099 Mon Sep 17 00:00:00 2001 From: Si Beaumont Date: Tue, 10 Dec 2024 09:15:41 +0000 Subject: [PATCH 3/3] ci: Add Swift 6 language mode pipeline --- .github/workflows/pull_request.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 7384e91..aad89ae 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -24,3 +24,7 @@ jobs: cxx-interop: name: Cxx interop uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main + + swift-6-language-mode: + name: Cxx interop + uses: apple/swift-nio/.github/workflows/swift_6_language_mode.yml@main