From 9b4e1664bfbbc74f3b42672ca4ddeb0c86d4b7a4 Mon Sep 17 00:00:00 2001 From: Rick Newton-Rogers Date: Wed, 1 Apr 2026 16:39:24 +0100 Subject: [PATCH] Drop Swift 6.0 Motivation: Swift 6.0 is no longer supported, we should bump the tools version and remove it from our CI. Modifications: * Bump the Swift tools version to Swift 6.1 * Remove Swift 6.0 jobs where appropriate in main.yml, pull_request.yml Result: Code reflects our support window. --- .github/workflows/main.yml | 4 ---- .github/workflows/pull_request.yml | 4 ---- Package.swift | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2187460..47f8c38 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,19 +18,16 @@ jobs: # warnings-as-errors on 5.10 and later as SwiftPMs generated test manifest # has a non-sendable global property. # TODO: Enable warnings-as-errors on 6.0. - linux_6_0_arguments_override: "-Xswiftc -strict-concurrency=complete --explicit-target-dependency-import-check error" linux_6_1_arguments_override: "-Xswiftc -strict-concurrency=complete --explicit-target-dependency-import-check error" linux_6_2_arguments_override: "-Xswiftc -strict-concurrency=complete --explicit-target-dependency-import-check error" linux_6_3_arguments_override: "-Xswiftc -strict-concurrency=complete --explicit-target-dependency-import-check error" linux_nightly_next_arguments_override: "-Xswiftc -strict-concurrency=complete --explicit-target-dependency-import-check error" linux_nightly_main_arguments_override: "-Xswiftc -strict-concurrency=complete --explicit-target-dependency-import-check error" - windows_6_0_enabled: true windows_6_1_enabled: true windows_6_2_enabled: true windows_6_3_enabled: true windows_nightly_6_1_enabled: true windows_nightly_main_enabled: true - windows_6_0_arguments_override: "--explicit-target-dependency-import-check error" windows_6_1_arguments_override: "--explicit-target-dependency-import-check error" windows_6_2_arguments_override: "--explicit-target-dependency-import-check error" windows_6_3_arguments_override: "--explicit-target-dependency-import-check error" @@ -48,7 +45,6 @@ jobs: name: Release builds uses: apple/swift-nio/.github/workflows/release_builds.yml@main with: - windows_6_0_enabled: true windows_6_1_enabled: true windows_6_2_enabled: true windows_6_3_enabled: true diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index ad2ddb1..966a05e 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -22,19 +22,16 @@ jobs: # warnings-as-errors on 5.10 and later as SwiftPMs generated test manifest # has a non-sendable global property. # TODO: Enable warnings-as-errors on 6.0. - linux_6_0_arguments_override: "-Xswiftc -strict-concurrency=complete --explicit-target-dependency-import-check error" linux_6_1_arguments_override: "-Xswiftc -strict-concurrency=complete --explicit-target-dependency-import-check error" linux_6_2_arguments_override: "-Xswiftc -strict-concurrency=complete --explicit-target-dependency-import-check error" linux_6_3_arguments_override: "-Xswiftc -strict-concurrency=complete --explicit-target-dependency-import-check error" linux_nightly_next_arguments_override: "-Xswiftc -strict-concurrency=complete --explicit-target-dependency-import-check error" linux_nightly_main_arguments_override: "-Xswiftc -strict-concurrency=complete --explicit-target-dependency-import-check error" - windows_6_0_enabled: true windows_6_1_enabled: true windows_6_2_enabled: true windows_6_3_enabled: true windows_nightly_6_1_enabled: true windows_nightly_main_enabled: true - windows_6_0_arguments_override: "--explicit-target-dependency-import-check error" windows_6_1_arguments_override: "--explicit-target-dependency-import-check error" windows_6_2_arguments_override: "--explicit-target-dependency-import-check error" windows_6_3_arguments_override: "--explicit-target-dependency-import-check error" @@ -56,7 +53,6 @@ jobs: name: Release builds uses: apple/swift-nio/.github/workflows/release_builds.yml@main with: - windows_6_0_enabled: true windows_6_1_enabled: true windows_6_2_enabled: true windows_6_3_enabled: true diff --git a/Package.swift b/Package.swift index eb6c9b3..6fd8958 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:6.0 +// swift-tools-version:6.1 //===----------------------------------------------------------------------===// // // This source file is part of the SwiftOpenAPIGenerator open source project