From 9dd33e6df7f3db01ad9b4354b3f406f7d30fb769 Mon Sep 17 00:00:00 2001
From: George Barnett <gbarnett@apple.com>
Date: Fri, 8 Mar 2024 14:03:35 +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  | 19 -------------------
 4 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 docker/docker-compose.2204.57.yaml

diff --git a/Package.swift b/Package.swift
index 461184a8..b32ae1f5 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.7.1
+// swift-tools-version:5.8
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the SwiftNIO open source project
diff --git a/README.md b/README.md
index 8f88dbd3..67145547 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,8 @@ SwiftNIO Extras     | Minimum Swift Version
 `1.11.0 ..< 1.14.0` | 5.4
 `1.14.0 ..< 1.19.0` | 5.5.2
 `1.19.0 ..< 1.20.0` | 5.6
-`1.20.0 ...`        | 5.7.1
+`1.20.0 ..< 1.23.0` | 5.7.1
+`1.23.0 ...`        | 5.8
 
 On the [`nio-extras-0.1`](https://github.com/apple/swift-nio-extras/tree/nio-extras-0.1) branch, you can find the `swift-nio-extras` version for the SwiftNIO 1 family. It requires Swift 4.1 or better.
 
diff --git a/docker/docker-compose.2204.510.yaml b/docker/docker-compose.2204.510.yaml
index 37e9021d..5b823e85 100644
--- a/docker/docker-compose.2204.510.yaml
+++ b/docker/docker-compose.2204.510.yaml
@@ -6,7 +6,8 @@ services:
     image: swift-nio-extras:22.04-5.10
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.10-jammy"
+        ubuntu_version: "jammy"
+        swift_version: "5.10"
 
   test:
     image: swift-nio-extras: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 a714fc12..00000000
--- a/docker/docker-compose.2204.57.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "3"
-
-services:
-
-  runtime-setup:
-    image: swift-nio-extras:22.04-5.7
-    build:
-      args:
-        ubuntu_version: "jammy"
-        swift_version: "5.7"
-
-  documentation-check:
-    image: swift-nio-extras:22.04-5.7
-
-  test:
-    image: swift-nio-extras:22.04-5.7
-
-  shell:
-    image: swift-nio-extras:22.04-5.7