From 0fc472ba34b5d94d0811acec2bd01e16804bbf47 Mon Sep 17 00:00:00 2001 From: Rick Newton-Rogers Date: Wed, 7 May 2025 06:52:53 +0100 Subject: [PATCH] Drop Swift 5.9 (#270) Motivation: Swift 5.9 is no longer supported, we should bump the tools version and remove it from our CI. Modifications: * Bump the Swift tools version to Swift 5.10 * Remove Swift 5.9 jobs where appropriate in main.yml, pull_request.yml Result: Code reflects our support window. --- .github/workflows/main.yml | 1 - .github/workflows/pull_request.yml | 1 - Package.swift | 2 +- Tests/NIOExtrasTests/DebugInboundEventsHandlerTest.swift | 2 +- Tests/NIOExtrasTests/DebugOutboundEventsHandlerTest.swift | 2 +- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a9fb719..05e6f20 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,6 @@ jobs: name: Unit tests uses: apple/swift-nio/.github/workflows/unit_tests.yml@main with: - linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" 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" diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index c5cc6fa..eadac7a 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -14,7 +14,6 @@ jobs: name: Unit tests uses: apple/swift-nio/.github/workflows/unit_tests.yml@main with: - linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" 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" diff --git a/Package.swift b/Package.swift index 76cd9f0..bc8920d 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.8 +// swift-tools-version:5.10 //===----------------------------------------------------------------------===// // // This source file is part of the SwiftNIO open source project diff --git a/Tests/NIOExtrasTests/DebugInboundEventsHandlerTest.swift b/Tests/NIOExtrasTests/DebugInboundEventsHandlerTest.swift index efe6a2a..e810bc4 100644 --- a/Tests/NIOExtrasTests/DebugInboundEventsHandlerTest.swift +++ b/Tests/NIOExtrasTests/DebugInboundEventsHandlerTest.swift @@ -124,7 +124,7 @@ extension DebugInboundEventsHandler.Event { } #if compiler(>=6.0) -extension DebugInboundEventsHandler.Event: @retroactive Equatable {} +extension DebugInboundEventsHandler.Event: Equatable {} #else extension DebugInboundEventsHandler.Event: Equatable {} #endif diff --git a/Tests/NIOExtrasTests/DebugOutboundEventsHandlerTest.swift b/Tests/NIOExtrasTests/DebugOutboundEventsHandlerTest.swift index 48cf83d..c99a6b8 100644 --- a/Tests/NIOExtrasTests/DebugOutboundEventsHandlerTest.swift +++ b/Tests/NIOExtrasTests/DebugOutboundEventsHandlerTest.swift @@ -111,7 +111,7 @@ extension DebugOutboundEventsHandler.Event { } #if compiler(>=6.0) -extension DebugOutboundEventsHandler.Event: @retroactive Equatable {} +extension DebugOutboundEventsHandler.Event: Equatable {} #else extension DebugOutboundEventsHandler.Event: Equatable {} #endif