diff --git a/Package.swift b/Package.swift
index 66b31cbaa..ed067c75b 100644
--- a/Package.swift
+++ b/Package.swift
@@ -3,7 +3,7 @@
//
// This source file is part of the AsyncHTTPClient open source project
//
-// Copyright (c) 2018-2019 Apple Inc. and the AsyncHTTPClient project authors
+// Copyright (c) 2018-2022 Apple Inc. and the AsyncHTTPClient project authors
// Licensed under Apache License v2.0
//
// See LICENSE.txt for license information
@@ -39,7 +39,6 @@ let package = Package(
.product(name: "NIOPosix", package: "swift-nio"),
.product(name: "NIOHTTP1", package: "swift-nio"),
.product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
- .product(name: "NIOFoundationCompat", package: "swift-nio"),
.product(name: "NIOHTTP2", package: "swift-nio-http2"),
.product(name: "NIOSSL", package: "swift-nio-ssl"),
.product(name: "NIOHTTPCompression", package: "swift-nio-extras"),
diff --git a/Package@swift-5.3.swift b/Package@swift-5.3.swift
new file mode 100644
index 000000000..2e5ec5875
--- /dev/null
+++ b/Package@swift-5.3.swift
@@ -0,0 +1,73 @@
+// swift-tools-version:5.3
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the AsyncHTTPClient open source project
+//
+// Copyright (c) 2018-2022 Apple Inc. and the AsyncHTTPClient project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of AsyncHTTPClient project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+import PackageDescription
+
+let package = Package(
+ name: "async-http-client",
+ products: [
+ .library(name: "AsyncHTTPClient", targets: ["AsyncHTTPClient"]),
+ ],
+ dependencies: [
+ .package(url: "https://github.com/apple/swift-nio.git", from: "2.36.0"),
+ .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.14.1"),
+ .package(url: "https://github.com/apple/swift-nio-http2.git", from: "1.19.0"),
+ .package(url: "https://github.com/apple/swift-nio-extras.git", from: "1.10.0"),
+ .package(url: "https://github.com/apple/swift-nio-transport-services.git", from: "1.11.4"),
+ .package(url: "https://github.com/apple/swift-log.git", from: "1.4.0"),
+ ],
+ targets: [
+ .target(name: "CAsyncHTTPClient"),
+ .target(
+ name: "AsyncHTTPClient",
+ dependencies: [
+ .target(name: "CAsyncHTTPClient"),
+ .product(name: "NIO", package: "swift-nio"),
+ .product(name: "NIOCore", package: "swift-nio"),
+ .product(name: "NIOPosix", package: "swift-nio"),
+ .product(name: "NIOHTTP1", package: "swift-nio"),
+ .product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
+ .product(name: "NIOHTTP2", package: "swift-nio-http2"),
+ .product(name: "NIOSSL", package: "swift-nio-ssl"),
+ .product(name: "NIOHTTPCompression", package: "swift-nio-extras"),
+ .product(name: "NIOSOCKS", package: "swift-nio-extras"),
+ .product(name: "NIOTransportServices", package: "swift-nio-transport-services",
+ condition: .when(platforms: [.macOS, .macCatalyst, .iOS, .tvOS, .watchOS])),
+ .product(name: "Logging", package: "swift-log"),
+ ]
+ ),
+ .testTarget(
+ name: "AsyncHTTPClientTests",
+ dependencies: [
+ .target(name: "AsyncHTTPClient"),
+ .product(name: "NIOCore", package: "swift-nio"),
+ .product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
+ .product(name: "NIOEmbedded", package: "swift-nio"),
+ .product(name: "NIOFoundationCompat", package: "swift-nio"),
+ .product(name: "NIOTestUtils", package: "swift-nio"),
+ .product(name: "NIOSSL", package: "swift-nio-ssl"),
+ .product(name: "NIOHTTP2", package: "swift-nio-http2"),
+ .product(name: "NIOSOCKS", package: "swift-nio-extras"),
+ .product(name: "Logging", package: "swift-log"),
+ ]
+ ),
+ ]
+)
+
+#if swift(<5.5)
+extension Platform {
+ static var macCatalyst: Platform { .macOS }
+}
+#endif
diff --git a/Sources/AsyncHTTPClient/HTTPClient.swift b/Sources/AsyncHTTPClient/HTTPClient.swift
index 9301094ef..38d156e12 100644
--- a/Sources/AsyncHTTPClient/HTTPClient.swift
+++ b/Sources/AsyncHTTPClient/HTTPClient.swift
@@ -21,7 +21,9 @@ import NIOHTTPCompression
import NIOPosix
import NIOSSL
import NIOTLS
+#if canImport(Network)
import NIOTransportServices
+#endif
extension Logger {
private func requestInfo(_ request: HTTPClient.Request) -> Logger.Metadata.Value {
diff --git a/Sources/AsyncHTTPClient/NIOTransportServices/NWErrorHandler.swift b/Sources/AsyncHTTPClient/NIOTransportServices/NWErrorHandler.swift
index 4334bb9f9..d381f8b2c 100644
--- a/Sources/AsyncHTTPClient/NIOTransportServices/NWErrorHandler.swift
+++ b/Sources/AsyncHTTPClient/NIOTransportServices/NWErrorHandler.swift
@@ -17,7 +17,6 @@ import Network
#endif
import NIOCore
import NIOHTTP1
-import NIOTransportServices
extension HTTPClient {
#if canImport(Network)
diff --git a/Tests/AsyncHTTPClientTests/HTTPClientNIOTSTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientNIOTSTests.swift
index 172ee89ba..144aeeb96 100644
--- a/Tests/AsyncHTTPClientTests/HTTPClientNIOTSTests.swift
+++ b/Tests/AsyncHTTPClientTests/HTTPClientNIOTSTests.swift
@@ -15,11 +15,11 @@
@testable import AsyncHTTPClient
#if canImport(Network)
import Network
+import NIOTransportServices
#endif
import NIOCore
import NIOPosix
import NIOSSL
-import NIOTransportServices
import XCTest
class HTTPClientNIOTSTests: XCTestCase {
diff --git a/Tests/AsyncHTTPClientTests/HTTPClientTestUtils.swift b/Tests/AsyncHTTPClientTests/HTTPClientTestUtils.swift
index 230c91a2b..0ee54ac2c 100644
--- a/Tests/AsyncHTTPClientTests/HTTPClientTestUtils.swift
+++ b/Tests/AsyncHTTPClientTests/HTTPClientTestUtils.swift
@@ -25,8 +25,10 @@ import NIOHTTPCompression
import NIOPosix
import NIOSSL
import NIOTLS
-import NIOTransportServices
import XCTest
+#if canImport(Network)
+import NIOTransportServices
+#endif
#if canImport(Darwin)
import Darwin
#elseif canImport(Glibc)
diff --git a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift
index 6bb4dd9b4..997d1699a 100644
--- a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift
+++ b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift
@@ -15,6 +15,7 @@
/* NOT @testable */ import AsyncHTTPClient // Tests that need @testable go into HTTPClientInternalTests.swift
#if canImport(Network)
import Network
+import NIOTransportServices
#endif
import Logging
import NIOConcurrencyHelpers
@@ -25,7 +26,6 @@ import NIOHTTPCompression
import NIOPosix
import NIOSSL
import NIOTestUtils
-import NIOTransportServices
import XCTest
class HTTPClientTests: XCTestCase {
diff --git a/scripts/soundness.sh b/scripts/soundness.sh
index 6cf525618..b987ad2c3 100755
--- a/scripts/soundness.sh
+++ b/scripts/soundness.sh
@@ -72,7 +72,7 @@ for language in swift-or-c bash dtrace; do
matching_files=( -name '*' )
case "$language" in
swift-or-c)
- exceptions=( -name c_nio_http_parser.c -o -name c_nio_http_parser.h -o -name cpp_magic.h -o -name Package.swift -o -name CNIOSHA1.h -o -name c_nio_sha1.c -o -name ifaddrs-android.c -o -name ifaddrs-android.h)
+ exceptions=( -name c_nio_http_parser.c -o -name c_nio_http_parser.h -o -name cpp_magic.h -o -name Package.swift -o -name Package@swift-5.3.swift -o -name CNIOSHA1.h -o -name c_nio_sha1.c -o -name ifaddrs-android.c -o -name ifaddrs-android.h)
matching_files=( -name '*.swift' -o -name '*.c' -o -name '*.h' )
cat > "$tmp" <<"EOF"
//===----------------------------------------------------------------------===//