From 335e5b5b9d1541003ce663ddb69dbe4042f2b481 Mon Sep 17 00:00:00 2001 From: Rick Newton-Rogers Date: Tue, 7 Apr 2026 13:14:31 +0100 Subject: [PATCH] Drop Swift 6.0 (#545) 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. --------- Co-authored-by: George Barnett --- .github/workflows/main.yml | 1 - .github/workflows/pull_request.yml | 1 - Benchmarks/Package.swift | 2 +- ...nchmarks.HPACKHeaderEncoding_APNS.p90.json | 3 --- FuzzTesting/Package.swift | 2 +- .../Thresholds/6.0.json | 23 ------------------- Package.swift | 2 +- README.md | 3 ++- 8 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 Benchmarks/Thresholds/6.0/NIOHPACKBenchmarks.HPACKHeaderEncoding_APNS.p90.json delete mode 100644 IntegrationTests/tests_01_allocation_counters/Thresholds/6.0.json diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5d489c1..be3e46e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,6 @@ jobs: name: Unit tests uses: apple/swift-nio/.github/workflows/unit_tests.yml@main with: - linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_6_3_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 90eebe0..626ffc6 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -18,7 +18,6 @@ jobs: name: Unit tests uses: apple/swift-nio/.github/workflows/unit_tests.yml@main with: - linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_6_3_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" diff --git a/Benchmarks/Package.swift b/Benchmarks/Package.swift index 308e9be..51097cc 100644 --- a/Benchmarks/Package.swift +++ b/Benchmarks/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:6.0 +// swift-tools-version:6.1 //===----------------------------------------------------------------------===// // // This source file is part of the SwiftNIO open source project diff --git a/Benchmarks/Thresholds/6.0/NIOHPACKBenchmarks.HPACKHeaderEncoding_APNS.p90.json b/Benchmarks/Thresholds/6.0/NIOHPACKBenchmarks.HPACKHeaderEncoding_APNS.p90.json deleted file mode 100644 index ffd7f4d..0000000 --- a/Benchmarks/Thresholds/6.0/NIOHPACKBenchmarks.HPACKHeaderEncoding_APNS.p90.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "mallocCountTotal": 23 -} diff --git a/FuzzTesting/Package.swift b/FuzzTesting/Package.swift index 5bc5cd5..4585544 100644 --- a/FuzzTesting/Package.swift +++ b/FuzzTesting/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version:6.1 //===----------------------------------------------------------------------===// // // This source file is part of the SwiftNIO open source project diff --git a/IntegrationTests/tests_01_allocation_counters/Thresholds/6.0.json b/IntegrationTests/tests_01_allocation_counters/Thresholds/6.0.json deleted file mode 100644 index f5410be..0000000 --- a/IntegrationTests/tests_01_allocation_counters/Thresholds/6.0.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "1k_requests_inline_interleaved": 30150, - "1k_requests_inline_noninterleaved": 29100, - "1k_requests_interleaved": 36150, - "1k_requests_noninterleaved": 35100, - "client_server_h1_request_response": 275050, - "client_server_h1_request_response_inline": 263050, - "client_server_request_response": 253050, - "client_server_request_response_inline": 244050, - "client_server_request_response_many": 1198050, - "client_server_request_response_many_inline": 889050, - "create_client_stream_channel": 35050, - "create_client_stream_channel_inline": 35050, - "create_client_stream_channel_inline_no_promise_based_API": 35050, - "create_client_stream_channel_no_promise_based_API": 35050, - "get_100000_headers_canonical_form": 200050, - "get_100000_headers_canonical_form_trimming_whitespace": 200050, - "get_100000_headers_canonical_form_trimming_whitespace_from_long_string": 300050, - "get_100000_headers_canonical_form_trimming_whitespace_from_short_string": 200050, - "hpack_decoding": 5050, - "stream_teardown_100_concurrent": 253250, - "stream_teardown_100_concurrent_inline": 252350 -} diff --git a/Package.swift b/Package.swift index 9336805..8403920 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 SwiftNIO open source project diff --git a/README.md b/README.md index c9c771d..fa8afbc 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,8 @@ SwiftNIO HTTP/2 | Minimum Swift Version `1.29.0 ..< 1.31.0` | 5.7 `1.31.0 ..< 1.37.0` | 5.8 `1.37.0 ..< 1.39.0` | 5.9 -`1.39.0 ...` | 6.0 +`1.39.0 ..< 1.43.0` | 6.0 +`1.43.0 ..<` | 6.1 ### `swift-nio-http2` 0.x