Clean up imports and dependencies. (#130)

Motivation: With NIO 2.32.0 we broke the core NIO module up into modules that split apart the POSIX layer and the core abstractions. As a result, this package no longer needs to express a hard dependency on the POSIX layer. Modifications: - Rewrote imports of NIO to NIOCore. - Added NIOEmbedded imports where necessary in tests. - Note that the main package still _depends_ on NIO, which is necessary for backwards-compatibility reasons. This dependency is unused. Result: No need to use NIOPosix.
2021-09-14 10:06:42 +01:00 · 2021-09-14 10:06:42 +01:00 · e7f5278a26
parent 9571a61d23
commit e7f5278a26
27 changed files with 66 additions and 53 deletions
--- a/Package.swift
+++ b/Package.swift
@ -28,6 +28,7 @@ let package = Package(
            name: "NIOTransportServices",
            dependencies: [
                .product(name: "NIO", package: "swift-nio"),
+                .product(name: "NIOCore", package: "swift-nio"),
                .product(name: "NIOFoundationCompat", package: "swift-nio"),
                .product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
                .product(name: "NIOTLS", package: "swift-nio"),
@ -36,21 +37,22 @@ let package = Package(
            name: "NIOTSHTTPClient",
            dependencies: [
                "NIOTransportServices",
-                .product(name: "NIO", package: "swift-nio"),
+                .product(name: "NIOCore", package: "swift-nio"),
                .product(name: "NIOHTTP1", package: "swift-nio"),
            ]),
        .target(
            name: "NIOTSHTTPServer",
            dependencies: [
                "NIOTransportServices",
-                .product(name: "NIO", package: "swift-nio"),
+                .product(name: "NIOCore", package: "swift-nio"),
                .product(name: "NIOHTTP1", package: "swift-nio"),
            ]),
        .testTarget(
            name: "NIOTransportServicesTests",
            dependencies: [
                "NIOTransportServices",
-                .product(name: "NIO", package: "swift-nio"),
+                .product(name: "NIOCore", package: "swift-nio"),
+                .product(name: "NIOEmbedded", package: "swift-nio"),
                .product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
            ]),
    ]
--- a/Sources/NIOTSHTTPClient/main.swift
+++ b/Sources/NIOTSHTTPClient/main.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//

 #if canImport(Network)
-import NIO
+import NIOCore
 import NIOTransportServices
 import NIOHTTP1
 import Network
--- a/Sources/NIOTSHTTPServer/main.swift
+++ b/Sources/NIOTSHTTPServer/main.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//

 #if canImport(Network)
-import NIO
+import NIOCore
 import NIOTransportServices
 import NIOHTTP1
 import Network
--- a/Sources/NIOTransportServices/NIOFilterEmptyWritesHandler.swift
+++ b/Sources/NIOTransportServices/NIOFilterEmptyWritesHandler.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2020 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2020-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//

-import NIO
+import NIOCore


 /// A `ChannelHandler` that checks for outbound writes of zero length, which are then dropped. This is
--- a/Sources/NIOTransportServices/NIOTSBootstraps.swift
+++ b/Sources/NIOTransportServices/NIOTSBootstraps.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2020 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2020-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//

 #if canImport(Network)
-import NIO
+import NIOCore

 /// Shared functionality across NIOTS bootstraps.
 internal enum NIOTSBootstraps {
--- a/Sources/NIOTransportServices/NIOTSChannelOptions.swift
+++ b/Sources/NIOTransportServices/NIOTSChannelOptions.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 #if canImport(Network)
-import NIO
+import NIOCore
 import Network

 /// Options that can be set explicitly and only on bootstraps provided by `NIOTransportServices`.
--- a/Sources/NIOTransportServices/NIOTSConnectionBootstrap.swift
+++ b/Sources/NIOTransportServices/NIOTSConnectionBootstrap.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2020 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//

 #if canImport(Network)
-import NIO
+import NIOCore
 import Dispatch
 import Network

--- a/Sources/NIOTransportServices/NIOTSConnectionChannel.swift
+++ b/Sources/NIOTransportServices/NIOTSConnectionChannel.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -14,7 +14,7 @@

 #if canImport(Network)
 import Foundation
-import NIO
+import NIOCore
 import NIOConcurrencyHelpers
 import NIOFoundationCompat
 import NIOTLS
--- a/Sources/NIOTransportServices/NIOTSErrors.swift
+++ b/Sources/NIOTransportServices/NIOTSErrors.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 #if canImport(Network)
-import NIO
+import NIOCore

 /// A tag protocol that can be used to cover all errors thrown by `NIOTransportServices`.
 ///
--- a/Sources/NIOTransportServices/NIOTSEventLoop.swift
+++ b/Sources/NIOTransportServices/NIOTSEventLoop.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -17,7 +17,7 @@ import Dispatch
 import Foundation
 import Network

-import NIO
+import NIOCore
 import NIOConcurrencyHelpers

 /// An `EventLoop` that interacts with `DispatchQoS` to help schedule upcoming work.
--- a/Sources/NIOTransportServices/NIOTSEventLoopGroup.swift
+++ b/Sources/NIOTransportServices/NIOTSEventLoopGroup.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -14,7 +14,7 @@

 #if canImport(Network)
 import Foundation
-import NIO
+import NIOCore
 import NIOConcurrencyHelpers
 import Dispatch
 import Network
--- a/Sources/NIOTransportServices/NIOTSListenerBootstrap.swift
+++ b/Sources/NIOTransportServices/NIOTSListenerBootstrap.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2020 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//

 #if canImport(Network)
-import NIO
+import NIOCore
 import Dispatch
 import Network

--- a/Sources/NIOTransportServices/NIOTSListenerChannel.swift
+++ b/Sources/NIOTransportServices/NIOTSListenerChannel.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -14,7 +14,7 @@

 #if canImport(Network)
 import Foundation
-import NIO
+import NIOCore
 import NIOFoundationCompat
 import NIOConcurrencyHelpers
 import Dispatch
--- a/Sources/NIOTransportServices/NIOTSNetworkEvents.swift
+++ b/Sources/NIOTransportServices/NIOTSNetworkEvents.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -14,7 +14,7 @@

 #if canImport(Network)
 import Network
-import NIO
+import NIOCore

 /// A tag protocol that can be used to cover all network events emitted by `NIOTS`.
 ///
--- a/Sources/NIOTransportServices/SocketAddress+NWEndpoint.swift
+++ b/Sources/NIOTransportServices/SocketAddress+NWEndpoint.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -15,7 +15,7 @@
 #if canImport(Network)
 import Darwin
 import Foundation
-import NIO
+import NIOCore
 import Network

@available(OSX 10.14, iOS 12.0, tvOS 12.0, watchOS 6.0, *)
--- a/Sources/NIOTransportServices/StateManagedChannel.swift
+++ b/Sources/NIOTransportServices/StateManagedChannel.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -14,7 +14,7 @@

 #if canImport(Network)
 import Foundation
-import NIO
+import NIOCore
 import NIOFoundationCompat
 import NIOConcurrencyHelpers
 import Dispatch
--- a/Sources/NIOTransportServices/TCPOptions+SocketChannelOption.swift
+++ b/Sources/NIOTransportServices/TCPOptions+SocketChannelOption.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -14,7 +14,7 @@

 #if canImport(Network)
 import Foundation
-import NIO
+import NIOCore
 import Network

@available(OSX 10.14, iOS 12.0, tvOS 12.0, watchOS 6.0, *)
--- a/Tests/NIOTransportServicesTests/NIOFilterEmptyWritesHandlerTests.swift
+++ b/Tests/NIOTransportServicesTests/NIOFilterEmptyWritesHandlerTests.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2020 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2020-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -14,7 +14,8 @@

 #if canImport(Network)
 import XCTest
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOTransportServices


--- a/Tests/NIOTransportServicesTests/NIOTSBootstrapTests.swift
+++ b/Tests/NIOTransportServicesTests/NIOTSBootstrapTests.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2019 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2019-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -15,7 +15,8 @@
 #if canImport(Network)
 import XCTest
 import Network
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOTransportServices
 import NIOConcurrencyHelpers
 import Foundation
--- a/Tests/NIOTransportServicesTests/NIOTSChannelOptionsTests.swift
+++ b/Tests/NIOTransportServicesTests/NIOTSChannelOptionsTests.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2020 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2020-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -14,7 +14,7 @@

 #if canImport(Network)
 import XCTest
-import NIO
+import NIOCore
 import NIOConcurrencyHelpers
 import NIOTransportServices
 import Network
--- a/Tests/NIOTransportServicesTests/NIOTSConnectionChannelTests.swift
+++ b/Tests/NIOTransportServicesTests/NIOTSConnectionChannelTests.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -15,7 +15,7 @@
 #if canImport(Network)
 import XCTest
 import Network
-import NIO
+import NIOCore
 import NIOTransportServices
 import Foundation

--- a/Tests/NIOTransportServicesTests/NIOTSEndToEndTests.swift
+++ b/Tests/NIOTransportServicesTests/NIOTSEndToEndTests.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -14,7 +14,7 @@

 #if canImport(Network)
 import XCTest
-import NIO
+import NIOCore
 import NIOTransportServices
 import Foundation
 import Network
--- a/Tests/NIOTransportServicesTests/NIOTSEventLoopTests.swift
+++ b/Tests/NIOTransportServicesTests/NIOTSEventLoopTests.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -14,7 +14,7 @@

 #if canImport(Network)
 import XCTest
-import NIO
+import NIOCore
 import NIOConcurrencyHelpers
 import NIOTransportServices

--- a/Tests/NIOTransportServicesTests/NIOTSListenerChannelTests.swift
+++ b/Tests/NIOTransportServicesTests/NIOTSListenerChannelTests.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -15,7 +15,7 @@
 #if canImport(Network)
 import XCTest
 import Network
-import NIO
+import NIOCore
 import NIOTransportServices


--- a/Tests/NIOTransportServicesTests/NIOTSSocketOptionTests.swift
+++ b/Tests/NIOTransportServicesTests/NIOTSSocketOptionTests.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -14,7 +14,7 @@

 #if canImport(Network)
 import XCTest
-import NIO
+import NIOCore
 import Network
@testable import NIOTransportServices

--- a/Tests/NIOTransportServicesTests/NIOTSSocketOptionsOnChannelTests.swift
+++ b/Tests/NIOTransportServicesTests/NIOTSSocketOptionsOnChannelTests.swift
@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftNIO open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
+// Copyright (c) 2017-2021 Apple Inc. and the SwiftNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@ -14,7 +14,7 @@

 #if canImport(Network)
 import XCTest
-import NIO
+import NIOCore
 import Network
@testable import NIOTransportServices

--- a/scripts/soundness.sh
+++ b/scripts/soundness.sh
@ -21,6 +21,15 @@ function replace_acceptable_years() {
    sed -e 's/20[12][78901]-20[12][8901]/YEARS/' -e 's/20[12][8901]/YEARS/'
 }

+# 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 license headers... "
 tmp=$(mktemp /tmp/.swift-nio-sanity_XXXXXX)