From 4cc46110cdd4327afacfe1cf6def08691c36adb3 Mon Sep 17 00:00:00 2001
From: George Barnett <gbarnett@apple.com>
Date: Fri, 8 Mar 2024 14:16:17 +0000
Subject: [PATCH] Raise minimum Swift version to 5.8

---
 Package.swift                       |  2 +-
 README.md                           |  3 ++-
 docker/docker-compose.2204.510.yaml |  3 ++-
 docker/docker-compose.2204.57.yaml  | 21 ---------------------
 4 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 docker/docker-compose.2204.57.yaml

diff --git a/Package.swift b/Package.swift
index dceb42501..dae0d91c7 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.8
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the AsyncHTTPClient open source project
diff --git a/README.md b/README.md
index 45a847fea..26be89420 100644
--- a/README.md
+++ b/README.md
@@ -329,4 +329,5 @@ AsyncHTTPClient     | Minimum Swift Version
 `1.10.0 ..< 1.13.0` | 5.4
 `1.13.0 ..< 1.18.0` | 5.5.2
 `1.18.0 ..< 1.20.0` | 5.6
-`1.20.0 ...`        | 5.7
+`1.20.0 ..< 1.21.0` | 5.7
+`1.21.0 ...`        | 5.8
diff --git a/docker/docker-compose.2204.510.yaml b/docker/docker-compose.2204.510.yaml
index fdc3d2bdd..8dbf21183 100644
--- a/docker/docker-compose.2204.510.yaml
+++ b/docker/docker-compose.2204.510.yaml
@@ -6,7 +6,8 @@ services:
     image: async-http-client:22.04-5.10
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.10-jammy"
+        ubuntu_version: "jammy"
+        swift_version: "5.10"
 
   documentation-check:
     image: async-http-client:22.04-5.10
diff --git a/docker/docker-compose.2204.57.yaml b/docker/docker-compose.2204.57.yaml
deleted file mode 100644
index 78eb83e1c..000000000
--- a/docker/docker-compose.2204.57.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-version: "3"
-
-services:
-
-  runtime-setup:
-    image: async-http-client:22.04-5.7
-    build:
-      args:
-        ubuntu_version: "jammy"
-        swift_version: "5.7"
-
-  documentation-check:
-    image: async-http-client:22.04-5.7
-
-  test:
-    image: async-http-client:22.04-5.7
-    environment: []
-      #- SANITIZER_ARG=--sanitize=thread
-
-  shell:
-    image: async-http-client:22.04-5.7