From 5f562d9324d1db33d9eeb570866243c53f7a56d3 Mon Sep 17 00:00:00 2001 From: Zorg Date: Sun, 10 Nov 2024 20:45:44 -0800 Subject: [PATCH 1/3] Bump CI runner to Xcode 16.1 / macOS 15 --- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/create-draft-release.yml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 890d1ff88..669f4f0fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,18 +10,18 @@ jobs: build: strategy: matrix: - xcode: ['xcode16', 'xcode15.4'] + xcode: ['xcode16.1', 'xcode15.4'] include: - xcode: 'xcode15.4' xcode-path: '/Applications/Xcode_15.4.app/Contents/Developer' - upload-dist: true - run-analyzer: true - macos: 'macos-14' - - xcode: 'xcode16' - xcode-path: '/Applications/Xcode_16.app' upload-dist: false run-analyzer: false macos: 'macos-14' + - xcode: 'xcode16.1' + xcode-path: '/Applications/Xcode_16.1.app' + upload-dist: true + run-analyzer: true + macos: 'macos-15' name: Build and Test Sparkle runs-on: ${{ matrix.macos }} diff --git a/.github/workflows/create-draft-release.yml b/.github/workflows/create-draft-release.yml index 8a3e35d68..e0a9a28fb 100644 --- a/.github/workflows/create-draft-release.yml +++ b/.github/workflows/create-draft-release.yml @@ -2,7 +2,7 @@ name: "Create Draft Release" env: BUILDDIR: "build" - DEVELOPER_DIR: "/Applications/Xcode_15.4.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode_16.1.app/Contents/Developer" on: workflow_dispatch: @@ -29,7 +29,7 @@ concurrency: jobs: release: name: "Publish binaries for release" - runs-on: macos-14 + runs-on: macos-15 steps: - name: "Checkout sources" From 282c5c2f63ef8d72051937d425f127e2e8910ead Mon Sep 17 00:00:00 2001 From: Zorg Date: Sun, 10 Nov 2024 21:14:20 -0800 Subject: [PATCH 2/3] Suppress nil analyzer warning --- Sparkle/SUAppcastDriver.m | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Sparkle/SUAppcastDriver.m b/Sparkle/SUAppcastDriver.m index 9faea12b4..b55189f73 100644 --- a/Sparkle/SUAppcastDriver.m +++ b/Sparkle/SUAppcastDriver.m @@ -434,7 +434,10 @@ + (SUAppcastItem *)bestItemFromAppcastItems:(NSArray *)appcastItems getDeltaItem // Give the delegate a chance to provide a custom version comparator id updaterDelegate = _updaterDelegate; if ([updaterDelegate respondsToSelector:@selector((versionComparatorForUpdater:))]) { - comparator = [updaterDelegate versionComparatorForUpdater:_updater]; + SPUUpdater *updater = _updater; + if (updater != nil) { + comparator = [updaterDelegate versionComparatorForUpdater:updater]; + } } #pragma clang diagnostic pop From 555f0d1ffb9df7a00dbd074667f5bfeeaed8eff4 Mon Sep 17 00:00:00 2001 From: Zorg Date: Sun, 10 Nov 2024 21:15:25 -0800 Subject: [PATCH 3/3] Use id type --- Sparkle/SUAppcastDriver.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sparkle/SUAppcastDriver.m b/Sparkle/SUAppcastDriver.m index b55189f73..f5d529890 100644 --- a/Sparkle/SUAppcastDriver.m +++ b/Sparkle/SUAppcastDriver.m @@ -434,7 +434,7 @@ + (SUAppcastItem *)bestItemFromAppcastItems:(NSArray *)appcastItems getDeltaItem // Give the delegate a chance to provide a custom version comparator id updaterDelegate = _updaterDelegate; if ([updaterDelegate respondsToSelector:@selector((versionComparatorForUpdater:))]) { - SPUUpdater *updater = _updater; + id updater = _updater; if (updater != nil) { comparator = [updaterDelegate versionComparatorForUpdater:updater]; }