Merge pull request #128 from amzn/code_cleanup_conditional_compilation

Code cleanup: Remove conditional compilation for unsupported Swift versions
amzn · Sep 8, 2023 · 744d16f · 744d16f
2 parents bb0fb34 + 2137785
commit 744d16f
Show file tree

Hide file tree

Showing 26 changed files with 5 additions and 143 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -6,17 +6,17 @@
         "repositoryURL": "https://github.com/swift-server/async-http-client.git",
         "state": {
           "branch": null,
-          "revision": "78db67e5bf4a8543075787f228e8920097319281",
-          "version": "1.18.0"
+          "revision": "16f7e62c08c6969899ce6cc277041e868364e5cf",
+          "version": "1.19.0"
         }
       },
       {
         "package": "smoke-http",
         "repositoryURL": "https://github.com/amzn/smoke-http.git",
         "state": {
           "branch": null,
-          "revision": "84e6805ca07f9e4d7c39fbf61b7feff0484ee67f",
-          "version": "2.21.0"
+          "revision": "0176ddefd733d27a4b98e5249b1a4ef236107eb5",
+          "version": "2.22.0"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.4
+// swift-tools-version:5.6
 //
 // Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 //

diff --git a/Sources/SmokeHTTP1/StandardSmokeHTTP1Server.swift b/Sources/SmokeHTTP1/StandardSmokeHTTP1Server.swift
@@ -24,9 +24,7 @@ import SmokeInvocation
 
 private struct ServerShutdownDetails {
     let completionHandlers: [() -> Void]
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
     let awaitingContinuations: [CheckedContinuation<Void, Error>]
-#endif
 }
 
 /**
@@ -53,9 +51,7 @@ public class StandardSmokeHTTP1Server<HTTP1RequestHandlerType: HTTP1RequestHandl
         case shutDown
     }
     private var shutdownCompletionHandlers: [() -> Void] = []
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
     private var shutdownWaitingContinuations: [CheckedContinuation<Void, Error>] = []
-#endif
     private var serverState: State = .initialized
     private var stateLock: NSLock = NSLock()
 
@@ -243,10 +239,8 @@ public class StandardSmokeHTTP1Server<HTTP1RequestHandlerType: HTTP1RequestHandl
                 // execute all the completion handlers
                 serverShutdownDetails.completionHandlers.forEach { self.shutdownCompletionHandlerInvocationStrategy.invoke(handler: $0) }
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
                 // resume any continuations
                 serverShutdownDetails.awaitingContinuations.forEach { $0.resume(returning: ()) }
-#endif
 
                 if self.ownEventLoopGroup {
                     try self.eventLoopGroup.syncShutdownGracefully()
@@ -273,7 +267,6 @@ public class StandardSmokeHTTP1Server<HTTP1RequestHandlerType: HTTP1RequestHandl
         }
     }
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
     public func untilShutdown() async throws {
         return try await withCheckedThrowingContinuation { cont in
             if !addContinuationIfShutdown(newContinuation: cont) {
@@ -284,7 +277,6 @@ public class StandardSmokeHTTP1Server<HTTP1RequestHandlerType: HTTP1RequestHandl
             }
         }
     }
-#endif
 
     /**
      Blocks until the server has been shutdown and all completion handlers
@@ -393,14 +385,10 @@ public class StandardSmokeHTTP1Server<HTTP1RequestHandlerType: HTTP1RequestHandl
         let completionHandlers = self.shutdownCompletionHandlers
         self.shutdownCompletionHandlers = []
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
         let waitingContinuations = self.shutdownWaitingContinuations
         self.shutdownWaitingContinuations = []
 
         return ServerShutdownDetails(completionHandlers: completionHandlers, awaitingContinuations: waitingContinuations)
-#else
-        return ServerShutdownDetails(completionHandlers: completionHandlers)
-#endif
     }
 
     /**
@@ -447,7 +435,6 @@ public class StandardSmokeHTTP1Server<HTTP1RequestHandlerType: HTTP1RequestHandl
         return false
     }
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
     public func addContinuationIfShutdown(newContinuation: CheckedContinuation<Void, Error>) -> Bool {
         stateLock.lock()
         defer {
@@ -462,5 +449,4 @@ public class StandardSmokeHTTP1Server<HTTP1RequestHandlerType: HTTP1RequestHandl
 
         return false
     }
-#endif
 }
diff --git a/Sources/SmokeOperations/OperationHandler+withContextInputNoOutput.swift b/Sources/SmokeOperations/OperationHandler+withContextInputNoOutput.swift
@@ -15,8 +15,6 @@
 // SmokeOperations
 //
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
-
 import Foundation
 import Logging
 import Tracing
@@ -84,5 +82,3 @@ public extension OperationHandler {
                   ignoreInvocationStrategy: true)
     }
 }
-
-#endif
diff --git a/Sources/SmokeOperations/OperationHandler+withContextInputWithOutput.swift b/Sources/SmokeOperations/OperationHandler+withContextInputWithOutput.swift
@@ -15,8 +15,6 @@
 // SmokeOperations
 //
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
-
 import Foundation
 import Logging
 import Tracing
@@ -88,5 +86,3 @@ public extension OperationHandler {
                   ignoreInvocationStrategy: true)
     }
 }
-
-#endif
diff --git a/Sources/SmokeOperations/OperationHandler+withInputNoOutput.swift b/Sources/SmokeOperations/OperationHandler+withInputNoOutput.swift
@@ -15,8 +15,6 @@
 // SmokeOperations
 //
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
-
 import Foundation
 import Logging
 import Tracing
@@ -90,5 +88,3 @@ public extension OperationHandler {
                   ignoreInvocationStrategy: true)
     }
 }
-
-#endif
diff --git a/Sources/SmokeOperations/OperationHandler+withInputWithOutput.swift b/Sources/SmokeOperations/OperationHandler+withInputWithOutput.swift
@@ -15,8 +15,6 @@
 // SmokeOperations
 //
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
-
 import Foundation
 import Logging
 import Tracing
@@ -94,5 +92,3 @@ public extension OperationHandler {
                   ignoreInvocationStrategy: true)
     }
 }
-
-#endif
diff --git a/Sources/SmokeOperationsHTTP1/SmokeAsyncPerInvocationContextInitializer.swift b/Sources/SmokeOperationsHTTP1/SmokeAsyncPerInvocationContextInitializer.swift
@@ -20,8 +20,6 @@ import SmokeInvocation
 import SmokeOperations
 import Logging
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
-
 /**
   A protocol for initialization SmokeFramework-based applications that require a per-invocation context.
  
@@ -63,4 +61,3 @@ public extension SmokeAsyncPerInvocationContextInitializer {
         return SmokeReportingConfiguration()
     }
 }
-#endif
diff --git a/Sources/SmokeOperationsHTTP1/SmokeAsyncStaticContextInitializer.swift b/Sources/SmokeOperationsHTTP1/SmokeAsyncStaticContextInitializer.swift
@@ -20,8 +20,6 @@ import SmokeInvocation
 import SmokeOperations
 import Logging
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
-
 /**
   A protocol for initialization SmokeFramework-based applications that require a static context.
 
@@ -61,4 +59,3 @@ public extension SmokeAsyncStaticContextInitializer {
         return SmokeReportingConfiguration()
     }
 }
-#endif
diff --git a/Sources/SmokeOperationsHTTP1/SmokeHTTP1HandlerSelector+fromProviderWithInputNoOutput.swift b/Sources/SmokeOperationsHTTP1/SmokeHTTP1HandlerSelector+fromProviderWithInputNoOutput.swift
@@ -15,8 +15,6 @@
 // SmokeOperationsHTTP1
 //
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
-
 import Foundation
 import SmokeOperations
 import NIOHTTP1
@@ -150,5 +148,3 @@ public extension SmokeHTTP1HandlerSelector {
                                operationDelegate: operationDelegate)
     }
 }
-
-#endif
diff --git a/Sources/SmokeOperationsHTTP1/SmokeHTTP1HandlerSelector+fromProviderWithInputWithOutput.swift b/Sources/SmokeOperationsHTTP1/SmokeHTTP1HandlerSelector+fromProviderWithInputWithOutput.swift
@@ -15,8 +15,6 @@
 // SmokeOperationsHTTP1
 //
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
-
 import Foundation
 import SmokeOperations
 import NIOHTTP1
@@ -158,5 +156,3 @@ public extension SmokeHTTP1HandlerSelector {
                                allowedErrors: allowedErrors)
     }
 }
-
-#endif
diff --git a/Sources/SmokeOperationsHTTP1/SmokeHTTP1HandlerSelector+withContextInputNoOutput.swift b/Sources/SmokeOperationsHTTP1/SmokeHTTP1HandlerSelector+withContextInputNoOutput.swift
@@ -15,8 +15,6 @@
 // SmokeOperationsHTTP1
 //
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
-
 import Foundation
 import SmokeOperations
 import NIOHTTP1
@@ -163,5 +161,3 @@ public extension SmokeHTTP1HandlerSelector {
         addHandlerForOperation(operationIdentifer, httpMethod: httpMethod, handler: handler)
     }
 }
-
-#endif
diff --git a/Sources/SmokeOperationsHTTP1/SmokeHTTP1HandlerSelector+withContextInputWithOutput.swift b/Sources/SmokeOperationsHTTP1/SmokeHTTP1HandlerSelector+withContextInputWithOutput.swift
@@ -15,8 +15,6 @@
 // SmokeOperationsHTTP1
 //
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
-
 import Foundation
 import SmokeOperations
 import NIOHTTP1
@@ -195,5 +193,3 @@ public extension SmokeHTTP1HandlerSelector {
         addHandlerForOperation(operationIdentifer, httpMethod: httpMethod, handler: handler)
     }
 }
-
-#endif
diff --git a/Sources/SmokeOperationsHTTP1/SmokeHTTP1HandlerSelector+withInputNoOutput.swift b/Sources/SmokeOperationsHTTP1/SmokeHTTP1HandlerSelector+withInputNoOutput.swift
@@ -15,8 +15,6 @@
 // SmokeOperationsHTTP1
 //
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
-
 import Foundation
 import SmokeOperations
 import NIOHTTP1
@@ -167,5 +165,3 @@ public extension SmokeHTTP1HandlerSelector {
         addHandlerForOperation(operationIdentifer, httpMethod: httpMethod, handler: handler)
     }
 }
-
-#endif
diff --git a/Sources/SmokeOperationsHTTP1/SmokeHTTP1HandlerSelector+withInputWithOutput.swift b/Sources/SmokeOperationsHTTP1/SmokeHTTP1HandlerSelector+withInputWithOutput.swift
@@ -15,8 +15,6 @@
 // SmokeOperationsHTTP1
 //
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
-
 import Foundation
 import SmokeOperations
 import NIOHTTP1
@@ -199,5 +197,3 @@ public extension SmokeHTTP1HandlerSelector {
         addHandlerForOperation(operationIdentifer, httpMethod: httpMethod, handler: handler)
     }
 }
-
-#endif
diff --git a/Sources/SmokeOperationsHTTP1Server/SmokeAsyncServerPerInvocationContextInitializer.swift b/Sources/SmokeOperationsHTTP1Server/SmokeAsyncServerPerInvocationContextInitializer.swift
@@ -19,8 +19,6 @@ import Foundation
 import SmokeOperationsHTTP1
 import SmokeHTTP1
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
-
 public protocol SmokeAsyncServerPerInvocationContextInitializer: SmokeAsyncPerInvocationContextInitializer {
 
     var port: Int { get }
@@ -51,4 +49,3 @@ public extension SmokeAsyncServerPerInvocationContextInitializer {
         return false
     }
 }
-#endif
diff --git a/Sources/SmokeOperationsHTTP1Server/SmokeAsyncServerStaticContextInitializer.swift b/Sources/SmokeOperationsHTTP1Server/SmokeAsyncServerStaticContextInitializer.swift
@@ -19,8 +19,6 @@ import Foundation
 import SmokeOperationsHTTP1
 import SmokeHTTP1
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
-
 public protocol SmokeAsyncServerStaticContextInitializer: SmokeAsyncStaticContextInitializer {
 
     var port: Int { get }
@@ -51,4 +49,3 @@ public extension SmokeAsyncServerStaticContextInitializer {
         return false
     }
 }
-#endif
diff --git a/Sources/SmokeOperationsHTTP1Server/SmokeHTTP1Server+runAsOperationServer.swift b/Sources/SmokeOperationsHTTP1Server/SmokeHTTP1Server+runAsOperationServer.swift
@@ -320,7 +320,6 @@ public extension SmokeHTTP1Server {
         }
     }
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
     static func runAsOperationServer<InitializerType: SmokeAsyncServerStaticContextInitializer, TraceContextType>(
         _ factory: @escaping (EventLoopGroup) async throws -> InitializerType) async
     where InitializerType.SelectorType.DefaultOperationDelegateType.InvocationReportingType == SmokeServerInvocationReporting<TraceContextType>,
@@ -450,5 +449,4 @@ public extension SmokeHTTP1Server {
             logger.error("Operations Server lifecycle error: '\(error)'")
         }
     }
-#endif
 }
diff --git a/...keOperationsHTTP1Server/StandardJSONSmokeAsyncServerPerInvocationContextInitializer.swift b/...keOperationsHTTP1Server/StandardJSONSmokeAsyncServerPerInvocationContextInitializer.swift
@@ -20,8 +20,6 @@ import SmokeOperationsHTTP1
 import SmokeHTTP1
 import SmokeOperations
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
-
 /**
   A protocol that is derived from `SmokeAsyncServerPerInvocationContextInitializerV3` that uses the `StandardSmokeHTTP1HandlerSelector`
   type as the `SelectorType` and `JSONPayloadHTTP1OperationDelegate` as the `DefaultOperationDelegateType`.
@@ -33,11 +31,7 @@ public protocol StandardJSONSmokeAsyncServerPerInvocationContextInitializer: Smo
                 StandardSmokeHTTP1HandlerSelector<ContextType, JSONPayloadHTTP1OperationDelegate<SmokeInvocationTraceContext>,
                                                   OperationIdentifer> {
     associatedtype ContextType
-#if swift(>=5.6)
     associatedtype OperationIdentifer
-#else
-    associatedtype OperationIdentifer: OperationIdentity
-#endif
 
     typealias OperationsInitializerType = ((inout StandardSmokeHTTP1HandlerSelector<ContextType, JSONPayloadHTTP1OperationDelegate<SmokeInvocationTraceContext>, OperationIdentifer>) -> Void)
 }
@@ -57,5 +51,3 @@ public extension StandardJSONSmokeAsyncServerPerInvocationContextInitializer {
         return JSONPayloadHTTP1OperationDelegate()
     }
 }
-
-#endif
diff --git a/...ces/SmokeOperationsHTTP1Server/StandardJSONSmokeAsyncServerStaticContextInitializer.swift b/...ces/SmokeOperationsHTTP1Server/StandardJSONSmokeAsyncServerStaticContextInitializer.swift
@@ -20,8 +20,6 @@ import SmokeOperationsHTTP1
 import SmokeHTTP1
 import SmokeOperations
 
-#if (os(Linux) && compiler(>=5.5)) || (!os(Linux) && compiler(>=5.5.2)) && canImport(_Concurrency)
-
 /**
   A protocol that is derived from `SmokeAsyncServerStaticContextInitializerV3` that uses the `StandardSmokeHTTP1HandlerSelector`
   type as the `SelectorType` and `JSONPayloadHTTP1OperationDelegate` as the `DefaultOperationDelegateType`.
@@ -33,11 +31,7 @@ public protocol StandardJSONSmokeAsyncServerStaticContextInitializer: SmokeAsync
                 StandardSmokeHTTP1HandlerSelector<ContextType, JSONPayloadHTTP1OperationDelegate<SmokeInvocationTraceContext>,
                                                   OperationIdentifer> {
     associatedtype ContextType
-#if swift(>=5.6)
     associatedtype OperationIdentifer
-#else
-    associatedtype OperationIdentifer: OperationIdentity
-#endif
 
     typealias OperationsInitializerType = ((inout StandardSmokeHTTP1HandlerSelector<ContextType, JSONPayloadHTTP1OperationDelegate<SmokeInvocationTraceContext>, OperationIdentifer>) -> Void)
 }
@@ -57,5 +51,3 @@ public extension StandardJSONSmokeAsyncServerStaticContextInitializer {
         return JSONPayloadHTTP1OperationDelegate()
     }
 }
-
-#endif
diff --git a/...s/SmokeOperationsHTTP1Server/StandardJSONSmokeServerPerInvocationContextInitializer.swift b/...s/SmokeOperationsHTTP1Server/StandardJSONSmokeServerPerInvocationContextInitializer.swift
@@ -31,11 +31,7 @@ public protocol StandardJSONSmokeServerPerInvocationContextInitializer: SmokeSer
                 StandardSmokeHTTP1HandlerSelector<ContextType, JSONPayloadHTTP1OperationDelegate<SmokeInvocationTraceContext>,
                                                   OperationIdentifer> {
     associatedtype ContextType
-#if swift(>=5.6)
     associatedtype OperationIdentifer
-#else
-    associatedtype OperationIdentifer: OperationIdentity
-#endif
 
     typealias OperationsInitializerType = ((inout StandardSmokeHTTP1HandlerSelector<ContextType, JSONPayloadHTTP1OperationDelegate<SmokeInvocationTraceContext>, OperationIdentifer>) -> Void)
 }