Explicitly depend on NIO modules

fabianfett · fabianfett · commit c366a16fe853 · 2022-12-01T13:46:41.000+01:00
diff --git a/Package.swift b/Package.swift
@@ -34,7 +34,8 @@ let package = Package(
             name: "RediStack",
             dependencies: [
                 .product(name: "Atomics", package: "swift-atomics"),
-                .product(name: "NIO", package: "swift-nio"),
+                .product(name: "NIOCore", package: "swift-nio"),
+                .product(name: "NIOPosix", package: "swift-nio"),
                 .product(name: "Logging", package: "swift-log"),
                 .product(name: "Metrics", package: "swift-metrics"),
                 .product(name: "ServiceDiscovery", package: "swift-service-discovery")
@@ -44,7 +45,9 @@ let package = Package(
             name: "RediStackTests",
             dependencies: [
                 "RediStack", "RediStackTestUtils",
-                .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: "NIOTestUtils", package: "swift-nio")
             ]
         ),
@@ -54,14 +57,16 @@ let package = Package(
             name: "RedisTypesTests",
             dependencies: [
                 "RediStack", "RedisTypes", "RediStackTestUtils",
-                .product(name: "NIO", package: "swift-nio")
+                .product(name: "NIOCore", package: "swift-nio")
             ]
         ),
 
         .target(
             name: "RediStackTestUtils",
             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"),
                 "RediStack"
             ]
         ),
diff --git a/Sources/RediStack/ChannelHandlers/RedisByteDecoder.swift b/Sources/RediStack/ChannelHandlers/RedisByteDecoder.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 /// Handles incoming byte messages from Redis
 /// and decodes them according to the Redis Serialization Protocol (RESP).
diff --git a/Sources/RediStack/ChannelHandlers/RedisCommandHandler.swift b/Sources/RediStack/ChannelHandlers/RedisCommandHandler.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019-2020 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 /// An object that operates in a First In, First Out (FIFO) request-response cycle.
 ///
diff --git a/Sources/RediStack/ChannelHandlers/RedisMessageEncoder.swift b/Sources/RediStack/ChannelHandlers/RedisMessageEncoder.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 #if DEBUG
 // used only for debugging purposes where we build a formatted string for the encoded bytes
