From fd4c918397fccbd158d1d15b7852282b70e24b9e Mon Sep 17 00:00:00 2001 From: Fabian Fett Date: Thu, 18 Sep 2025 14:59:02 +0200 Subject: [PATCH 1/3] Drop Swift 5.10, Use Swift 6 language mode --- Package.swift | 6 +----- README.md | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index 03b4812a..d4f65baa 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.10 +// swift-tools-version:6.0 //===----------------------------------------------------------------------===// // // This source file is part of the SwiftNIO open source project @@ -19,10 +19,6 @@ let strictConcurrencyDevelopment = false let strictConcurrencySettings: [SwiftSetting] = { var initialSettings: [SwiftSetting] = [] - initialSettings.append(contentsOf: [ - .enableUpcomingFeature("StrictConcurrency"), - .enableUpcomingFeature("InferSendableFromCaptures"), - ]) if strictConcurrencyDevelopment { // -warnings-as-errors here is a workaround so that IDE-based development can diff --git a/README.md b/README.md index 2c54710c..c9c771d7 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,8 @@ SwiftNIO HTTP/2 | Minimum Swift Version `1.27.0 ..< 1.29.0` | 5.6 `1.29.0 ..< 1.31.0` | 5.7 `1.31.0 ..< 1.37.0` | 5.8 -`1.37.0 ...` | 5.9 +`1.37.0 ..< 1.39.0` | 5.9 +`1.39.0 ...` | 6.0 ### `swift-nio-http2` 0.x From 2c01394c8315c13ed4f5ee1961dcea739adda6ec Mon Sep 17 00:00:00 2001 From: Fabian Fett Date: Thu, 18 Sep 2025 15:05:21 +0200 Subject: [PATCH 2/3] CI overrides --- .github/workflows/main.yml | 2 +- .github/workflows/pull_request.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 38c36fba..c590b7c5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,9 +11,9 @@ jobs: name: Unit tests uses: apple/swift-nio/.github/workflows/unit_tests.yml@main with: - 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" 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_nightly_next_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error" diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 4d474dce..24fbd18b 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -15,9 +15,9 @@ jobs: name: Unit tests uses: apple/swift-nio/.github/workflows/unit_tests.yml@main with: - 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" 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_nightly_next_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error" From 89a0fc1cbcab311385bda66638dad56f918dbb9a Mon Sep 17 00:00:00 2001 From: Rick Newton-Rogers Date: Tue, 11 Nov 2025 13:14:25 +0000 Subject: [PATCH 3/3] delete 5.10 thresholds --- .../Thresholds/5.10.json | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 IntegrationTests/tests_01_allocation_counters/Thresholds/5.10.json diff --git a/IntegrationTests/tests_01_allocation_counters/Thresholds/5.10.json b/IntegrationTests/tests_01_allocation_counters/Thresholds/5.10.json deleted file mode 100644 index c1dd69b0..00000000 --- a/IntegrationTests/tests_01_allocation_counters/Thresholds/5.10.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": 280050, - "client_server_h1_request_response_inline": 265050, - "client_server_request_response": 249050, - "client_server_request_response_inline": 240050, - "client_server_request_response_many": 1194050, - "client_server_request_response_many_inline": 885050, - "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": 253550, - "stream_teardown_100_concurrent_inline": 252150 -}