diff --git a/Package.swift b/Package.swift index cc27c04..b8372c1 100644 --- a/Package.swift +++ b/Package.swift @@ -65,7 +65,7 @@ let package = Package( .product(name: "Tracing", package: "swift-distributed-tracing"), .product(name: "Instrumentation", package: "swift-distributed-tracing"), .product(name: "Logging", package: "swift-log"), - .product(name: "HTTPServer", package: "swift-http-api-proposal"), + .product(name: "HTTPAPIs", package: "swift-http-api-proposal"), "NIOHTTPServer", ], swiftSettings: extraSettings @@ -93,7 +93,7 @@ let package = Package( condition: .when(traits: ["Configuration"]) ), .product(name: "NIOExtras", package: "swift-nio-extras"), - .product(name: "HTTPServer", package: "swift-http-api-proposal"), + .product(name: "HTTPAPIs", package: "swift-http-api-proposal"), ], swiftSettings: extraSettings ), diff --git a/Sources/Example/Example.swift b/Sources/Example/Example.swift index 62ad5b0..00e4a95 100644 --- a/Sources/Example/Example.swift +++ b/Sources/Example/Example.swift @@ -15,7 +15,7 @@ import AsyncStreaming import Crypto import Foundation -import HTTPServer +import HTTPAPIs import HTTPTypes import Instrumentation import Logging diff --git a/Sources/NIOHTTPServer/NIOHTTPServer+HTTP1_1.swift b/Sources/NIOHTTPServer/NIOHTTPServer+HTTP1_1.swift index 38b8494..6de4016 100644 --- a/Sources/NIOHTTPServer/NIOHTTPServer+HTTP1_1.swift +++ b/Sources/NIOHTTPServer/NIOHTTPServer+HTTP1_1.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import HTTPServer +import HTTPAPIs import NIOCore import NIOEmbedded import NIOExtras diff --git a/Sources/NIOHTTPServer/NIOHTTPServer+SecureUpgrade.swift b/Sources/NIOHTTPServer/NIOHTTPServer+SecureUpgrade.swift index 39b0b03..a8fe91f 100644 --- a/Sources/NIOHTTPServer/NIOHTTPServer+SecureUpgrade.swift +++ b/Sources/NIOHTTPServer/NIOHTTPServer+SecureUpgrade.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import HTTPServer +import HTTPAPIs import Logging import NIOCore import NIOEmbedded diff --git a/Sources/NIOHTTPServer/NIOHTTPServer.swift b/Sources/NIOHTTPServer/NIOHTTPServer.swift index 2d4e330..1f3c974 100644 --- a/Sources/NIOHTTPServer/NIOHTTPServer.swift +++ b/Sources/NIOHTTPServer/NIOHTTPServer.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -public import HTTPServer +public import HTTPAPIs import HTTPTypes public import Logging import NIOCertificateReloading diff --git a/Tests/NIOHTTPServerTests/HTTPResponseSenderTests.swift b/Tests/NIOHTTPServerTests/HTTPResponseSenderTests.swift index 9a583c4..b22303f 100644 --- a/Tests/NIOHTTPServerTests/HTTPResponseSenderTests.swift +++ b/Tests/NIOHTTPServerTests/HTTPResponseSenderTests.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import HTTPServer +import HTTPAPIs import HTTPTypes import NIOCore import NIOHTTPTypes diff --git a/Tests/NIOHTTPServerTests/HTTPServerTests.swift b/Tests/NIOHTTPServerTests/HTTPServerTests.swift index 061e16a..0e5da7f 100644 --- a/Tests/NIOHTTPServerTests/HTTPServerTests.swift +++ b/Tests/NIOHTTPServerTests/HTTPServerTests.swift @@ -12,7 +12,6 @@ // //===----------------------------------------------------------------------===// -import HTTPServer import HTTPTypes import Logging import NIOHTTPServer diff --git a/Tests/NIOHTTPServerTests/NIOHTTPServer+ServiceLifecycleTests.swift b/Tests/NIOHTTPServerTests/NIOHTTPServer+ServiceLifecycleTests.swift index 67e59ad..6de8972 100644 --- a/Tests/NIOHTTPServerTests/NIOHTTPServer+ServiceLifecycleTests.swift +++ b/Tests/NIOHTTPServerTests/NIOHTTPServer+ServiceLifecycleTests.swift @@ -13,7 +13,6 @@ //===----------------------------------------------------------------------===// import AsyncStreaming -import HTTPServer import HTTPTypes import Logging import NIOCore diff --git a/Tests/NIOHTTPServerTests/NIOHTTPServerEndToEndTests.swift b/Tests/NIOHTTPServerTests/NIOHTTPServerEndToEndTests.swift index 481a131..4ccfc6b 100644 --- a/Tests/NIOHTTPServerTests/NIOHTTPServerEndToEndTests.swift +++ b/Tests/NIOHTTPServerTests/NIOHTTPServerEndToEndTests.swift @@ -12,8 +12,7 @@ // //===----------------------------------------------------------------------===// -import HTTPServer -import HTTPTypes +import HTTPAPIs import Logging import NIOCore import NIOEmbedded diff --git a/Tests/NIOHTTPServerTests/NIOHTTPServerTests.swift b/Tests/NIOHTTPServerTests/NIOHTTPServerTests.swift index 5eca454..a831133 100644 --- a/Tests/NIOHTTPServerTests/NIOHTTPServerTests.swift +++ b/Tests/NIOHTTPServerTests/NIOHTTPServerTests.swift @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// import AsyncStreaming -import HTTPServer +import HTTPAPIs import HTTPTypes import Logging import NIOCore diff --git a/Tests/NIOHTTPServerTests/Utilities/TestingChannelClientServer/NIOHTTPServer+HTTP1.swift b/Tests/NIOHTTPServerTests/Utilities/TestingChannelClientServer/NIOHTTPServer+HTTP1.swift index 9a3e137..bb5a1a6 100644 --- a/Tests/NIOHTTPServerTests/Utilities/TestingChannelClientServer/NIOHTTPServer+HTTP1.swift +++ b/Tests/NIOHTTPServerTests/Utilities/TestingChannelClientServer/NIOHTTPServer+HTTP1.swift @@ -16,7 +16,7 @@ import NIOCore import NIOEmbedded import NIOHTTPTypes -@testable import HTTPServer +@testable import HTTPAPIs @testable import NIOHTTPServer @available(macOS 26.2, iOS 26.2, watchOS 26.2, tvOS 26.2, visionOS 26.2, *) diff --git a/Tests/NIOHTTPServerTests/Utilities/TestingChannelClientServer/NIOHTTPServer+SecureUpgrade.swift b/Tests/NIOHTTPServerTests/Utilities/TestingChannelClientServer/NIOHTTPServer+SecureUpgrade.swift index dd4c657..bfa3ad7 100644 --- a/Tests/NIOHTTPServerTests/Utilities/TestingChannelClientServer/NIOHTTPServer+SecureUpgrade.swift +++ b/Tests/NIOHTTPServerTests/Utilities/TestingChannelClientServer/NIOHTTPServer+SecureUpgrade.swift @@ -16,7 +16,7 @@ import NIOCore import NIOEmbedded import NIOHTTPTypes -@testable import HTTPServer +@testable import HTTPAPIs @testable import NIOHTTPServer @available(macOS 26.2, iOS 26.2, watchOS 26.2, tvOS 26.2, visionOS 26.2, *) diff --git a/Tests/NIOHTTPServerTests/Utilities/TestingChannelClientServer/TestingChannelServer+HTTP1.swift b/Tests/NIOHTTPServerTests/Utilities/TestingChannelClientServer/TestingChannelServer+HTTP1.swift index a79ee41..cfaba2f 100644 --- a/Tests/NIOHTTPServerTests/Utilities/TestingChannelClientServer/TestingChannelServer+HTTP1.swift +++ b/Tests/NIOHTTPServerTests/Utilities/TestingChannelClientServer/TestingChannelServer+HTTP1.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import HTTPServer +import HTTPAPIs import Logging import NIOCore import NIOEmbedded diff --git a/Tests/NIOHTTPServerTests/Utilities/TestingChannelClientServer/TestingChannelServer+SecureUpgrade.swift b/Tests/NIOHTTPServerTests/Utilities/TestingChannelClientServer/TestingChannelServer+SecureUpgrade.swift index ac623d2..a31fc1a 100644 --- a/Tests/NIOHTTPServerTests/Utilities/TestingChannelClientServer/TestingChannelServer+SecureUpgrade.swift +++ b/Tests/NIOHTTPServerTests/Utilities/TestingChannelClientServer/TestingChannelServer+SecureUpgrade.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import HTTPServer +import HTTPAPIs import Logging import NIOCore import NIOEmbedded