Remove reliance on the NIO umbrella module (#60)

Package.swift

@@ -32,8 +32,11 @@ let package = Package(
         .target(
             name: "RediStack",
             dependencies: [
-                .product(name: "Atomics", package: "swift-atomics"),
+                .product(name: "NIOCore", package: "swift-nio"),
+                .product(name: "NIOPosix", package: "swift-nio"),
                 .product(name: "NIO", package: "swift-nio"),
+                .product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
+                .product(name: "Atomics", package: "swift-atomics"),
                 .product(name: "Logging", package: "swift-log"),
                 .product(name: "Metrics", package: "swift-metrics")
             ]
@@ -42,7 +45,8 @@ let package = Package(
         .target(
             name: "RediStackTestUtils",
             dependencies: [
-                .product(name: "NIO", package: "swift-nio"),
+                .product(name: "NIOCore", package: "swift-nio"),
+                .product(name: "NIOEmbedded", package: "swift-nio"),
                 "RediStack"
             ]
         ),

README.md

@@ -56,7 +56,7 @@ dependencies: [
 **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 = ...

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).

Sources/RediStack/ChannelHandlers/RedisCommandHandler.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 /// The `NIO.ChannelOutboundHandler.OutboundIn` type for `RedisCommandHandler`.
 ///

Sources/RediStack/ChannelHandlers/RedisMessageEncoder.swift

@@ -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

Sources/RediStack/ChannelHandlers/RedisPubSubHandler.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 /// A closure receiver of individual Pub/Sub messages from Redis subscriptions to channels and patterns.
 /// - Warning: The receiver is called on the same `NIO.EventLoop` that processed the message.

Sources/RediStack/Commands/BasicCommands.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 extension RedisClient {
     /// Echos the provided message through the Redis instance.

Sources/RediStack/Commands/HashCommands.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 // MARK: Static Helpers
 

Sources/RediStack/Commands/ListCommands.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 // MARK: General
 

Sources/RediStack/Commands/PubSubCommands.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 // MARK: Publish
 

Sources/RediStack/Commands/SetCommands.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 // MARK: General
 

Sources/RediStack/Commands/SortedSetCommands.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 // MARK: Static Helpers
 

Sources/RediStack/Commands/StringCommands.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 // MARK: Get
 

Sources/RediStack/Configuration.swift

@@ -14,7 +14,8 @@
 
 import Foundation
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 
 extension RedisConnection.Configuration {
     public struct ValidationError: LocalizedError, Equatable {

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.
 ///

Sources/RediStack/Extensions/SwiftNIO.swift

@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOPosix
 
 // MARK: Convenience extensions
 

Sources/RediStack/RESP/RESPTranslator.swift

@@ -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).
 ///

Sources/RediStack/RESP/RESPValue.swift

@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Foundation.Data
-import NIO
+import NIOCore
 
 /// A representation of a Redis Serialization Protocol (RESP) primitive value.
 ///
@@ -168,7 +168,7 @@ extension RESPValue: RESPValueConvertible {
 
 // MARK: EventLoopFuture Extensions
 
-import NIO
+import NIOCore
 
 extension EventLoopFuture where Value == RESPValue {
     /// Attempts to convert the resolved RESPValue to the desired type.

Sources/RediStack/RedisClient.swift

@@ -14,7 +14,7 @@
 
 import protocol Foundation.LocalizedError
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 // - Important: Any RedisClient defined by RediStack should conform to the RedisClientWithUserContext protocol as well
 

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 {
 

Sources/RediStack/RedisConnectionPool.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 import struct Foundation.UUID
-import NIO
+import NIOCore
 import NIOConcurrencyHelpers
 import Logging
 

Sources/RediStack/RedisKey+TTL.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 extension RedisKey.Lifetime {
     /// The lifetime duration for a `RedisKey` which has an expiry set.

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 {

Sources/RediStack/_Deprecations.swift

@@ -13,7 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 
 extension RedisConnection {
     /// The documented default port that Redis connects through.

Sources/RediStackTestUtils/EmbeddedMockRedisServer.swift

@@ -14,7 +14,8 @@
 
 import RediStack
 import XCTest
-import NIO
+import NIOCore
+import NIOEmbedded
 
 internal enum MockConnectionPoolError: Error {
     case unexpectedMessage

Sources/RediStackTestUtils/Extensions/General.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 private let allocator = ByteBufferAllocator()
 

Sources/RediStackTestUtils/Extensions/RediStack.swift

@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import NIO
+import NIOCore
 import RediStack
 
 extension RedisConnection.Configuration {

Sources/RediStackTestUtils/RedisConnectionPoolIntegrationTestCase.swift

@@ -12,9 +12,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 import RediStack
 import XCTest
+import NIOPosix
 
 /// A helper `XCTestCase` subclass that does the standard work of creating a connection pool to use in test cases.
 ///

Sources/RediStackTestUtils/RedisIntegrationTestCase.swift

@@ -12,8 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 import RediStack
+import NIOPosix
 import XCTest
 
 /// A helper `XCTestCase` subclass that does the standard work of creating a connection to use in test cases.

Sources/RediStackTestUtils/_Deprecations.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 import RediStack
 
 extension RedisConnection {

Sources/RedisTypes/RedisSet.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 import RediStack
 
 extension RedisClient {

Tests/RediStackIntegrationTests/Commands/PubSubCommandsTests.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 import RediStack
 import RediStackTestUtils
 import XCTest

Tests/RediStackIntegrationTests/Commands/SortedSetCommandsTests.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 @testable import RediStack
 import RediStackTestUtils
 import XCTest

Tests/RediStackIntegrationTests/RedisConnectionPoolTests.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 import Logging
 @testable import RediStack
 import RediStackTestUtils

Tests/RediStackTests/ChannelHandlers/RedisByteDecoderTests.swift

@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOTestUtils
 @testable import RediStack
 import XCTest

Tests/RediStackTests/ChannelHandlers/RedisMessageEncoderTests.swift

@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOEmbedded
 @testable import RediStack
 import RediStackTestUtils
 import XCTest

Tests/RediStackTests/ConfigurationTests.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 import RediStack
 import XCTest
 

Tests/RediStackTests/ConnectionPoolTests.swift

@@ -15,7 +15,8 @@
 @testable import RediStack
 @testable import RediStackTestUtils
 import XCTest
-import NIO
+import NIOCore
+import NIOEmbedded
 
 enum ConnectionPoolTestError: Error {
     case connectionFailedForSomeReason

Tests/RediStackTests/RESPTranslatorTests.swift

@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Foundation.Data
-import NIO
+import NIOCore
 @testable import RediStack
 import XCTest
 

Tests/RediStackTests/RedisConnectionTests.swift

@@ -13,7 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 @testable import RediStack
 import XCTest
 

scripts/soundness.sh

@@ -143,10 +143,10 @@ done
 rm "$tmp"
 
 # This checks for the umbrella NIO module.
-#printf "=> Checking for imports of umbrella NIO module... "
-#if git grep --color=never -i "^[ \t]*import \+NIO[ \t]*$" > /dev/null; then
-#    printf "\033[0;31mUmbrella imports found.\033[0m\n"
-#    git grep -i "^[ \t]*import \+NIO[ \t]*$"
-#    exit 1
-#fi
-#printf "\033[0;32mokay.\033[0m\n"
+printf "=> Checking for imports of umbrella NIO module... "
+if git grep --color=never -i "^[ \t]*import \+NIO[ \t]*$" > /dev/null; then
+    printf "\033[0;31mUmbrella imports found.\033[0m\n"
+    git grep -i "^[ \t]*import \+NIO[ \t]*$"
+    exit 1
+fi
+printf "\033[0;32mokay.\033[0m\n"