Use more specific NIO imports (#1239)

Motivation:

The `NIO` module is now a 'shell' module which re-exports `NIOCore`,
`NIOPosix` and `NIOEmbeeded`.

Modifications:

For the GRPC and GRPCTests modules:
- Replace "import NIO" with "import NIOCore"
- Add imports for NIOEmbeeded and NIOPosix as necessary

Result:

Imports are closer to what we actually use.

Package.swift

@@ -26,13 +26,13 @@ let package = Package(
   dependencies: [
     // GRPC dependencies:
     // Main SwiftNIO package
-    .package(url: "https://github.com/apple/swift-nio.git", from: "2.28.0"),
+    .package(url: "https://github.com/apple/swift-nio.git", from: "2.32.0"),
     // HTTP2 via SwiftNIO
-    .package(url: "https://github.com/apple/swift-nio-http2.git", from: "1.17.0"),
+    .package(url: "https://github.com/apple/swift-nio-http2.git", from: "1.18.2"),
     // TLS via SwiftNIO
     .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.14.0"),
     // Support for Network.framework where possible.
-    .package(url: "https://github.com/apple/swift-nio-transport-services.git", from: "1.6.0"),
+    .package(url: "https://github.com/apple/swift-nio-transport-services.git", from: "1.11.1"),
     // Extra NIO stuff; quiescing helpers.
     .package(url: "https://github.com/apple/swift-nio-extras.git", from: "1.4.0"),
 
@@ -46,8 +46,8 @@ let package = Package(
     // Logging API.
     .package(url: "https://github.com/apple/swift-log.git", from: "1.4.0"),
 
-    // Argument parsering: only for internal targets (i.e. examples).
-    // swift-argument-parser only provides source compatability guarantees between minor version.
+    // Argument parsing: only for internal targets (i.e. examples).
+    // swift-argument-parser only provides source compatibility guarantees between minor version.
     .package(url: "https://github.com/apple/swift-argument-parser", "0.3.0" ..< "0.5.0"),
   ],
   targets: [
@@ -56,6 +56,9 @@ let package = Package(
       name: "GRPC",
       dependencies: [
         .product(name: "NIO", package: "swift-nio"),
+        .product(name: "NIOCore", package: "swift-nio"),
+        .product(name: "NIOPosix", package: "swift-nio"),
+        .product(name: "NIOEmbedded", package: "swift-nio"),
         .product(name: "NIOFoundationCompat", package: "swift-nio"),
         .product(name: "NIOTransportServices", package: "swift-nio-transport-services"),
         .product(name: "NIOHTTP1", package: "swift-nio"),
@@ -76,6 +79,9 @@ let package = Package(
         .target(name: "GRPCSampleData"),
         .target(name: "GRPCInteroperabilityTestsImplementation"),
         .target(name: "HelloWorldModel"),
+        .product(name: "NIOCore", package: "swift-nio"),
+        .product(name: "NIOPosix", package: "swift-nio"),
+        .product(name: "NIOEmbedded", package: "swift-nio"),
       ]
     ),
 

Sources/GRPC/CallHandlers/BidirectionalStreamingServerHandler.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHPACK
 
 public final class BidirectionalStreamingServerHandler<

Sources/GRPC/CallHandlers/ClientStreamingServerHandler.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHPACK
 
 public final class ClientStreamingServerHandler<

Sources/GRPC/CallHandlers/ServerHandlerProtocol.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHPACK
 
 /// This protocol lays out the inbound interface between the gRPC module and generated server code.

Sources/GRPC/CallHandlers/ServerStreamingServerHandler.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHPACK
 
 public final class ServerStreamingServerHandler<

Sources/GRPC/CallHandlers/UnaryServerHandler.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHPACK
 
 public final class UnaryServerHandler<

Sources/GRPC/CallOptions.swift

@@ -15,7 +15,7 @@
  */
 import struct Foundation.UUID
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2

Sources/GRPC/ClientCalls/BidirectionalStreamingCall.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 

Sources/GRPC/ClientCalls/Call.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 import protocol SwiftProtobuf.Message

Sources/GRPC/ClientCalls/ClientCall.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Foundation
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2

Sources/GRPC/ClientCalls/ClientStreamingCall.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 

Sources/GRPC/ClientCalls/LazyEventLoopPromise.swift

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
 
 extension EventLoop {
   internal func makeLazyPromise<Value>(of: Value.Type = Value.self) -> LazyEventLoopPromise<Value> {

Sources/GRPC/ClientCalls/ResponseContainers.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHPACK
 
 /// A bucket of promises for a unary-response RPC.

Sources/GRPC/ClientCalls/ResponsePartContainer.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHPACK
 
 /// A container for RPC response parts.

Sources/GRPC/ClientCalls/ServerStreamingCall.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 

Sources/GRPC/ClientCalls/UnaryCall.swift

@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2

Sources/GRPC/ClientConnection.swift

@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOHTTP2
 import NIOSSL
 import NIOTLS

Sources/GRPC/Compression/Zlib.swift

@@ -15,7 +15,7 @@
  */
 import CGRPCZlib
 import struct Foundation.Data
-import NIO
+import NIOCore
 
 /// Provides minimally configurable wrappers around zlib's compression and decompression
 /// functionality.

Sources/GRPC/ConnectionKeepalive.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 /// Provides keepalive pings.
 ///

Sources/GRPC/ConnectionManager.swift

@@ -15,8 +15,8 @@
  */
 import Foundation
 import Logging
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
 import NIOHTTP2
 
 internal final class ConnectionManager {

Sources/GRPC/ConnectionManagerChannelProvider.swift

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 import NIOSSL
 import NIOTransportServices
 

Sources/GRPC/ConnectionPool/ConnectionPool+Waiter.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHTTP2
 
 extension ConnectionPool {

Sources/GRPC/ConnectionPool/ConnectionPool.swift

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 import Logging
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
 import NIOHTTP2
 
 internal final class ConnectionPool {

Sources/GRPC/ConnectionPool/PoolManager.swift

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 import Logging
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
 
 internal final class PoolManager {
   /// Configuration used for each connection pool.

Sources/GRPC/ConnectionPool/PoolManagerStateMachine+PerPoolState.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 extension PoolManagerStateMachine.ActiveState {
   internal struct PerPoolState {

Sources/GRPC/ConnectionPool/PoolManagerStateMachine.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 internal struct PoolManagerStateMachine {
   /// The current state.

Sources/GRPC/ConnectivityState.swift

@@ -15,8 +15,8 @@
  */
 import Foundation
 import Logging
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
 
 /// The connectivity state of a client connection. Note that this is heavily lifted from the gRPC
 /// documentation: https://github.com/grpc/grpc/blob/master/doc/connectivity-semantics-and-api.md.

Sources/GRPC/DelegatingErrorHandler.swift

@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOSSL
 
 /// A channel handler which allows caught errors to be passed to a `ClientErrorDelegate`. This

Sources/GRPC/FakeChannel.swift

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 import SwiftProtobuf
 
 /// A fake channel for use with generated test clients.

Sources/GRPC/GRPCChannel/EmbeddedGRPCChannel.swift

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHTTP2
 import SwiftProtobuf
 

Sources/GRPC/GRPCChannel/GRPCChannel.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHTTP2
 import NIOSSL
 import SwiftProtobuf

Sources/GRPC/GRPCChannel/GRPCChannelBuilder.swift

@@ -15,7 +15,7 @@
  */
 import Dispatch
 import Logging
-import NIO
+import NIOCore
 import NIOSSL
 
 #if canImport(Security)

Sources/GRPC/GRPCClient.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHTTP2
 import SwiftProtobuf
 

Sources/GRPC/GRPCClientChannelHandler.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2

Sources/GRPC/GRPCClientStateMachine.swift

@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import SwiftProtobuf

Sources/GRPC/GRPCIdleHandler.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHTTP2
 
 internal final class GRPCIdleHandler: ChannelInboundHandler {

Sources/GRPC/GRPCIdleHandlerStateMachine.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHTTP2
 
 /// Holds state for the 'GRPCIdleHandler', this isn't really just the idleness of the connection,

Sources/GRPC/GRPCKeepaliveHandlers.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHTTP2
 
 struct PingHandler {

Sources/GRPC/GRPCLogger.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 
 /// Wraps `Logger` to always provide the source as "GRPC".
 ///

Sources/GRPC/GRPCPayload.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 /// A data type which may be serialized into and out from a `ByteBuffer` in order to be sent between
 /// gRPC peers.

Sources/GRPC/GRPCServerPipelineConfigurator.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2

Sources/GRPC/GRPCServerRequestRoutingHandler.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2

Sources/GRPC/GRPCStatus.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Foundation
-import NIO
+import NIOCore
 import NIOHTTP1
 import NIOHTTP2
 

Sources/GRPC/GRPCTimeout.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Dispatch
-import NIO
+import NIOCore
 
 /// A timeout for a gRPC call.
 ///

Sources/GRPC/GRPCWebToHTTP2ServerCodec.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import struct Foundation.Data
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2

Sources/GRPC/HTTP2ToRawGRPCServerCodec.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 

Sources/GRPC/HTTP2ToRawGRPCStateMachine.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 

Sources/GRPC/Interceptor/ClientInterceptorContext.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 
 public struct ClientInterceptorContext<Request, Response> {
   /// The interceptor this context is for.

Sources/GRPC/Interceptor/ClientInterceptorPipeline.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 

Sources/GRPC/Interceptor/ClientInterceptorProtocol.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 internal protocol ClientInterceptorProtocol {
   associatedtype Request

Sources/GRPC/Interceptor/ClientInterceptors.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 /// A base class for client interceptors.
 ///

Sources/GRPC/Interceptor/ClientTransport.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 

Sources/GRPC/Interceptor/ClientTransportFactory.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHTTP2
 import protocol SwiftProtobuf.Message
 

Sources/GRPC/Interceptor/ServerInterceptorContext.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 
 public struct ServerInterceptorContext<Request, Response> {
   /// The interceptor this context is for.

Sources/GRPC/Interceptor/ServerInterceptorPipeline.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 
 @usableFromInline
 internal final class ServerInterceptorPipeline<Request, Response> {

Sources/GRPC/Interceptor/ServerInterceptors.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 /// A base class for server interceptors.
 ///

Sources/GRPC/LengthPrefixedMessageReader.swift

@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOHTTP1
 
 /// This class reads and decodes length-prefixed gRPC messages.

Sources/GRPC/LengthPrefixedMessageWriter.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Foundation
-import NIO
+import NIOCore
 
 internal struct LengthPrefixedMessageWriter {
   static let metadataLength = 5

Sources/GRPC/Logger.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 
 /// Keys for `Logger` metadata.
 enum MetadataKey {

Sources/GRPC/PlatformSupport.swift

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 import NIOSSL
 import NIOTransportServices
 

Sources/GRPC/ReadWriteStates.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import SwiftProtobuf
 
 /// Number of messages expected on a stream.

Sources/GRPC/Serialization.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOFoundationCompat
 import SwiftProtobuf
 

Sources/GRPC/Server.swift

@@ -15,10 +15,11 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOExtras
 import NIOHTTP1
 import NIOHTTP2
+import NIOPosix
 import NIOSSL
 import NIOTransportServices
 #if canImport(Network)

Sources/GRPC/ServerBuilder.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOSSL
 
 #if canImport(Network)

Sources/GRPC/ServerCallContexts/ServerCallContext.swift

@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import SwiftProtobuf

Sources/GRPC/ServerCallContexts/StreamingResponseCallContext.swift

@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import SwiftProtobuf

Sources/GRPC/ServerCallContexts/UnaryResponseCallContext.swift

@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import SwiftProtobuf

Sources/GRPC/ServerChannelErrorHandler.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 /// A handler that passes errors thrown into the server channel to the server error delegate.
 ///

Sources/GRPC/ServerErrorDelegate.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Foundation
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 

Sources/GRPC/TLSVerificationHandler.swift

@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOSSL
 import NIOTLS
 

Sources/GRPC/TimeLimit.swift

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Dispatch
-import NIO
+import NIOCore
 
 /// A time limit for an RPC.
 ///

Sources/GRPC/WebCORSHandler.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHTTP1
 
 /// Handler that manages the CORS protocol for requests incoming from the browser.

Sources/GRPC/WriteCapturingHandler.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 /// A handler which redirects all writes into a callback until the `.end` part is seen, after which
 /// all writes will be failed.

Sources/GRPC/_EmbeddedThroughput.swift

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 import SwiftProtobuf
 
 extension EmbeddedChannel {

Sources/GRPC/_FakeResponseStream.swift

@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHPACK
 
 public enum FakeRequestPart<Request> {

Sources/GRPC/_GRPCClientCodecHandler.swift

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 internal class GRPCClientCodecHandler<
   Serializer: MessageSerializer,

Tests/GRPCTests/BasicEchoTestCase.swift

@@ -19,7 +19,7 @@ import EchoModel
 import Foundation
 import GRPC
 import GRPCSampleData
-import NIO
+import NIOCore
 import NIOSSL
 import XCTest
 

Tests/GRPCTests/CallStartBehaviorTests.swift

@@ -15,7 +15,8 @@
  */
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 class CallStartBehaviorTests: GRPCTestCase {

Tests/GRPCTests/ClientCallTests.swift

@@ -16,7 +16,8 @@
 import EchoImplementation
 import EchoModel
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 class ClientCallTests: GRPCTestCase {

Tests/GRPCTests/ClientClosedChannelTests.swift

@@ -16,7 +16,7 @@
 import EchoModel
 import Foundation
 import GRPC
-import NIO
+import NIOCore
 import XCTest
 
 class ClientClosedChannelTests: EchoTestCaseBase {

Tests/GRPCTests/ClientConnectionBackoffTests.swift

@@ -17,8 +17,9 @@ import EchoImplementation
 import EchoModel
 import Foundation
 import GRPC
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
+import NIOPosix
 import XCTest
 
 class ClientConnectionBackoffTests: GRPCTestCase {

Tests/GRPCTests/ClientEventLoopPreferenceTests.swift

@@ -16,7 +16,8 @@
 import EchoImplementation
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 final class ClientEventLoopPreferenceTests: GRPCTestCase {

Tests/GRPCTests/ClientInterceptorPipelineTests.swift

@@ -15,7 +15,8 @@
  */
 @testable import GRPC
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHPACK
 import XCTest
 

Tests/GRPCTests/ClientTLSFailureTests.swift

@@ -18,8 +18,9 @@ import EchoModel
 @testable import GRPC
 import GRPCSampleData
 import Logging
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
+import NIOPosix
 import NIOSSL
 import XCTest
 

Tests/GRPCTests/ClientTLSTests.swift

@@ -18,7 +18,8 @@ import EchoModel
 import Foundation
 import GRPC
 import GRPCSampleData
-import NIO
+import NIOCore
+import NIOPosix
 import NIOSSL
 import XCTest
 

Tests/GRPCTests/ClientTimeoutTests.swift

@@ -16,7 +16,8 @@
 import EchoModel
 import Foundation
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOEmbedded
 import XCTest
 
 class ClientTimeoutTests: GRPCTestCase {

Tests/GRPCTests/ClientTransportTests.swift

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOEmbedded
 import XCTest
 
 class ClientTransportTests: GRPCTestCase {

Tests/GRPCTests/Codegen/Normalization/NormalizationProvider.swift

@@ -15,7 +15,7 @@
  */
 
 import GRPC
-import NIO
+import NIOCore
 import SwiftProtobuf
 
 final class NormalizationProvider: Normalization_NormalizationProvider {

Tests/GRPCTests/Codegen/Normalization/NormalizationTests.swift

@@ -15,7 +15,8 @@
  */
 
 import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 /// These tests validate that:

Tests/GRPCTests/CompressionTests.swift

@@ -16,8 +16,9 @@
 import EchoImplementation
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
 import NIOHPACK
+import NIOPosix
 import XCTest
 
 class MessageCompressionTests: GRPCTestCase {

Tests/GRPCTests/ConnectionFailingTests.swift

@@ -15,7 +15,8 @@
  */
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 class ConnectionFailingTests: GRPCTestCase {

Tests/GRPCTests/ConnectionManagerTests.swift

@@ -16,7 +16,8 @@
 import EchoModel
 @testable import GRPC
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHTTP2
 import XCTest
 

Tests/GRPCTests/ConnectionPool/ConnectionPoolTests.swift

@@ -15,7 +15,8 @@
  */
 @testable import GRPC
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHTTP2
 import XCTest
 

Tests/GRPCTests/ConnectionPool/PoolManagerStateMachineTests.swift

@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 @testable import GRPC
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
+import NIOEmbedded
 import XCTest
 
 class PoolManagerStateMachineTests: GRPCTestCase {

Tests/GRPCTests/DebugChannelInitializerTests.swift

@@ -16,8 +16,9 @@
 import EchoImplementation
 import EchoModel
 import GRPC
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
+import NIOPosix
 import XCTest
 
 class DebugChannelInitializerTests: GRPCTestCase {

Tests/GRPCTests/DelegatingErrorHandlerTests.swift

@@ -16,7 +16,8 @@
 import Foundation
 @testable import GRPC
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOSSL
 import XCTest
 

Tests/GRPCTests/EchoHelpers/Interceptors/DelegatingClientInterceptor.swift

@@ -15,7 +15,7 @@
  */
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
 import SwiftProtobuf
 
 /// A client interceptor which delegates the implementation of `send` and `receive` to callbacks.

Tests/GRPCTests/EchoHelpers/Providers/DelegatingOnCloseEchoProvider.swift

@@ -15,7 +15,7 @@
  */
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
 
 /// An `Echo_EchoProvider` which sets `onClose` for each RPC and then calls a delegate to provide
 /// the RPC implementation.

Tests/GRPCTests/EchoHelpers/Providers/FailingEchoProvider.swift

@@ -15,7 +15,7 @@
  */
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
 
 /// An `Echo_EchoProvider` which always returns failed future for each RPC.
 class FailingEchoProvider: Echo_EchoProvider {

Tests/GRPCTests/EchoHelpers/Providers/NeverResolvingEchoProvider.swift

@@ -15,7 +15,7 @@
  */
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
 
 /// An `Echo_EchoProvider` which returns a failed future for each RPC which resolves in the distant
 /// future.