From 209722da538511f7c8f701dbe5b5d0ba7a23719f Mon Sep 17 00:00:00 2001
From: Fabian Fett <fabianfett@apple.com>
Date: Wed, 25 Feb 2026 16:18:09 +0100
Subject: [PATCH] Make CI green?!

---
 Package.swift                                         | 11 ++++-------
 Sources/AsyncHTTPClient/HTTP APIs/AHC+HTTP.swift      |  2 +-
 .../AsyncHTTPClientTests/HTTPClientRequestTests.swift |  2 ++
 Tests/ConformanceSuite/Suite.swift                    |  2 ++
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Package.swift b/Package.swift
index 07bd8c2..0387b7e 100644
--- a/Package.swift
+++ b/Package.swift
@@ -43,7 +43,8 @@ let package = Package(
             description: """
                 Enables conformance to the HTTPAPIs HTTPClient protocol. This is potentially source breaking.
                 """
-        )
+        ),
+        .default(enabledTraits: ["ExperimentalHTTPAPIsSupport"]), // remove before MERGE!
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.81.0"),
@@ -58,7 +59,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-configuration.git", from: "1.0.0"),
         .package(
             url: "https://github.com/apple/swift-http-api-proposal.git",
-            revision: "31080da9446b9e2c39f84aa955fef2ccbb7549f2",
+            revision: "79028bea099d390935790d5d8884a61eabf448a5",
         ),
     ],
     targets: [
@@ -91,11 +92,7 @@ let package = Package(
                 .product(name: "Tracing", package: "swift-distributed-tracing"),
 
                 // HTTP APIs
-                .product(
-                    name: "HTTPAPIs",
-                    package: "swift-http-api-proposal",
-                    condition: .when(traits: ["ExperimentalHTTPAPIsSupport"])
-                ),
+                .product(name: "HTTPAPIs", package: "swift-http-api-proposal"),
             ],
             swiftSettings: strictConcurrencySettings
         ),
diff --git a/Sources/AsyncHTTPClient/HTTP APIs/AHC+HTTP.swift b/Sources/AsyncHTTPClient/HTTP APIs/AHC+HTTP.swift
index 8ab99dd..65154f0 100644
--- a/Sources/AsyncHTTPClient/HTTP APIs/AHC+HTTP.swift	
+++ b/Sources/AsyncHTTPClient/HTTP APIs/AHC+HTTP.swift	
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=6.2)
+#if compiler(>=6.2) && canImport(HTTPAPIs)
 import HTTPAPIs
 import HTTPTypes
 import NIOHTTP1
diff --git a/Tests/AsyncHTTPClientTests/HTTPClientRequestTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientRequestTests.swift
index 9208352..54d9e08 100644
--- a/Tests/AsyncHTTPClientTests/HTTPClientRequestTests.swift
+++ b/Tests/AsyncHTTPClientTests/HTTPClientRequestTests.swift
@@ -783,8 +783,10 @@ extension Optional where Wrapped == HTTPClientRequest.Prepared.Body {
             }
             return accumulatedBuffer
 
+        #if canImport(HTTPAPIs)
         case .httpClientRequestBody:
             fatalError("TODO: Unimplemented")
+        #endif
         }
     }
 }
diff --git a/Tests/ConformanceSuite/Suite.swift b/Tests/ConformanceSuite/Suite.swift
index 1a38b1a..1254a92 100644
--- a/Tests/ConformanceSuite/Suite.swift
+++ b/Tests/ConformanceSuite/Suite.swift
@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if $ExperimentalHTTPAPIsSupport
 import AsyncHTTPClient
 import HTTPAPIs
 import HTTPClient
@@ -46,3 +47,4 @@ extension AsyncHTTPClient.HTTPClient.RequestOptions: HTTPClientCapability.Redire
         }
     }
 }
+#endif