Skip to content

Commit eab2a84

Browse files
fabianfettfabianfett
authored
Use explicit NIO imports (#407)
* Use explicit NIO imports for `NIOCore`, `NIOPosix` and `NIOEmbedded` * Updated dependencies
1 parent 2fcdb5e commit eab2a84

File tree

56 files changed

+96
-66
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+96
-66
lines changed

Diff for: ‎Package.swift

+14-11
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ let package = Package(
2121
.library(name: "AsyncHTTPClient", targets: ["AsyncHTTPClient"]),
2222
],
2323
dependencies: [
24-
.package(url: "https://github.com/apple/swift-nio.git", from: "2.30.0"),
25-
.package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.14.0"),
26-
.package(url: "https://github.com/apple/swift-nio-http2.git", from: "1.18.0"),
24+
.package(url: "https://github.com/apple/swift-nio.git", from: "2.32.0"),
25+
.package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.14.1"),
26+
.package(url: "https://github.com/apple/swift-nio-http2.git", from: "1.18.2"),
2727
.package(url: "https://github.com/apple/swift-nio-extras.git", from: "1.10.0"),
2828
.package(url: "https://github.com/apple/swift-nio-transport-services.git", from: "1.11.0"),
2929
.package(url: "https://github.com/apple/swift-log.git", from: "1.4.0"),
@@ -33,29 +33,32 @@ let package = Package(
3333
name: "AsyncHTTPClient",
3434
dependencies: [
3535
.product(name: "NIO", package: "swift-nio"),
36+
.product(name: "NIOCore", package: "swift-nio"),
37+
.product(name: "NIOPosix", package: "swift-nio"),
3638
.product(name: "NIOHTTP1", package: "swift-nio"),
39+
.product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
40+
.product(name: "NIOFoundationCompat", package: "swift-nio"),
3741
.product(name: "NIOHTTP2", package: "swift-nio-http2"),
3842
.product(name: "NIOSSL", package: "swift-nio-ssl"),
39-
.product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
4043
.product(name: "NIOHTTPCompression", package: "swift-nio-extras"),
41-
.product(name: "NIOFoundationCompat", package: "swift-nio"),
44+
.product(name: "NIOSOCKS", package: "swift-nio-extras"),
4245
.product(name: "NIOTransportServices", package: "swift-nio-transport-services"),
4346
.product(name: "Logging", package: "swift-log"),
44-
.product(name: "NIOSOCKS", package: "swift-nio-extras"),
4547
]
4648
),
4749
.testTarget(
4850
name: "AsyncHTTPClientTests",
4951
dependencies: [
50-
.product(name: "NIO", package: "swift-nio"),
52+
.target(name: "AsyncHTTPClient"),
53+
.product(name: "NIOCore", package: "swift-nio"),
5154
.product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
52-
.product(name: "NIOSSL", package: "swift-nio-ssl"),
53-
.product(name: "NIOHTTP2", package: "swift-nio-http2"),
54-
"AsyncHTTPClient",
55+
.product(name: "NIOEmbedded", package: "swift-nio"),
5556
.product(name: "NIOFoundationCompat", package: "swift-nio"),
5657
.product(name: "NIOTestUtils", package: "swift-nio"),
57-
.product(name: "Logging", package: "swift-log"),
58+
.product(name: "NIOSSL", package: "swift-nio-ssl"),
59+
.product(name: "NIOHTTP2", package: "swift-nio-http2"),
5860
.product(name: "NIOSOCKS", package: "swift-nio-extras"),
61+
.product(name: "Logging", package: "swift-log"),
5962
]
6063
),
6164
]

Diff for: ‎Sources/AsyncHTTPClient/Connection.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
import Foundation
1616
import Logging
17-
import NIO
1817
import NIOConcurrencyHelpers
18+
import NIOCore
1919
import NIOHTTP1
2020
import NIOHTTPCompression
2121
import NIOTLS

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
import Foundation
1616
import Logging
17-
import NIO
1817
import NIOConcurrencyHelpers
18+
import NIOCore
1919
import NIOHTTP1
2020
import NIOSSL
2121
import NIOTLS

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool/ChannelHandler/HTTP1ProxyConnectHandler.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616
import NIOHTTP1
1717

1818
final class HTTP1ProxyConnectHandler: ChannelDuplexHandler, RemovableChannelHandler {

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool/ChannelHandler/SOCKSEventsHandler.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616
import NIOSOCKS
1717

1818
final class SOCKSEventsHandler: ChannelInboundHandler, RemovableChannelHandler {

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool/ChannelHandler/TLSEventsHandler.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616
import NIOTLS
1717

1818
final class TLSEventsHandler: ChannelInboundHandler, RemovableChannelHandler {

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool/HTTP1.1/HTTP1ClientChannelHandler.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import Logging
16-
import NIO
16+
import NIOCore
1717
import NIOHTTP1
1818

1919
final class HTTP1ClientChannelHandler: ChannelDuplexHandler {

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool/HTTP1.1/HTTP1Connection.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import Logging
16-
import NIO
16+
import NIOCore
1717
import NIOHTTP1
1818
import NIOHTTPCompression
1919

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool/HTTP1.1/HTTP1ConnectionStateMachine.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616
import NIOHTTP1
1717

1818
struct HTTP1ConnectionStateMachine {

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool/HTTP2/HTTP2ClientRequestHandler.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import Logging
16-
import NIO
16+
import NIOCore
1717
import NIOHTTP1
1818
import NIOHTTP2
1919

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool/HTTP2/HTTP2Connection.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import Logging
16-
import NIO
16+
import NIOCore
1717
import NIOHTTP2
1818

1919
protocol HTTP2ConnectionDelegate {

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool/HTTP2/HTTP2IdleHandler.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import Logging
16-
import NIO
16+
import NIOCore
1717
import NIOHTTP2
1818

1919
protocol HTTP2IdleHandlerDelegate {

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool/HTTPConnectionPool+Factory.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import Logging
16-
import NIO
16+
import NIOCore
1717
import NIOHTTP1
1818
import NIOHTTPCompression
19+
import NIOPosix
1920
import NIOSOCKS
2021
import NIOSSL
2122
import NIOTLS

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool/HTTPConnectionPool+Waiter.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616

1717
extension HTTPConnectionPool {
1818
struct RequestID: Hashable {

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool/HTTPConnectionPool.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616

1717
enum HTTPConnectionPool {
1818
struct Connection: Hashable {

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool/HTTPExecutableRequest.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import Logging
16-
import NIO
16+
import NIOCore
1717
import NIOHTTP1
1818

1919
/// # Protocol Overview

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool/HTTPRequestStateMachine+Demand.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616

1717
extension HTTPRequestStateMachine {
1818
/// A sub state for receiving a response events. Stores whether the consumer has either signaled demand and whether the

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool/HTTPRequestStateMachine.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616
import NIOHTTP1
1717

1818
struct HTTPRequestStateMachine {

Diff for: ‎Sources/AsyncHTTPClient/ConnectionsState.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616

1717
extension HTTP1ConnectionProvider {
1818
enum Action<ConnectionType: PoolManageableConnection> {

Diff for: ‎Sources/AsyncHTTPClient/FileDownloadDelegate.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616
import NIOHTTP1
17+
import NIOPosix
1718

1819
/// Handles a streaming download to a given file path, allowing headers and progress to be reported.
1920
public final class FileDownloadDelegate: HTTPClientResponseDelegate {

Diff for: ‎Sources/AsyncHTTPClient/HTTPClient+Proxy.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616
import NIOHTTP1
1717

1818
extension HTTPClient.Configuration {

Diff for: ‎Sources/AsyncHTTPClient/HTTPClient.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414

1515
import Foundation
1616
import Logging
17-
import NIO
1817
import NIOConcurrencyHelpers
18+
import NIOCore
1919
import NIOHTTP1
2020
import NIOHTTPCompression
21+
import NIOPosix
2122
import NIOSOCKS
2223
import NIOSSL
2324
import NIOTLS

Diff for: ‎Sources/AsyncHTTPClient/HTTPHandler.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
import Foundation
1616
import Logging
17-
import NIO
1817
import NIOConcurrencyHelpers
18+
import NIOCore
1919
import NIOFoundationCompat
2020
import NIOHTTP1
2121
import NIOHTTPCompression

Diff for: ‎Sources/AsyncHTTPClient/NIOTransportServices/NWErrorHandler.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#if canImport(Network)
1616
import Network
1717
#endif
18-
import NIO
18+
import NIOCore
1919
import NIOHTTP1
2020
import NIOTransportServices
2121

Diff for: ‎Sources/AsyncHTTPClient/NIOTransportServices/TLSConfiguration.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import Foundation
1818
import Network
19-
import NIO
19+
import NIOCore
2020
import NIOSSL
2121
import NIOTransportServices
2222

Diff for: ‎Sources/AsyncHTTPClient/RequestBag+StateMachine.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import struct Foundation.URL
16-
import NIO
16+
import NIOCore
1717
import NIOHTTP1
1818

1919
extension RequestBag {

Diff for: ‎Sources/AsyncHTTPClient/RequestBag.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
import struct Foundation.URL
1616
import Logging
17-
import NIO
1817
import NIOConcurrencyHelpers
18+
import NIOCore
1919
import NIOHTTP1
2020

2121
final class RequestBag<Delegate: HTTPClientResponseDelegate> {

Diff for: ‎Sources/AsyncHTTPClient/RequestValidation.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616
import NIOHTTP1
1717

1818
extension HTTPHeaders {

Diff for: ‎Sources/AsyncHTTPClient/ResponseReadBuffer.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616
import NIOHTTP1
1717

1818
struct ResponseReadBuffer {

Diff for: ‎Sources/AsyncHTTPClient/SSLContextCache.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
import Dispatch
1616
import Logging
17-
import NIO
1817
import NIOConcurrencyHelpers
18+
import NIOCore
1919
import NIOSSL
2020

2121
class SSLContextCache {

Diff for: ‎Sources/AsyncHTTPClient/Utils.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import Foundation
1717
import Network
1818
#endif
1919
import Logging
20-
import NIO
20+
import NIOCore
2121
import NIOHTTP1
2222
import NIOHTTPCompression
2323
import NIOSSL

Diff for: ‎Tests/AsyncHTTPClientTests/ConnectionPoolTests.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
@testable import AsyncHTTPClient
16-
@testable import NIO
1716
import NIOConcurrencyHelpers
17+
import NIOCore
18+
import NIOEmbedded
1819
import NIOFoundationCompat
1920
import NIOHTTP1
2021
import NIOHTTPCompression

Diff for: ‎Tests/AsyncHTTPClientTests/ConnectionPoolTestsSupport.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
@testable import AsyncHTTPClient
16-
import NIO
16+
import NIOCore
1717
import XCTest
1818

1919
class ConnectionForTests: PoolManageableConnection {

Diff for: ‎Tests/AsyncHTTPClientTests/ConnectionTests.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
@testable import AsyncHTTPClient
16-
import NIO
16+
import NIOCore
17+
import NIOEmbedded
1718
import XCTest
1819

1920
class ConnectionTests: XCTestCase {

Diff for: ‎Tests/AsyncHTTPClientTests/EmbeddedChannel+HTTPConvenience.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414

1515
@testable import AsyncHTTPClient
1616
import Logging
17-
import NIO
17+
import NIOCore
18+
import NIOEmbedded
1819
import NIOHTTP1
1920
import NIOHTTP2
2021

Diff for: ‎Tests/AsyncHTTPClientTests/HTTP1ClientChannelHandlerTests.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414

1515
@testable import AsyncHTTPClient
1616
import Logging
17-
import NIO
17+
import NIOCore
18+
import NIOEmbedded
1819
import NIOHTTP1
1920
import XCTest
2021

Diff for: ‎Tests/AsyncHTTPClientTests/HTTP1ConnectionStateMachineTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
@testable import AsyncHTTPClient
16-
import NIO
16+
import NIOCore
1717
import NIOHTTP1
1818
import XCTest
1919

0 commit comments

Comments
 (0)