Skip to content
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

Bump CI runner to Xcode 16.1 / macOS 15 #2659

Merged
merged 3 commits into from
Nov 11, 2024
Merged

Bump CI runner to Xcode 16.1 / macOS 15 #2659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f562d9
Bump CI runner to Xcode 16.1 / macOS 15
zorgiepoo Nov 11, 2024
282c5c2
Suppress nil analyzer warning
zorgiepoo Nov 11, 2024
555f0d1
Use id type
zorgiepoo Nov 11, 2024
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
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/create-draft-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -29,7 +29,7 @@ concurrency:
jobs:
release:
name: "Publish binaries for release"
runs-on: macos-14
runs-on: macos-15

steps:
- name: "Checkout sources"
Expand Down
5 changes: 4 additions & 1 deletion Sparkle/SUAppcastDriver.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,10 @@ + (SUAppcastItem *)bestItemFromAppcastItems:(NSArray *)appcastItems getDeltaItem
// Give the delegate a chance to provide a custom version comparator
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if ([updaterDelegate respondsToSelector:@selector((versionComparatorForUpdater:))]) {
comparator = [updaterDelegate versionComparatorForUpdater:_updater];
id updater = _updater;
if (updater != nil) {
comparator = [updaterDelegate versionComparatorForUpdater:updater];
}
}
#pragma clang diagnostic pop

Expand Down
Loading