From 322f6ffbf5026649464868408e88459c163365ae Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Sun, 3 Nov 2024 13:27:12 +0800
Subject: [PATCH] Bump macOS CI version to macOS 15 (#152)

---
 .github/workflows/compatibility_tests.yml |  4 ++--
 .github/workflows/ios.yml                 |  2 +-
 .github/workflows/macos.yml               |  2 +-
 Package.swift                             | 16 +---------------
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/compatibility_tests.yml b/.github/workflows/compatibility_tests.yml
index 469fee59..b3e3ff25 100644
--- a/.github/workflows/compatibility_tests.yml
+++ b/.github/workflows/compatibility_tests.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-14]
+        os: [macos-15]
         xcode-version: ["16.0"]
         release: [2024]
     runs-on: ${{ matrix.os }}
@@ -49,7 +49,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-14]
+        os: [macos-15]
         xcode-version: ["16.0"]
         release: [2024]
         ios-version: ["18.0"]
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 2eeb1ab7..0eb2fab1 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-14]
+        os: [macos-15]
         xcode-version: [16.0]
         release: [2021, 2024]
         ios-version: ["18.0"]
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 938fee29..7072e21e 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-14]
+        os: [macos-15]
         xcode-version: [16.0]
         release: [2021, 2024]
     runs-on: ${{ matrix.os }}
diff --git a/Package.swift b/Package.swift
index 155e6629..5d23f4ef 100644
--- a/Package.swift
+++ b/Package.swift
@@ -26,28 +26,14 @@ let systemFrameworkSearchFlag = isXcodeEnv ? "-iframework" : "-Fsystem"
 let releaseVersion = Context.environment["OPENSWIFTUI_TARGET_RELEASE"].flatMap { Int($0) } ?? 2021
 let platforms: [SupportedPlatform] = switch releaseVersion {
 case 2024: // iOS 18.0
-    // FIXME: non-Darwin platform nightly Swift 6 compiler have not add the latest OS yet
-    #if canImport(Darwin)
     [
         .iOS(.v18),
-        // FIXME: temporary lower the requirement since there is no macOS 15 CI yet.
-        // .macOS(.v15),
-        .macOS(.v14),
+        .macOS(.v15),
         .macCatalyst(.v18),
         .tvOS(.v18),
         .watchOS(.v10),
         .visionOS(.v2),
     ]
-    #else
-    [
-        .iOS(.v17),
-        .macOS(.v14),
-        .macCatalyst(.v17),
-        .tvOS(.v17),
-        .watchOS(.v9),
-        .visionOS(.v1),
-    ]
-    #endif
 case 2021: // iOS 15.5
     [
         .iOS(.v15),