Adopt concurrency adoption guidelines (#230)

stevapple · web-flow · commit 4317c5334f12 · 2021-12-06T20:52:35.000+01:00
Adopt Swift Concurrency adoption guidelines for Swift Server Libraries (swift-server/guides#70). - Use #if compiler(>=5.5) && canImport(_Concurrency) to judge if Concurrency is available - Some clean up
diff --git a/Examples/Deployment/README.md b/Examples/Deployment/README.md
@@ -87,7 +87,7 @@ The SAM template will provide an output labelled `LambdaApiGatewayEndpoint` whic
 
   ```
   curl <<LambdaApiGatewayEndpoint>>
-  ```  
+  ```
 
 ***Warning:*** This SAM template is only intended as a sample and creates a publicly accessible HTTP endpoint.
 
@@ -162,7 +162,7 @@ For example:
 
   ```
   curl https://r39lvhfng3.execute-api.us-east-1.amazonaws.com/api
-  ```  
+  ```
 
 ***Warning:*** This Serverless template is only intended as a sample and creates a publicly accessible HTTP endpoint.
 
diff --git a/Examples/Deployment/scripts/SAM/APIGateway-template.yml b/Examples/Deployment/scripts/SAM/APIGateway-template.yml
diff --git a/Examples/Deployment/scripts/serverless/APIGateway-template.yml b/Examples/Deployment/scripts/serverless/APIGateway-template.yml
diff --git a/Examples/Deployment/scripts/serverless/Benchmark-template.yml b/Examples/Deployment/scripts/serverless/Benchmark-template.yml
@@ -12,7 +12,7 @@ provider:
               - logs:CreateLogGroup
               - logs:CreateLogStream
               - logs:PutLogEvents
-          Resource: "*"        
+          Resource: "*"
 
 functions:
     benchmarkFunction:
diff --git a/Examples/Deployment/scripts/serverless/HelloWorld-template.yml b/Examples/Deployment/scripts/serverless/HelloWorld-template.yml
@@ -12,7 +12,7 @@ provider:
               - logs:CreateLogGroup
               - logs:CreateLogStream
               - logs:PutLogEvents
-          Resource: "*"        
+          Resource: "*"
 
 functions:
     hello:
diff --git a/Sources/AWSLambdaRuntimeCore/Lambda.swift b/Sources/AWSLambdaRuntimeCore/Lambda.swift
@@ -53,7 +53,7 @@ public enum Lambda {
         return String(cString: value)
     }
 
-    #if swift(>=5.5)
+    #if compiler(>=5.5) && canImport(_Concurrency)
     // for testing and internal use
     @available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
     internal static func run<Handler: LambdaHandler>(configuration: Configuration = .init(), handlerType: Handler.Type) -> Result<Int, Error> {
diff --git a/Sources/AWSLambdaRuntimeCore/LambdaHandler.swift b/Sources/AWSLambdaRuntimeCore/LambdaHandler.swift
@@ -17,7 +17,7 @@ import NIOCore
 
 // MARK: - LambdaHandler
 
-#if compiler(>=5.5)
+#if compiler(>=5.5) && canImport(_Concurrency)
 /// Strongly typed, processing protocol for a Lambda that takes a user defined `Event` and returns a user defined `Output` async.
 @available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
 public protocol LambdaHandler: EventLoopLambdaHandler {
diff --git a/Sources/AWSLambdaTesting/Lambda+Testing.swift b/Sources/AWSLambdaTesting/Lambda+Testing.swift
@@ -33,9 +33,8 @@
 //     XCTAssertEqual(result, "echo" + input)
 // }
 
-#if swift(>=5.5)
+#if compiler(>=5.5) && canImport(_Concurrency)
 import AWSLambdaRuntime
-import AWSLambdaRuntimeCore
 import Dispatch
 import Logging
 import NIOCore
diff --git a/Tests/AWSLambdaRuntimeCoreTests/LambdaHandlerTest.swift b/Tests/AWSLambdaRuntimeCoreTests/LambdaHandlerTest.swift
@@ -17,7 +17,7 @@ import NIOCore
 import XCTest
 
 class LambdaHandlerTest: XCTestCase {
-    #if compiler(>=5.5)
+    #if compiler(>=5.5) && canImport(_Concurrency)
 
     // MARK: - LambdaHandler
 
diff --git a/Tests/AWSLambdaRuntimeTests/Lambda+CodableTest.swift b/Tests/AWSLambdaRuntimeTests/Lambda+CodableTest.swift
@@ -82,7 +82,7 @@ class CodableLambdaTest: XCTestCase {
         XCTAssertEqual(response?.requestId, request.requestId)
     }
 
-    #if swift(>=5.5)
+    #if compiler(>=5.5) && canImport(_Concurrency)
     @available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
     func testCodableVoidHandler() {
         struct Handler: LambdaHandler {
@@ -183,7 +183,7 @@ private struct Response: Codable, Equatable {
     }
 }
 
-#if swift(>=5.5)
+#if compiler(>=5.5) && canImport(_Concurrency)
 // NOTE: workaround until we have async test support on linux
 //         https://github.com/apple/swift-corelibs-xctest/pull/326
 extension XCTestCase {
diff --git a/Tests/AWSLambdaTestingTests/Tests.swift b/Tests/AWSLambdaTestingTests/Tests.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if swift(>=5.5)
+#if compiler(>=5.5) && canImport(_Concurrency)
 import AWSLambdaRuntime
 import AWSLambdaTesting
 import NIOCore
diff --git a/readme.md b/readme.md
@@ -144,7 +144,7 @@ First, add a dependency on the event packages:
 
  Beyond the small cognitive complexity of using the `EventLoopFuture` based APIs, note these APIs should be used with extra care. An `EventLoopLambdaHandler` will execute the user code on the same `EventLoop` (thread) as the library, making processing faster but requiring the user code to never call blocking APIs as it might prevent the underlying process from functioning.
 
-## Deploying to AWS Lambda   
+## Deploying to AWS Lambda
 
 To deploy Lambda functions to AWS Lambda, you need to compile the code for Amazon Linux which is the OS used on AWS Lambda microVMs, package it as a Zip file, and upload to AWS.
 
@@ -160,7 +160,7 @@ The library defines three protocols for the implementation of a Lambda Handler.
 
 ### ByteBufferLambdaHandler
 
-An `EventLoopFuture` based processing protocol for a Lambda that takes a `ByteBuffer` and returns a `ByteBuffer?` asynchronously.  
+An `EventLoopFuture` based processing protocol for a Lambda that takes a `ByteBuffer` and returns a `ByteBuffer?` asynchronously.
 
 `ByteBufferLambdaHandler` is the lowest level protocol designed to power the higher level `EventLoopLambdaHandler` and `LambdaHandler` based APIs. Users are not expected to use this protocol, though some performance sensitive applications that operate at the `ByteBuffer` level or have special serialization needs may choose to do so.
 

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public enum Lambda {`
`53`	`53`	`return String(cString: value)`
`54`	`54`	`}`
`55`	`55`
`56`		`- #if swift(>=5.5)`
	`56`	`+ #if compiler(>=5.5) && canImport(_Concurrency)`
`57`	`57`	`// for testing and internal use`
`58`	`58`	`@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)`
`59`	`59`	`internal static func run<Handler: LambdaHandler>(configuration: Configuration = .init(), handlerType: Handler.Type) -> Result<Int, Error> {`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ class CodableLambdaTest: XCTestCase {`
`82`	`82`	`XCTAssertEqual(response?.requestId, request.requestId)`
`83`	`83`	`}`
`84`	`84`
`85`		`- #if swift(>=5.5)`
	`85`	`+ #if compiler(>=5.5) && canImport(_Concurrency)`
`86`	`86`	`@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)`
`87`	`87`	`func testCodableVoidHandler() {`
`88`	`88`	`struct Handler: LambdaHandler {`
`@@ -183,7 +183,7 @@ private struct Response: Codable, Equatable {`
`183`	`183`	`}`
`184`	`184`	`}`
`185`	`185`
`186`		`-#if swift(>=5.5)`
	`186`	`+#if compiler(>=5.5) && canImport(_Concurrency)`
`187`	`187`	`// NOTE: workaround until we have async test support on linux`
`188`	`188`	`// https://github.com/apple/swift-corelibs-xctest/pull/326`
`189`	`189`	`extension XCTestCase {`