Skip to content

Bump macOS CI version to macOS 15 #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2024
Merged

Bump macOS CI version to macOS 15 #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/compatibility_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
16 changes: 1 addition & 15 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Loading