diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cf25cee5..3ca2fc5f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,6 @@ jobs: 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 -Xswiftc -require-explicit-sendable" linux_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" linux_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" linux_6_3_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index a12e0944..47be04f6 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -18,7 +18,6 @@ jobs: 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 -Xswiftc -require-explicit-sendable" # We can't set warnings-as-errors for 6.1 because we can't suppress the ImplementationOnly import warning. linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" linux_6_2_arguments_override: "-Xswiftc -warnings-as-errors -Xswiftc -Wwarning -Xswiftc ImplementationOnlyDeprecated --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" diff --git a/Benchmarks/Benchmarks/NIOSSLBenchmarks/Benchmarks.swift b/Benchmarks/Benchmarks/NIOSSLBenchmarks/Benchmarks.swift index 4ed97699..6d7bbe2e 100644 --- a/Benchmarks/Benchmarks/NIOSSLBenchmarks/Benchmarks.swift +++ b/Benchmarks/Benchmarks/NIOSSLBenchmarks/Benchmarks.swift @@ -17,7 +17,7 @@ import NIOCore import NIOEmbedded import NIOSSL -let benchmarks = { +let benchmarks: @Sendable () -> Void = { let defaultMetrics: [BenchmarkMetric] = [ .mallocCountTotal ] diff --git a/Benchmarks/Package.swift b/Benchmarks/Package.swift index ed3674c0..09eae454 100644 --- a/Benchmarks/Package.swift +++ b/Benchmarks/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.10 +// swift-tools-version:6.1 import PackageDescription diff --git a/Benchmarks/Thresholds/5.10/NIOSSLBenchmarks.ManyWrites.p90.json b/Benchmarks/Thresholds/5.10/NIOSSLBenchmarks.ManyWrites.p90.json deleted file mode 100644 index c3eab92c..00000000 --- a/Benchmarks/Thresholds/5.10/NIOSSLBenchmarks.ManyWrites.p90.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "mallocCountTotal" : 201948 -} \ No newline at end of file diff --git a/Benchmarks/Thresholds/5.10/NIOSSLBenchmarks.SimpleHandshake.p90.json b/Benchmarks/Thresholds/5.10/NIOSSLBenchmarks.SimpleHandshake.p90.json deleted file mode 100644 index ddf2c0cb..00000000 --- a/Benchmarks/Thresholds/5.10/NIOSSLBenchmarks.SimpleHandshake.p90.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "mallocCountTotal": 629000 -} diff --git a/Benchmarks/Thresholds/6.0/NIOSSLBenchmarks.ManyWrites.p90.json b/Benchmarks/Thresholds/6.0/NIOSSLBenchmarks.ManyWrites.p90.json deleted file mode 100644 index ec3cb5e5..00000000 --- a/Benchmarks/Thresholds/6.0/NIOSSLBenchmarks.ManyWrites.p90.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "mallocCountTotal": 201941 -} diff --git a/Benchmarks/Thresholds/6.0/NIOSSLBenchmarks.SimpleHandshake.p90.json b/Benchmarks/Thresholds/6.0/NIOSSLBenchmarks.SimpleHandshake.p90.json deleted file mode 100644 index 4bc5ce51..00000000 --- a/Benchmarks/Thresholds/6.0/NIOSSLBenchmarks.SimpleHandshake.p90.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "mallocCountTotal": 631872 -} diff --git a/Package.swift b/Package.swift index 833ecea6..004e14b2 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 be796b6d..931a2ba6 100644 --- a/README.md +++ b/README.md @@ -64,4 +64,5 @@ SwiftNIO SSL | Minimum Swift Version `2.27.0 ..< 2.29.3` | 5.8 `2.29.3 ..< 2.31.0` | 5.9 `2.31.0 ..< 2.35.0` | 5.10 -`2.35.0 ...` | 6.0 +`2.35.0 ..< 2.37.0` | 6.0 +`2.37.0 ..<` | 6.1