remove #if swift(>=6.1)

sebsto · sebsto · commit 41983128e6a3 · 2025-09-02T15:23:47.000+02:00
diff --git a/Sources/AWSLambdaRuntime/ControlPlaneRequest.swift b/Sources/AWSLambdaRuntime/ControlPlaneRequest.swift
@@ -15,29 +15,23 @@
 import NIOCore
 import NIOHTTP1
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 enum ControlPlaneRequest: Hashable {
     case next
     case invocationResponse(String, ByteBuffer?)
     case invocationError(String, ErrorResponse)
     case initializationError(ErrorResponse)
 }
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 enum ControlPlaneResponse: Hashable {
     case next(InvocationMetadata, ByteBuffer)
     case accepted
     case error(ErrorResponse)
 }
 
 @usableFromInline
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 package struct InvocationMetadata: Hashable, Sendable {
     @usableFromInline
     package let requestID: String
diff --git a/Sources/AWSLambdaRuntime/ControlPlaneRequestEncoder.swift b/Sources/AWSLambdaRuntime/ControlPlaneRequestEncoder.swift
@@ -14,9 +14,7 @@
 
 import NIOCore
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 struct ControlPlaneRequestEncoder: _EmittingChannelHandler {
     typealias OutboundOut = ByteBuffer
 
diff --git a/Sources/AWSLambdaRuntime/FoundationSupport/Context+Foundation.swift b/Sources/AWSLambdaRuntime/FoundationSupport/Context+Foundation.swift
@@ -19,9 +19,7 @@ import FoundationEssentials
 import struct Foundation.Date
 #endif
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 extension LambdaContext {
     /// Returns the deadline as a Date for the Lambda function execution.
     /// I'm not sure how usefull it is to have this as a Date, with only seconds precision,
diff --git a/Sources/AWSLambdaRuntime/FoundationSupport/Lambda+JSON.swift b/Sources/AWSLambdaRuntime/FoundationSupport/Lambda+JSON.swift
@@ -59,9 +59,7 @@ public struct LambdaJSONOutputEncoder<Output: Encodable>: LambdaOutputEncoder {
     }
 }
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 extension LambdaCodableAdapter {
     /// Initializes an instance given an encoder, decoder, and a handler with a non-`Void` output.
     ///   - Parameters:
@@ -87,9 +85,7 @@ extension LambdaCodableAdapter {
     }
 }
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 extension LambdaRuntime {
     /// Initialize an instance with a `LambdaHandler` defined in the form of a closure **with a non-`Void` return type**.
     /// - Parameters:
diff --git a/Sources/AWSLambdaRuntime/Lambda+Codable.swift b/Sources/AWSLambdaRuntime/Lambda+Codable.swift
@@ -48,9 +48,7 @@ public struct VoidEncoder: LambdaOutputEncoder {
 }
 
 /// Adapts a ``LambdaHandler`` conforming handler to conform to ``LambdaWithBackgroundProcessingHandler``.
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 public struct LambdaHandlerAdapter<
     Event: Decodable,
     Output,
@@ -83,9 +81,7 @@ public struct LambdaHandlerAdapter<
 }
 
 /// Adapts a ``LambdaWithBackgroundProcessingHandler`` conforming handler to conform to ``StreamingLambdaHandler``.
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 public struct LambdaCodableAdapter<
     Handler: LambdaWithBackgroundProcessingHandler,
     Event: Decodable,
diff --git a/Sources/AWSLambdaRuntime/Lambda+LocalServer.swift b/Sources/AWSLambdaRuntime/Lambda+LocalServer.swift
@@ -37,9 +37,7 @@ import Synchronization
 //         )
 //     }
 // }
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 extension Lambda {
     /// Execute code in the context of a mock Lambda server.
     ///
@@ -87,9 +85,7 @@ extension Lambda {
 /// 1. POST /invoke - the client posts the event to the lambda function
 ///
 /// This server passes the data received from /invoke POST request to the lambda function (GET /next) and then forwards the response back to the client.
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 internal struct LambdaHTTPServer {
     private let invocationEndpoint: String
 
diff --git a/Sources/AWSLambdaRuntime/Lambda.swift b/Sources/AWSLambdaRuntime/Lambda.swift
@@ -29,9 +29,7 @@ import ucrt
 #error("Unsupported platform")
 #endif
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 public enum Lambda {
     @inlinable
     package static func runLoop<RuntimeClient: LambdaRuntimeClientProtocol, Handler>(
@@ -101,9 +99,7 @@ public enum Lambda {
 
 // MARK: - Public API
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 extension Lambda {
     /// Utility to access/read environment variables
     public static func env(_ name: String) -> String? {
diff --git a/Sources/AWSLambdaRuntime/LambdaClock.swift b/Sources/AWSLambdaRuntime/LambdaClock.swift
@@ -51,9 +51,7 @@ import ucrt
 /// The Lambda execution environment uses UTC as a timezone,
 /// `LambdaClock` operates in UTC and does not account for time zones.
 /// see: TZ in https://docs.aws.amazon.com/lambda/latest/dg/configuration-envvars.html
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 public struct LambdaClock: Clock {
     public typealias Duration = Swift.Duration
 
diff --git a/Sources/AWSLambdaRuntime/LambdaContext.swift b/Sources/AWSLambdaRuntime/LambdaContext.swift
@@ -83,9 +83,7 @@ public struct ClientContext: Codable, Sendable {
 
 /// Lambda runtime context.
 /// The Lambda runtime generates and passes the `LambdaContext` to the Lambda handler as an argument.
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 public struct LambdaContext: CustomDebugStringConvertible, Sendable {
     final class _Storage: Sendable {
         let requestID: String
diff --git a/Sources/AWSLambdaRuntime/LambdaHandlers.swift b/Sources/AWSLambdaRuntime/LambdaHandlers.swift
@@ -21,9 +21,7 @@ import NIOCore
 /// Background work can also be executed after returning the response. After closing the response stream by calling
 /// ``LambdaResponseStreamWriter/finish()`` or ``LambdaResponseStreamWriter/writeAndFinish(_:)``,
 /// the ``handle(_:responseWriter:context:)`` function is free to execute any background work.
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 public protocol StreamingLambdaHandler: _Lambda_SendableMetatype {
     /// The handler function -- implement the business logic of the Lambda function here.
     /// - Parameters:
@@ -69,9 +67,7 @@ public protocol LambdaResponseStreamWriter {
 ///
 /// - note: This handler protocol does not support response streaming because the output has to be encoded prior to it being sent, e.g. it is not possible to encode a partial/incomplete JSON string.
 /// This protocol also does not support the execution of background work after the response has been returned -- the ``LambdaWithBackgroundProcessingHandler`` protocol caters for such use-cases.
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 public protocol LambdaHandler {
     /// Generic input type.
     /// The body of the request sent to Lambda will be decoded into this type for the handler to consume.
@@ -94,9 +90,7 @@ public protocol LambdaHandler {
 /// ``LambdaResponseWriter``that is passed in as an argument, meaning that the
 /// ``LambdaWithBackgroundProcessingHandler/handle(_:outputWriter:context:)`` function is then
 /// free to implement any background work after the result has been sent to the AWS Lambda control plane.
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 public protocol LambdaWithBackgroundProcessingHandler {
     /// Generic input type.
     /// The body of the request sent to Lambda will be decoded into this type for the handler to consume.
@@ -132,9 +126,7 @@ public protocol LambdaResponseWriter<Output> {
 
 /// A ``StreamingLambdaHandler`` conforming handler object that can be constructed with a closure.
 /// Allows for a handler to be defined in a clean manner, leveraging Swift's trailing closure syntax.
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 public struct StreamingClosureHandler: StreamingLambdaHandler {
     let body: @Sendable (ByteBuffer, LambdaResponseStreamWriter, LambdaContext) async throws -> Void
 
@@ -163,9 +155,7 @@ public struct StreamingClosureHandler: StreamingLambdaHandler {
 
 /// A ``LambdaHandler`` conforming handler object that can be constructed with a closure.
 /// Allows for a handler to be defined in a clean manner, leveraging Swift's trailing closure syntax.
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 public struct ClosureHandler<Event: Decodable, Output>: LambdaHandler {
     let body: (Event, LambdaContext) async throws -> Output
 
@@ -190,9 +180,7 @@ public struct ClosureHandler<Event: Decodable, Output>: LambdaHandler {
     }
 }
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 extension LambdaRuntime {
     /// Initialize an instance with a ``StreamingLambdaHandler`` in the form of a closure.
     /// - Parameter
diff --git a/Sources/AWSLambdaRuntime/LambdaResponseStreamWriter+Headers.swift b/Sources/AWSLambdaRuntime/LambdaResponseStreamWriter+Headers.swift
@@ -87,9 +87,7 @@ extension LambdaResponseStreamWriter {
     }
 }
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 extension LambdaResponseStreamWriter {
     /// Writes the HTTP status code and headers to the response stream.
     ///
diff --git a/Sources/AWSLambdaRuntime/LambdaRuntime+ServiceLifecycle.swift b/Sources/AWSLambdaRuntime/LambdaRuntime+ServiceLifecycle.swift
@@ -15,9 +15,7 @@
 #if ServiceLifecycleSupport
 import ServiceLifecycle
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 extension LambdaRuntime: Service {
     public func run() async throws {
         try await cancelWhenGracefulShutdown {
diff --git a/Sources/AWSLambdaRuntime/LambdaRuntime.swift b/Sources/AWSLambdaRuntime/LambdaRuntime.swift
@@ -24,14 +24,10 @@ import Foundation
 
 // This is our guardian to ensure only one LambdaRuntime is running at the time
 // We use an Atomic here to ensure thread safety
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 private let _isRunning = Atomic<Bool>(false)
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 public final class LambdaRuntime<Handler>: Sendable where Handler: StreamingLambdaHandler {
     @usableFromInline
     /// we protect the handler behind a Mutex to ensure that we only ever have one copy of it
diff --git a/Sources/AWSLambdaRuntime/LambdaRuntimeClient+ChannelHandler.swift b/Sources/AWSLambdaRuntime/LambdaRuntimeClient+ChannelHandler.swift
@@ -22,9 +22,7 @@ internal protocol LambdaChannelHandlerDelegate {
     func connectionErrorHappened(_ error: any Error, channel: any Channel)
 }
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 internal final class LambdaChannelHandler<Delegate: LambdaChannelHandlerDelegate> {
     let nextInvocationPath = Consts.invocationURLPrefix + Consts.getNextInvocationURLSuffix
 
@@ -362,9 +360,7 @@ internal final class LambdaChannelHandler<Delegate: LambdaChannelHandlerDelegate
     }
 }
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 extension LambdaChannelHandler: ChannelInboundHandler {
     typealias OutboundIn = Never
     typealias InboundIn = NIOHTTPClientResponseFull
diff --git a/Sources/AWSLambdaRuntime/LambdaRuntimeClient.swift b/Sources/AWSLambdaRuntime/LambdaRuntimeClient.swift
@@ -17,9 +17,7 @@ import NIOCore
 import NIOHTTP1
 import NIOPosix
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 @usableFromInline
 final actor LambdaRuntimeClient: LambdaRuntimeClientProtocol {
     @usableFromInline
@@ -407,9 +405,7 @@ final actor LambdaRuntimeClient: LambdaRuntimeClientProtocol {
     }
 }
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 extension LambdaRuntimeClient: LambdaChannelHandlerDelegate {
     nonisolated func connectionErrorHappened(_ error: any Error, channel: any Channel) {}
 
diff --git a/Sources/AWSLambdaRuntime/LambdaRuntimeClientProtocol.swift b/Sources/AWSLambdaRuntime/LambdaRuntimeClientProtocol.swift
@@ -23,19 +23,15 @@ package protocol LambdaRuntimeClientResponseStreamWriter: LambdaResponseStreamWr
 }
 
 @usableFromInline
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 package protocol LambdaRuntimeClientProtocol {
     associatedtype Writer: LambdaRuntimeClientResponseStreamWriter
 
     func nextInvocation() async throws -> (Invocation, Writer)
 }
 
 @usableFromInline
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 package struct Invocation: Sendable {
     @usableFromInline
     package var metadata: InvocationMetadata
diff --git a/Sources/AWSLambdaRuntime/Utils.swift b/Sources/AWSLambdaRuntime/Utils.swift
@@ -72,9 +72,7 @@ extension String {
     }
 }
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 extension AmazonHeaders {
     /// Generates (X-Ray) trace ID.
     /// # Trace ID Format
diff --git a/Sources/MockServer/MockHTTPServer.swift b/Sources/MockServer/MockHTTPServer.swift
@@ -25,10 +25,8 @@ import FoundationEssentials
 import Foundation
 #endif
 
-@main
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
+@main
 struct HttpServer {
     /// The server's host. (default: 127.0.0.1)
     private let host: String
diff --git a/Tests/AWSLambdaRuntimeTests/CollectEverythingLogHandler.swift b/Tests/AWSLambdaRuntimeTests/CollectEverythingLogHandler.swift
@@ -16,9 +16,7 @@ import Logging
 import Synchronization
 import Testing
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 struct CollectEverythingLogHandler: LogHandler {
     var metadata: Logger.Metadata = [:]
     var logLevel: Logger.Level = .info
diff --git a/Tests/AWSLambdaRuntimeTests/ControlPlaneRequestEncoderTests.swift b/Tests/AWSLambdaRuntimeTests/ControlPlaneRequestEncoderTests.swift
@@ -25,9 +25,7 @@ import FoundationEssentials
 import Foundation
 #endif
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 struct ControlPlaneRequestEncoderTests {
     let host = "192.168.0.1"
 
@@ -199,9 +197,7 @@ struct ControlPlaneRequestEncoderTests {
     }
 }
 
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 private final class ControlPlaneRequestEncoderHandler: ChannelOutboundHandler {
     typealias OutboundIn = ControlPlaneRequest
     typealias OutboundOut = ByteBuffer
diff --git a/Tests/AWSLambdaRuntimeTests/InvocationTests.swift b/Tests/AWSLambdaRuntimeTests/InvocationTests.swift
@@ -24,9 +24,7 @@ import Foundation
 #endif
 
 @Suite
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 struct InvocationTest {
     @Test
     func testInvocationTraceID() throws {
diff --git a/Tests/AWSLambdaRuntimeTests/Lambda+CodableTests.swift b/Tests/AWSLambdaRuntimeTests/Lambda+CodableTests.swift
@@ -24,9 +24,7 @@ import Foundation
 #endif
 
 @Suite
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 struct JSONTests {
 
     let logger = Logger(label: "JSONTests")
diff --git a/Tests/AWSLambdaRuntimeTests/LambdaClockTests.swift b/Tests/AWSLambdaRuntimeTests/LambdaClockTests.swift
@@ -23,9 +23,7 @@ import Foundation
 #endif
 
 @Suite("LambdaClock Tests")
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 struct LambdaClockTests {
 
     @Test("Clock provides current time")
diff --git a/Tests/AWSLambdaRuntimeTests/LambdaContextTests.swift b/Tests/AWSLambdaRuntimeTests/LambdaContextTests.swift
@@ -19,9 +19,7 @@ import Testing
 @testable import AWSLambdaRuntime
 
 @Suite("LambdaContext ClientContext Tests")
-#if swift(>=6.1)
 @available(LambdaSwift 2.0, *)
-#endif
 struct LambdaContextTests {
 
     @Test("ClientContext with full data resolves correctly")
diff --git a/Tests/AWSLambdaRuntimeTests/LambdaResponseStreamWriter+HeadersTests.swift b/Tests/AWSLambdaRuntimeTests/LambdaResponseStreamWriter+HeadersTests.swift
diff --git a/Tests/AWSLambdaRuntimeTests/LambdaRunLoopTests.swift b/Tests/AWSLambdaRuntimeTests/LambdaRunLoopTests.swift
diff --git a/Tests/AWSLambdaRuntimeTests/LambdaRuntime+ServiceLifeCycle.swift b/Tests/AWSLambdaRuntimeTests/LambdaRuntime+ServiceLifeCycle.swift
diff --git a/Tests/AWSLambdaRuntimeTests/LambdaRuntimeClientTests.swift b/Tests/AWSLambdaRuntimeTests/LambdaRuntimeClientTests.swift
diff --git a/Tests/AWSLambdaRuntimeTests/LambdaRuntimeTests.swift b/Tests/AWSLambdaRuntimeTests/LambdaRuntimeTests.swift
diff --git a/Tests/AWSLambdaRuntimeTests/MockLambdaClient.swift b/Tests/AWSLambdaRuntimeTests/MockLambdaClient.swift
diff --git a/Tests/AWSLambdaRuntimeTests/MockLambdaServer.swift b/Tests/AWSLambdaRuntimeTests/MockLambdaServer.swift
diff --git a/Tests/AWSLambdaRuntimeTests/PoolTests.swift b/Tests/AWSLambdaRuntimeTests/PoolTests.swift
diff --git a/Tests/AWSLambdaRuntimeTests/UtilsTest.swift b/Tests/AWSLambdaRuntimeTests/UtilsTest.swift

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,7 @@ public struct LambdaJSONOutputEncoder<Output: Encodable>: LambdaOutputEncoder {`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`-#if swift(>=6.1)`
`63`	`62`	`@available(LambdaSwift 2.0, *)`
`64`		`-#endif`
`65`	`63`	`extension LambdaCodableAdapter {`
`66`	`64`	/// Initializes an instance given an encoder, decoder, and a handler with a non-`Void` output.
`67`	`65`	`/// - Parameters:`
`@@ -87,9 +85,7 @@ extension LambdaCodableAdapter {`
`87`	`85`	`}`
`88`	`86`	`}`
`89`	`87`
`90`		`-#if swift(>=6.1)`
`91`	`88`	`@available(LambdaSwift 2.0, *)`
`92`		`-#endif`
`93`	`89`	`extension LambdaRuntime {`
`94`	`90`	/// Initialize an instance with a `LambdaHandler` defined in the form of a closure with a non-`Void` return type.
`95`	`91`	`/// - Parameters:`