Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/release-sign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -497,8 +497,8 @@ jobs:
- name: Install Sparkle's signing tool
run: |
set -euo pipefail
curl -fsSL -o "$RUNNER_TEMP/Sparkle.tar.xz" https://github.com/sparkle-project/Sparkle/releases/download/2.7.0/Sparkle-2.7.0.tar.xz
echo "09fed60cca507d2dc542c86c22e525598af5483954a5c66366ce039647ec88e9 $RUNNER_TEMP/Sparkle.tar.xz" | shasum -a 256 -c
curl -fsSL -o "$RUNNER_TEMP/Sparkle.tar.xz" https://github.com/sparkle-project/Sparkle/releases/download/2.10.1/Sparkle-2.10.1.tar.xz
echo "1a856d2a9edb8e628de88121d7be04cf0e2167f8641650b78fca00b14244cf27 $RUNNER_TEMP/Sparkle.tar.xz" | shasum -a 256 -c
mkdir -p "$RUNNER_TEMP/sparkle"
tar -xJf "$RUNNER_TEMP/Sparkle.tar.xz" -C "$RUNNER_TEMP/sparkle" ./bin/sign_update

Expand Down
9 changes: 7 additions & 2 deletions Coder-Desktop/Coder-Desktop/UpdaterService.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import Sparkle
import SwiftUI

/// Since Sparkle 2.8, `SPUStandardUpdaterController`, `SPUUpdater` and
/// `SPUUpdaterDelegate` are isolated to the main actor.
@MainActor
final class UpdaterService: NSObject, ObservableObject {
/// The auto-updater can be entirely disabled by setting the
/// `disableUpdater` UserDefaults key to `true`. This is designed for use in
Expand Down Expand Up @@ -86,8 +89,10 @@ extension UpdaterService: SPUUpdaterDelegate {
}
}

/// `SUVersionDisplay` and `SPUStandardUserDriverDelegate` are not isolated to
/// the main actor, so the methods that implement them cannot be either.
extension UpdaterService: SUVersionDisplay {
func formatUpdateVersion(
nonisolated func formatUpdateVersion(
fromUpdate update: SUAppcastItem,
andBundleDisplayVersion inOutBundleDisplayVersion: AutoreleasingUnsafeMutablePointer<NSString>,
withBundleVersion bundleVersion: String
Expand All @@ -102,7 +107,7 @@ extension UpdaterService: SUVersionDisplay {
}

extension UpdaterService: SPUStandardUserDriverDelegate {
func standardUserDriverRequestsVersionDisplayer() -> (any SUVersionDisplay)? {
nonisolated func standardUserDriverRequestsVersionDisplayer() -> (any SUVersionDisplay)? {
self
}
}
4 changes: 3 additions & 1 deletion Coder-Desktop/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ packages:
revision: 09b155d
Sparkle:
url: https://github.com/sparkle-project/Sparkle
exactVersion: 2.7.0
# When changing this, change the sign_update download in
# .github/workflows/release-sign.yml to the same release.
exactVersion: 2.10.1


targets:
Expand Down
Loading