diff --git a/Sources/RediStack/ChannelHandlers/RedisPubSubHandler.swift b/Sources/RediStack/ChannelHandlers/RedisPubSubHandler.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 /// The possible events that are received from Redis Pub/Sub channels.
 public enum RedisPubSubEvent {
diff --git a/Sources/RediStack/Commands/ConnectionCommands.swift b/Sources/RediStack/Commands/ConnectionCommands.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 // MARK: Connection
 
diff --git a/Sources/RediStack/Commands/HashCommands.swift b/Sources/RediStack/Commands/HashCommands.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 // MARK: Hashes
 
diff --git a/Sources/RediStack/Commands/KeyCommands.swift b/Sources/RediStack/Commands/KeyCommands.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 // MARK: Key
 
diff --git a/Sources/RediStack/Commands/ListCommands.swift b/Sources/RediStack/Commands/ListCommands.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 // MARK: Lists
 
diff --git a/Sources/RediStack/Commands/PubSubCommands.swift b/Sources/RediStack/Commands/PubSubCommands.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 // MARK: PubSub
 
diff --git a/Sources/RediStack/Commands/ServerCommands.swift b/Sources/RediStack/Commands/ServerCommands.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 // MARK: Server
 
diff --git a/Sources/RediStack/Commands/SetCommands.swift b/Sources/RediStack/Commands/SetCommands.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 // MARK: Sets
 
diff --git a/Sources/RediStack/Commands/SortedSetCommands.swift b/Sources/RediStack/Commands/SortedSetCommands.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 // MARK: Sorted Sets
 
diff --git a/Sources/RediStack/Commands/StringCommands.swift b/Sources/RediStack/Commands/StringCommands.swift
@@ -14,7 +14,7 @@
 
 import struct Logging.Logger
 import Foundation
-import NIO
+import NIOCore
 
 // MARK: Strings
 
diff --git a/Sources/RediStack/ConnectionPool/ConnectionPool.swift b/Sources/RediStack/ConnectionPool/ConnectionPool.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Logging
-import NIO
+import NIOCore
 
 /// `ConnectionPool` is RediStack's internal representation of a pool of Redis connections.
 ///
diff --git a/Sources/RediStack/Documentation.docc/RediStack.md b/Sources/RediStack/Documentation.docc/RediStack.md
@@ -7,7 +7,7 @@ A non-blocking Swift client for Redis built on top of SwiftNIO.
 **RediStack** is quick to use - all you need is an [`EventLoop`](https://apple.github.io/swift-nio/docs/current/NIO/Protocols/EventLoop.html) from **SwiftNIO**.
 
 ```swift
-import NIO
+import NIOCore
 import RediStack
 
 let eventLoop: EventLoop = ...
diff --git a/Sources/RediStack/Extensions/SwiftNIO.swift b/Sources/RediStack/Extensions/SwiftNIO.swift
@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOPosix
 
 // MARK: Convenience extensions
 
diff --git a/Sources/RediStack/RESP/RESPTranslator.swift b/Sources/RediStack/RESP/RESPTranslator.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import protocol Foundation.LocalizedError
-import NIO
+import NIOCore
 
 /// A helper object for translating between raw bytes and Swift types according to the Redis Serialization Protocol (RESP).
 ///
diff --git a/Sources/RediStack/RESP/RESPValue.swift b/Sources/RediStack/RESP/RESPValue.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019-2020 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Foundation.Data
-import NIO
+import NIOCore
 
 /// A representation of a Redis Serialization Protocol (RESP) primitive value.
 ///
diff --git a/Sources/RediStack/RedisClient.swift b/Sources/RediStack/RedisClient.swift
@@ -14,7 +14,7 @@
 
 import protocol Foundation.LocalizedError
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 /// An object capable of sending commands and receiving responses.
 ///
diff --git a/Sources/RediStack/RedisConnection+Configuration.swift b/Sources/RediStack/RedisConnection+Configuration.swift
@@ -14,7 +14,7 @@
 
 import Foundation
 import Logging
-import NIO
+import NIOCore
 
 extension RedisConnection.Configuration {
     public struct ValidationError: LocalizedError, Equatable {
diff --git a/Sources/RediStack/RedisConnection.swift b/Sources/RediStack/RedisConnection.swift
@@ -17,8 +17,9 @@ import struct Dispatch.DispatchTime
 import Atomics
 import Logging
 import Metrics
-import NIO
+import NIOCore
 import NIOConcurrencyHelpers
+import NIOPosix
 
 extension RedisConnection {
     
diff --git a/Sources/RediStack/RedisConnectionPool+Configuration.swift b/Sources/RediStack/RedisConnectionPool+Configuration.swift
@@ -13,7 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 
 // MARK: - Pool Connection Congfiguration
 
diff --git a/Sources/RediStack/RedisConnectionPool.swift b/Sources/RediStack/RedisConnectionPool.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 import struct Foundation.UUID
-import NIO
+import NIOCore
 import NIOConcurrencyHelpers
 import Logging
 import ServiceDiscovery
diff --git a/Sources/RediStack/RedisKey+TTL.swift b/Sources/RediStack/RedisKey+TTL.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2020 RediStack project authors
+// Copyright (c) 2020-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 extension RedisKey.Lifetime {
     /// The lifetime duration for a `RedisKey` which has an expiry set.
diff --git a/Sources/RediStack/RedisLogging.swift b/Sources/RediStack/RedisLogging.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Logging
-import NIO
+import NIOCore
 
 /// The system funnel for all `Logging` static details such as labels, `Logging.Logger` prototypes, and metadata keys used by RediStack.
 public enum RedisLogging {
diff --git a/Sources/RediStackTestUtils/EmbeddedMockRedisServer.swift b/Sources/RediStackTestUtils/EmbeddedMockRedisServer.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2020 RediStack project authors
+// Copyright (c) 2020-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -14,7 +14,8 @@
 
 import RediStack
 import XCTest
-import NIO
+import NIOCore
+import NIOEmbedded
 
 internal enum MockConnectionPoolError: Error {
     case unexpectedMessage
diff --git a/Sources/RediStackTestUtils/Extensions/General.swift b/Sources/RediStackTestUtils/Extensions/General.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 private let allocator = ByteBufferAllocator()
 
diff --git a/Sources/RediStackTestUtils/Extensions/RediStack.swift b/Sources/RediStackTestUtils/Extensions/RediStack.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019-2020 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import NIO
+import NIOCore
 import RediStack
 
 extension RedisConnection.Configuration {
diff --git a/Sources/RediStackTestUtils/RedisConnectionPoolIntegrationTestCase.swift b/Sources/RediStackTestUtils/RedisConnectionPoolIntegrationTestCase.swift
@@ -13,7 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 import RediStack
 import XCTest
 
diff --git a/Sources/RediStackTestUtils/RedisIntegrationTestCase.swift b/Sources/RediStackTestUtils/RedisIntegrationTestCase.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019-2020 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOPosix
 import RediStack
 import XCTest
 
diff --git a/Sources/RedisTypes/RedisSet.swift b/Sources/RedisTypes/RedisSet.swift
diff --git a/Tests/RediStackIntegrationTests/Commands/PubSubCommandsTests.swift b/Tests/RediStackIntegrationTests/Commands/PubSubCommandsTests.swift
diff --git a/Tests/RediStackIntegrationTests/Commands/SortedSetCommandsTests.swift b/Tests/RediStackIntegrationTests/Commands/SortedSetCommandsTests.swift
diff --git a/Tests/RediStackIntegrationTests/RedisConnectionPoolTests.swift b/Tests/RediStackIntegrationTests/RedisConnectionPoolTests.swift
diff --git a/Tests/RediStackIntegrationTests/RedisConnectionTests.swift b/Tests/RediStackIntegrationTests/RedisConnectionTests.swift
diff --git a/Tests/RediStackIntegrationTests/RedisLoggingTests.swift b/Tests/RediStackIntegrationTests/RedisLoggingTests.swift
diff --git a/Tests/RediStackIntegrationTests/RedisServiceDiscoveryTests.swift b/Tests/RediStackIntegrationTests/RedisServiceDiscoveryTests.swift
diff --git a/Tests/RediStackTests/ChannelHandlers/RedisByteDecoderTests.swift b/Tests/RediStackTests/ChannelHandlers/RedisByteDecoderTests.swift
diff --git a/Tests/RediStackTests/ChannelHandlers/RedisCommandHandlerTests.swift b/Tests/RediStackTests/ChannelHandlers/RedisCommandHandlerTests.swift
diff --git a/Tests/RediStackTests/ChannelHandlers/RedisMessageEncoderTests.swift b/Tests/RediStackTests/ChannelHandlers/RedisMessageEncoderTests.swift
diff --git a/Tests/RediStackTests/ConfigurationTests.swift b/Tests/RediStackTests/ConfigurationTests.swift
diff --git a/Tests/RediStackTests/ConnectionPoolTests.swift b/Tests/RediStackTests/ConnectionPoolTests.swift
diff --git a/Tests/RediStackTests/RESPTranslatorTests.swift b/Tests/RediStackTests/RESPTranslatorTests.swift
diff --git a/Tests/RediStackTests/RedisConnectionTests.swift b/Tests/RediStackTests/RedisConnectionTests.swift
