From 56f9d98d1176d15542b768aafe6f42748bd8fa06 Mon Sep 17 00:00:00 2001
From: George Barnett <gbarnett@apple.com>
Date: Mon, 11 Mar 2024 17:37:47 +0000
Subject: [PATCH] Raise minimum Swift version to 5.8

---
 Package.swift                       |  2 +-
 docker/docker-compose.2004.57.yaml  | 19 -------------------
 docker/docker-compose.2204.510.yaml |  3 ++-
 3 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 docker/docker-compose.2004.57.yaml

diff --git a/Package.swift b/Package.swift
index 9772152..368dca0 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.8
 import PackageDescription
 
 let package = Package(
diff --git a/docker/docker-compose.2004.57.yaml b/docker/docker-compose.2004.57.yaml
deleted file mode 100644
index 3c0dde4..0000000
--- a/docker/docker-compose.2004.57.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "3"
-
-services:
-
-  runtime-setup:
-    image: swift-service-lifecycle:20.04-5.7
-    build:
-      args:
-        ubuntu_version: "focal"
-        swift_version: "5.7"
-
-  test:
-    image: swift-service-lifecycle:20.04-5.7
-    environment:
-      - SKIP_SIGNAL_TEST=true
-      #- FORCE_TEST_DISCOVERY=--enable-test-discovery
-
-  shell:
-    image: swift-service-lifecycle:20.04-5.7
diff --git a/docker/docker-compose.2204.510.yaml b/docker/docker-compose.2204.510.yaml
index 752f251..ba2c0a5 100644
--- a/docker/docker-compose.2204.510.yaml
+++ b/docker/docker-compose.2204.510.yaml
@@ -6,7 +6,8 @@ services:
     image: swift-service-lifecycle:22.04-5.10
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.10-jammy"
+        ubuntu_version: "jammy"
+        swift_version: "5.10"
 
   test:
     image: swift-service-lifecycle:22.04-5.10