From 6b336b6a196a55a9310e5385efaea619d6b9d264 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Tue, 29 Oct 2024 08:54:08 -0700 Subject: [PATCH 1/2] Use macOS 15 in CI --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9dc585f9..dff3d11e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ concurrency: jobs: xcode-build-16: name: Xcode 16 Build - runs-on: macOS-14 + runs-on: macOS-15 strategy: matrix: platforms: [ @@ -37,7 +37,7 @@ jobs: run: Scripts/upload-coverage-reports.sh ${{ matrix.platforms }} pod-lint: name: Pod Lint - runs-on: macOS-14 + runs-on: macOS-15 timeout-minutes: 30 steps: - name: Checkout Repo @@ -50,7 +50,7 @@ jobs: run: bundle exec pod lib lint --verbose --fail-fast --swift-version=6.0 carthage: name: Carthage - runs-on: macOS-14 + runs-on: macOS-15 timeout-minutes: 30 steps: - name: Checkout Repo @@ -64,8 +64,8 @@ jobs: - name: Build Framework run: carthage build --verbose --no-skip-current --use-xcframeworks spm-16: - name: SPM Build macOS 14 - runs-on: macOS-14 + name: SPM Build macOS 15 + runs-on: macOS-15 strategy: matrix: platforms: [ From 495386c1adaff145b9050f4025f086010057dca3 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Tue, 29 Oct 2024 08:57:06 -0700 Subject: [PATCH 2/2] Update simulator names --- Scripts/build.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Scripts/build.swift b/Scripts/build.swift index 0a04b18c..2ecf6f2b 100755 --- a/Scripts/build.swift +++ b/Scripts/build.swift @@ -29,7 +29,7 @@ enum Platform: String, CustomStringConvertible { var destination: String { switch self { case .iOS_18: - "platform=iOS Simulator,OS=18.0,name=iPad Pro (12.9-inch) (6th generation)" + "platform=iOS Simulator,OS=18.0,name=iPad (10th generation)" case .tvOS_18: "platform=tvOS Simulator,OS=18.0,name=Apple TV" @@ -38,7 +38,7 @@ enum Platform: String, CustomStringConvertible { "platform=OS X" case .watchOS_11: - "OS=11.0,name=Apple Watch Series 9 (45mm)" + "OS=11.0,name=Apple Watch Series 10 (46mm)" } }