From 002a4eda0e57ad007cecc01a9176ad7a42b5ba51 Mon Sep 17 00:00:00 2001
From: Honza Dvorsky <honza@apple.com>
Date: Mon, 27 Nov 2023 15:10:56 +0100
Subject: [PATCH 1/2] Prep for 1.0 alpha, adapted to runtime changes in main

---
 Package.swift                                                 | 2 +-
 Sources/OpenAPIAsyncHTTPClient/AsyncHTTPClientTransport.swift | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Package.swift b/Package.swift
index b6af358..d647d93 100644
--- a/Package.swift
+++ b/Package.swift
@@ -40,7 +40,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/apple/swift-nio", from: "2.58.0"),
         .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.19.0"),
-        .package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
+        .package(url: "https://github.com/apple/swift-openapi-runtime", branch: "main"),
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
     ],
     targets: [
diff --git a/Sources/OpenAPIAsyncHTTPClient/AsyncHTTPClientTransport.swift b/Sources/OpenAPIAsyncHTTPClient/AsyncHTTPClientTransport.swift
index 5851103..2ed27c2 100644
--- a/Sources/OpenAPIAsyncHTTPClient/AsyncHTTPClientTransport.swift
+++ b/Sources/OpenAPIAsyncHTTPClient/AsyncHTTPClientTransport.swift
@@ -181,7 +181,7 @@ public struct AsyncHTTPClientTransport: ClientTransport {
             let length: HTTPClientRequest.Body.Length
             switch body.length {
             case .unknown: length = .unknown
-            case .known(let count): length = .known(count)
+            case .known(let count): length = .known(Int(count))
             }
             clientRequest.body = .stream(body.map { .init(bytes: $0) }, length: length)
         }
@@ -197,7 +197,7 @@ public struct AsyncHTTPClientTransport: ClientTransport {
         for header in httpResponse.headers { headerFields[.init(header.name)!] = header.value }
 
         let length: HTTPBody.Length
-        if let lengthHeaderString = headerFields[.contentLength], let lengthHeader = Int(lengthHeaderString) {
+        if let lengthHeaderString = headerFields[.contentLength], let lengthHeader = Int64(lengthHeaderString) {
             length = .known(lengthHeader)
         } else {
             length = .unknown

From e917292b2cb79fceeaff9d126bea07a1007da6a3 Mon Sep 17 00:00:00 2001
From: Honza Dvorsky <honza@apple.com>
Date: Mon, 27 Nov 2023 15:29:18 +0100
Subject: [PATCH 2/2] Move to Swift 5.9 as the minimum version

---
 Package.swift                      |  2 +-
 docker/Dockerfile                  |  2 +-
 docker/docker-compose.2204.58.yaml | 19 -------------------
 docker/docker-compose.yaml         |  2 +-
 4 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 docker/docker-compose.2204.58.yaml

diff --git a/Package.swift b/Package.swift
index d647d93..86bffb5 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 5.9
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the SwiftOpenAPIGenerator open source project
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3cc66ea..d90e973 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG swift_version=5.8
+ARG swift_version=5.9
 ARG ubuntu_version=jammy
 ARG base_image=swift:${swift_version}-${ubuntu_version}
 
diff --git a/docker/docker-compose.2204.58.yaml b/docker/docker-compose.2204.58.yaml
deleted file mode 100644
index eca0761..0000000
--- a/docker/docker-compose.2204.58.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "3"
-
-services:
-  runtime-setup:
-    image: &image swift-openapi-ahc:22.04-5.8
-    build:
-      args:
-        ubuntu_version: "jammy"
-        swift_version: "5.8"
-
-  test:
-    image: *image
-    environment:
-      - WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors
-      - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
-      - STRICT_CONCURRENCY_ARG=-Xswiftc -strict-concurrency=complete
-
-  shell:
-    image: *image
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 055978f..0921dad 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -4,7 +4,7 @@
 #
 # % docker-compose \
 #   -f docker/docker-compose.yaml \
-#   -f docker/docker-compose.2204.58.yaml \
+#   -f docker/docker-compose.2204.59.yaml \
 #   run test
 #
 version: "3"