From eb50cbd14606a9161cbc5d452f18797c90ef0bab Mon Sep 17 00:00:00 2001 From: Rick Newton-Rogers Date: Wed, 8 Apr 2026 13:43:17 +0100 Subject: [PATCH] Drop Swift 6.0 (#119) 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 | 4 ---- .github/workflows/pull_request.yml | 4 ---- Benchmarks/Benchmarks/SwiftASN1Benchmark/Benchmarks.swift | 2 +- Benchmarks/Package.swift | 2 +- ...mark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json | 6 ------ ...rse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json | 6 ------ ...mark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json | 6 ------ ...rse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json | 6 ------ ...mark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json | 6 ------ ...arse_WebPKI_Roots_from_multi_PEM_to_PEMDocument.p90.json | 6 ------ ...rse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json | 6 ------ Package.swift | 2 +- 12 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 Benchmarks/Thresholds/5.10/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json delete mode 100644 Benchmarks/Thresholds/5.10/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json delete mode 100644 Benchmarks/Thresholds/5.8/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json delete mode 100644 Benchmarks/Thresholds/5.8/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json delete mode 100644 Benchmarks/Thresholds/6.0/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json delete mode 100644 Benchmarks/Thresholds/6.0/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument.p90.json delete mode 100644 Benchmarks/Thresholds/6.0/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fe4f46c..f399ac2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,19 +15,16 @@ 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" 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" linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error" linux_nightly_main_arguments_override: "--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_next_enabled: true windows_nightly_main_enabled: true - windows_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" windows_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" windows_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" windows_6_3_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" @@ -62,7 +59,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 502d19f..d973c71 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -19,19 +19,16 @@ 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" 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" linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error" linux_nightly_main_arguments_override: "--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_next_enabled: true windows_nightly_main_enabled: true - windows_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" windows_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" windows_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" windows_6_3_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" @@ -77,7 +74,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/Benchmarks/Benchmarks/SwiftASN1Benchmark/Benchmarks.swift b/Benchmarks/Benchmarks/SwiftASN1Benchmark/Benchmarks.swift index f4a1a76..61b2f04 100644 --- a/Benchmarks/Benchmarks/SwiftASN1Benchmark/Benchmarks.swift +++ b/Benchmarks/Benchmarks/SwiftASN1Benchmark/Benchmarks.swift @@ -15,7 +15,7 @@ import Benchmark import Foundation -let benchmarks = { +let benchmarks: @Sendable () -> Void = { Benchmark.defaultConfiguration = .init( metrics: [ .mallocCountTotal, diff --git a/Benchmarks/Package.swift b/Benchmarks/Package.swift index 2b96c81..34591ce 100644 --- a/Benchmarks/Package.swift +++ b/Benchmarks/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.10 +// swift-tools-version:6.1 //===----------------------------------------------------------------------===// // // This source file is part of the SwiftASN1 open source project diff --git a/Benchmarks/Thresholds/5.10/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json b/Benchmarks/Thresholds/5.10/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json deleted file mode 100644 index 58feaac..0000000 --- a/Benchmarks/Thresholds/5.10/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "mallocCountTotal" : 976, - "memoryLeaked" : 0, - "readSyscalls" : 0, - "writeSyscalls" : 0 -} \ No newline at end of file diff --git a/Benchmarks/Thresholds/5.10/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json b/Benchmarks/Thresholds/5.10/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json deleted file mode 100644 index 874113d..0000000 --- a/Benchmarks/Thresholds/5.10/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "mallocCountTotal" : 967, - "memoryLeaked" : 0, - "readSyscalls" : 0, - "writeSyscalls" : 0 -} \ No newline at end of file diff --git a/Benchmarks/Thresholds/5.8/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json b/Benchmarks/Thresholds/5.8/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json deleted file mode 100644 index 58feaac..0000000 --- a/Benchmarks/Thresholds/5.8/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "mallocCountTotal" : 976, - "memoryLeaked" : 0, - "readSyscalls" : 0, - "writeSyscalls" : 0 -} \ No newline at end of file diff --git a/Benchmarks/Thresholds/5.8/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json b/Benchmarks/Thresholds/5.8/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json deleted file mode 100644 index 874113d..0000000 --- a/Benchmarks/Thresholds/5.8/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "mallocCountTotal" : 967, - "memoryLeaked" : 0, - "readSyscalls" : 0, - "writeSyscalls" : 0 -} \ No newline at end of file diff --git a/Benchmarks/Thresholds/6.0/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json b/Benchmarks/Thresholds/6.0/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json deleted file mode 100644 index 0b889f2..0000000 --- a/Benchmarks/Thresholds/6.0/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_PEM_to_PEMDocument.p90.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "mallocCountTotal" : 565, - "memoryLeaked" : 0, - "readSyscalls" : 0, - "writeSyscalls" : 0 -} \ No newline at end of file diff --git a/Benchmarks/Thresholds/6.0/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument.p90.json b/Benchmarks/Thresholds/6.0/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument.p90.json deleted file mode 100644 index 24d3a4c..0000000 --- a/Benchmarks/Thresholds/6.0/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument.p90.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "mallocCountTotal" : 572, - "memoryLeaked" : 0, - "readSyscalls" : 0, - "writeSyscalls" : 0 -} \ No newline at end of file diff --git a/Benchmarks/Thresholds/6.0/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json b/Benchmarks/Thresholds/6.0/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json deleted file mode 100644 index 874113d..0000000 --- a/Benchmarks/Thresholds/6.0/SwiftASN1Benchmark.Parse_WebPKI_Roots_from_multi_PEM_to_PEMDocument_.p90.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "mallocCountTotal" : 967, - "memoryLeaked" : 0, - "readSyscalls" : 0, - "writeSyscalls" : 0 -} \ No newline at end of file diff --git a/Package.swift b/Package.swift index 8dec772..22198e8 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 SwiftASN1 open source project