From 90d77ba7ed317eaa05cd208d82312dc6909dd0fc Mon Sep 17 00:00:00 2001
From: Rachel Brindle <you@subluminal.net>
Date: Sun, 13 Oct 2024 23:00:40 -0700
Subject: [PATCH] Set minimum supported Swift version of 5.9

At least, as far as CI is concerned.
---
 .github/workflows/ci-swiftpm.yml    | 23 ++++++-----------------
 .github/workflows/ci-xcode.yml      | 26 +++++---------------------
 .github/workflows/cocoapods.yml     |  2 +-
 .github/workflows/documentation.yml |  2 +-
 .github/workflows/release.yml       |  6 +++---
 5 files changed, 16 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/ci-swiftpm.yml b/.github/workflows/ci-swiftpm.yml
index 30290ce7e..b8c64407f 100644
--- a/.github/workflows/ci-swiftpm.yml
+++ b/.github/workflows/ci-swiftpm.yml
@@ -11,24 +11,12 @@ on:
       - "*"
 
 jobs:
-  swiftpm_darwin_monterey:
+  swiftpm_darwin_sonoma:
     name: SwiftPM, Darwin, Xcode ${{ matrix.xcode }}
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
       matrix:
-        xcode: ["14.0.1", "14.1", "14.2"]
-    env:
-      DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
-    steps:
-      - uses: actions/checkout@v4
-      - run: ./test swiftpm
-
-  swiftpm_darwin_ventura:
-    name: SwiftPM, Darwin, Xcode ${{ matrix.xcode }}
-    runs-on: macos-13
-    strategy:
-      matrix:
-        xcode: ["14.3.1"]
+        xcode: ["15.0.1", "15.1", "15.2"]
     env:
       DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
     steps:
@@ -41,8 +29,9 @@ jobs:
     strategy:
       matrix:
         container:
-          - swift:5.7
-          - swift:5.8
+          - swift:5.9
+          - swift:5.10
+          - swift:6.0
           # - swiftlang/swift:nightly
       fail-fast: false
     container: ${{ matrix.container }}
diff --git a/.github/workflows/ci-xcode.yml b/.github/workflows/ci-xcode.yml
index 8e55af81b..7ec0d55d6 100644
--- a/.github/workflows/ci-xcode.yml
+++ b/.github/workflows/ci-xcode.yml
@@ -11,28 +11,12 @@ on:
       - "*"
 
 jobs:
-  xcode_monterey:
+  xcode_sonoma:
     name: Xcode ${{ matrix.xcode }} (Xcode Project)
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
       matrix:
-        xcode: ["14.0.1", "14.1", "14.2"]
-      fail-fast: false
-    env:
-      DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
-    steps:
-      - uses: actions/checkout@v4
-      - run: ./test macos
-      - run: ./test ios
-      - run: ./test tvos
-      - run: ./test watchos
-
-  xcode_ventura:
-    name: Xcode ${{ matrix.xcode }} (Xcode Project)
-    runs-on: macos-13
-    strategy:
-      matrix:
-        xcode: ["14.3.1"]
+        xcode: ["15.0.1", "15.1", "15.2"]
       fail-fast: false
     env:
       DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
@@ -45,10 +29,10 @@ jobs:
 
   xcode_spm:
     name: Xcode ${{ matrix.xcode }} (Swift Package)
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
       matrix:
-        xcode: ["14.0.1"]
+        xcode: ["15.0.1", "15.1", "15.2"]
       fail-fast: false
     env:
       DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
diff --git a/.github/workflows/cocoapods.yml b/.github/workflows/cocoapods.yml
index 4a5b2eaae..d1ea45c49 100644
--- a/.github/workflows/cocoapods.yml
+++ b/.github/workflows/cocoapods.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   cocoapods:
     name: CocoaPods Lint
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 82fcb3553..8959192e9 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   build-documentation:
-    runs-on: ubuntu-latest
+    runs-on: macos-14
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 47aedb845..de139a562 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,11 +6,11 @@ on:
 
 jobs:
   carthage_archive:
-    name: Darwin, Xcode 14.0
-    runs-on: macos-12
+    name: Darwin, Xcode 15.0
+    runs-on: macos-14
     strategy:
       matrix:
-        xcode: ["14.0.1"]
+        xcode: ["15.0.1"]
     env:
       DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
     steps: