Use explicit NIO imports

Author: fabianfett

Package.swift

@@ -15,21 +15,23 @@ let package = Package(
         .library(name: "AWSLambdaTesting", targets: ["AWSLambdaTesting"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.30.0")),
+        .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.32.0")),
         .package(url: "https://github.com/apple/swift-log.git", .upToNextMajor(from: "1.4.2")),
         .package(url: "https://github.com/swift-server/swift-backtrace.git", .upToNextMajor(from: "1.2.3")),
     ],
     targets: [
         .target(name: "AWSLambdaRuntime", dependencies: [
             .byName(name: "AWSLambdaRuntimeCore"),
-            .product(name: "NIO", package: "swift-nio"),
+            .product(name: "NIOCore", package: "swift-nio"),
             .product(name: "NIOFoundationCompat", package: "swift-nio"),
         ]),
         .target(name: "AWSLambdaRuntimeCore", dependencies: [
             .product(name: "Logging", package: "swift-log"),
             .product(name: "Backtrace", package: "swift-backtrace"),
             .product(name: "NIOHTTP1", package: "swift-nio"),
-            .product(name: "NIO", package: "swift-nio"),
+            .product(name: "NIOCore", package: "swift-nio"),
+            .product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
+            .product(name: "NIOPosix", package: "swift-nio"),
             .product(name: "_NIOConcurrency", package: "swift-nio"),
         ]),
         .testTarget(name: "AWSLambdaRuntimeCoreTests", dependencies: [

Sources/AWSLambdaRuntime/Lambda+Codable.swift

@@ -16,7 +16,7 @@
 import struct Foundation.Data
 import class Foundation.JSONDecoder
 import class Foundation.JSONEncoder
-import NIO
+import NIOCore
 import NIOFoundationCompat
 
 /// Extension to the `Lambda` companion to enable execution of Lambdas that take and return `Codable` events.

Sources/AWSLambdaRuntimeCore/HTTPClient.swift

@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOPosix
 import NIOConcurrencyHelpers
 import NIOHTTP1
 

Sources/AWSLambdaRuntimeCore/Lambda+LocalServer.swift

@@ -15,7 +15,8 @@
 #if DEBUG
 import Dispatch
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 import NIOConcurrencyHelpers
 import NIOHTTP1
 

Sources/AWSLambdaRuntimeCore/Lambda+String.swift

@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import NIO
+import NIOCore
 
 /// Extension to the `Lambda` companion to enable execution of Lambdas that take and return `String` events.
 extension Lambda {

Sources/AWSLambdaRuntimeCore/Lambda.swift

@@ -21,7 +21,8 @@ import Darwin.C
 import _NIOConcurrency
 import Backtrace
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 
 public enum Lambda {
     public typealias Handler = ByteBufferLambdaHandler

Sources/AWSLambdaRuntimeCore/LambdaConfiguration.swift

@@ -14,7 +14,7 @@
 
 import Dispatch
 import Logging
-import NIO
+import NIOCore
 
 extension Lambda {
     internal struct Configuration: CustomStringConvertible {

Sources/AWSLambdaRuntimeCore/LambdaContext.swift

@@ -14,7 +14,7 @@
 
 import Dispatch
 import Logging
-import NIO
+import NIOCore
 
 // MARK: - InitializationContext
 

Sources/AWSLambdaRuntimeCore/LambdaHandler.swift

@@ -14,7 +14,7 @@
 
 import _NIOConcurrency
 import Dispatch
-import NIO
+import NIOCore
 
 // MARK: - LambdaHandler
 
@@ -115,7 +115,7 @@ public protocol AsyncLambdaHandler: EventLoopLambdaHandler {
 extension AsyncLambdaHandler {
     public func handle(context: Lambda.Context, event: In) -> EventLoopFuture<Out> {
         let promise = context.eventLoop.makePromise(of: Out.self)
-        promise.completeWithAsync {
+        promise.completeWithTask {
             try await self.handle(event: event, context: context)
         }
         return promise.futureResult
@@ -127,7 +127,7 @@ extension AsyncLambdaHandler {
     public static func main() {
         Lambda.run { context -> EventLoopFuture<ByteBufferLambdaHandler> in
             let promise = context.eventLoop.makePromise(of: ByteBufferLambdaHandler.self)
-            promise.completeWithAsync {
+            promise.completeWithTask {
                 try await Self(context: context)
             }
             return promise.futureResult

Sources/AWSLambdaRuntimeCore/LambdaLifecycle.swift

@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Logging
-import NIO
+import NIOCore
 import NIOConcurrencyHelpers
 
 extension Lambda {

Sources/AWSLambdaRuntimeCore/LambdaRunner.swift

@@ -14,7 +14,7 @@
 
 import Dispatch
 import Logging
-import NIO
+import NIOCore
 
 extension Lambda {
     /// LambdaRunner manages the Lambda runtime workflow, or business logic.

Sources/AWSLambdaRuntimeCore/LambdaRuntimeClient.swift

@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Logging
-import NIO
+import NIOCore
 import NIOHTTP1
 
 /// An HTTP based client for AWS Runtime Engine. This encapsulates the RESTful methods exposed by the Runtime Engine:

Sources/AWSLambdaRuntimeCore/Utils.swift

@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 import Dispatch
-import NIO
 
 internal enum Consts {
     static let apiPrefix = "/2018-06-01"

Sources/AWSLambdaTesting/Lambda+Testing.swift

@@ -38,7 +38,8 @@
 @testable import AWSLambdaRuntimeCore
 import Dispatch
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 
 extension Lambda {
     public struct TestConfig {

Sources/CodableSample/main.swift

@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import AWSLambdaRuntime
-import NIO
+import NIOCore
 
 struct Request: Codable {
     let body: String

Sources/MockServer/main.swift

@@ -13,7 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import NIO
+import NIOCore
+import NIOPosix
 import NIOHTTP1
 
 internal struct MockServer {

Sources/StringSample/main.swift

@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import AWSLambdaRuntimeCore
-import NIO
+import NIOCore
 
 // in this example we are receiving and responding with strings
 struct Handler: EventLoopLambdaHandler {

Tests/AWSLambdaRuntimeCoreTests/LambdaHandlerTest.swift

@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 @testable import AWSLambdaRuntimeCore
-import NIO
+import NIOCore
 import XCTest
 
 class LambdaHandlerTest: XCTestCase {

Tests/AWSLambdaRuntimeCoreTests/LambdaLifecycleTest.swift

@@ -14,7 +14,8 @@
 
 @testable import AWSLambdaRuntimeCore
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 import NIOHTTP1
 import XCTest
 

Tests/AWSLambdaRuntimeCoreTests/LambdaRuntimeClientTest.swift

@@ -14,7 +14,8 @@
 
 @testable import AWSLambdaRuntimeCore
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 import NIOFoundationCompat
 import NIOHTTP1
 import NIOTestUtils

Tests/AWSLambdaRuntimeCoreTests/LambdaTest.swift

@@ -14,7 +14,8 @@
 
 @testable import AWSLambdaRuntimeCore
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 class LambdaTest: XCTestCase {

Tests/AWSLambdaRuntimeCoreTests/MockLambdaServer.swift

@@ -15,7 +15,8 @@
 @testable import AWSLambdaRuntimeCore
 import Foundation // for JSON
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 import NIOHTTP1
 
 internal final class MockLambdaServer {

Tests/AWSLambdaRuntimeCoreTests/Utils.swift

@@ -14,7 +14,8 @@
 
 @testable import AWSLambdaRuntimeCore
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 func runLambda(behavior: LambdaServerBehavior, handler: Lambda.Handler) throws {

Tests/AWSLambdaRuntimeTests/Lambda+CodeableTest.swift

@@ -15,7 +15,8 @@
 @testable import AWSLambdaRuntime
 @testable import AWSLambdaRuntimeCore
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 import NIOFoundationCompat
 import XCTest
 

Tests/AWSLambdaTestingTests/Tests.swift

@@ -14,7 +14,7 @@
 
 import AWSLambdaRuntime
 import AWSLambdaTesting
-import NIO
+import NIOCore
 import XCTest
 
 class LambdaTestingTests: XCTestCase {