Migrate to Sparkle 2.8.1 from Sparkle 1 and format source

Author: lucasderraugh

GitUp/Application/AppDelegate.m

@@ -42,15 +42,15 @@
 #define kToolName @"gitup"
 #define kToolInstallPath @"/usr/local/bin/" kToolName
 
-@interface AppDelegate () <UNUserNotificationCenterDelegate, SUUpdaterDelegate, NSMenuItemValidation>
+@interface AppDelegate () <UNUserNotificationCenterDelegate, SPUUpdaterDelegate, NSMenuItemValidation>
 @property(nonatomic, strong) AboutWindowController* aboutWindowController;
 @property(nonatomic, strong) CloneWindowController* cloneWindowController;
 @property(nonatomic, strong) PreferencesWindowController* preferencesWindowController;
 @property(nonatomic, strong) WelcomeWindowController* welcomeWindowController;
 @end
 
 @implementation AppDelegate {
-  SUUpdater* _updater;
+  SPUStandardUpdaterController* _updaterController;
   BOOL _manualCheck;
 
   CFMessagePortRef _messagePort;
@@ -74,7 +74,7 @@ - (CloneWindowController*)cloneWindowController {
 
 - (void)didChangeReleaseChannel:(BOOL)didChange {
   if (didChange) {
-    [_updater checkForUpdatesInBackground];
+    [_updaterController.updater checkForUpdatesInBackground];
   }
 }
 
@@ -205,13 +205,14 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification {
 #if !DEBUG
   // Initialize Sparkle and check for update immediately
   if (![[NSUserDefaults standardUserDefaults] boolForKey:kUserDefaultsKey_DisableSparkle]) {
-    _updater = [SUUpdater sharedUpdater];
-    _updater.delegate = self;
-    _updater.automaticallyChecksForUpdates = YES;
-    _updater.sendsSystemProfile = NO;
+    _updaterController = [[SPUStandardUpdaterController alloc] initWithStartingUpdater:YES
+                                                                       updaterDelegate:self
+                                                                    userDriverDelegate:nil];
+    _updaterController.updater.automaticallyChecksForUpdates = YES;
+    _updaterController.updater.sendsSystemProfile = NO;
 
     _manualCheck = NO;
-    [_updater checkForUpdatesInBackground];
+    [_updaterController.updater checkForUpdatesInBackground];
   }
 #endif
 
@@ -369,7 +370,7 @@ - (NSDictionary*)_processToolCommand:(NSDictionary*)input {
 
 - (BOOL)validateMenuItem:(NSMenuItem*)menuItem {
   if (menuItem.action == @selector(checkForUpdates:)) {
-    return [_updater validateMenuItem:menuItem];
+    return _updaterController.updater.canCheckForUpdates;
   }
   return YES;
 }
@@ -480,7 +481,7 @@ - (IBAction)dimissModal:(id)sender {
 
 - (IBAction)checkForUpdates:(id)sender {
   _manualCheck = YES;
-  [_updater checkForUpdatesInBackground];
+  [_updaterController checkForUpdates:sender];
 }
 
 - (IBAction)installTool:(id)sender {
@@ -529,20 +530,20 @@ - (IBAction)installTool:(id)sender {
   }
 }
 
-#pragma mark - SUUpdaterDelegate
+#pragma mark - SPUUpdaterDelegate
 
-- (NSString*)feedURLStringForUpdater:(SUUpdater*)updater {
+- (NSString*)feedURLStringForUpdater:(SPUUpdater*)updater {
   NSString* channel = [[NSUserDefaults standardUserDefaults] stringForKey:kUserDefaultsKey_ReleaseChannel];
   return [NSString stringWithFormat:kURL_AppCast, channel];
 }
 
-- (void)updater:(SUUpdater*)updater didFindValidUpdate:(SUAppcastItem*)item {
+- (void)updater:(SPUUpdater*)updater didFindValidUpdate:(SUAppcastItem*)item {
   _manualCheck = NO;
   NSString* channel = [[NSUserDefaults standardUserDefaults] stringForKey:kUserDefaultsKey_ReleaseChannel];
   XLOG_INFO(@"Did find app update on channel '%@' for version %@", channel, item.versionString);
 }
 
-- (void)updaterDidNotFindUpdate:(SUUpdater*)updater {
+- (void)updaterDidNotFindUpdate:(SPUUpdater*)updater error:(NSError*)error {
   NSString* channel = [[NSUserDefaults standardUserDefaults] stringForKey:kUserDefaultsKey_ReleaseChannel];
   XLOG_VERBOSE(@"App is up-to-date at version %@ on channel '%@'", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"], channel);
   if (_manualCheck) {
@@ -555,22 +556,23 @@ - (void)updaterDidNotFindUpdate:(SUUpdater*)updater {
   }
 }
 
-- (void)updater:(SUUpdater*)updater didAbortWithError:(NSError*)error {
+- (void)updater:(SPUUpdater*)updater didAbortWithError:(NSError*)error {
   NSString* channel = [[NSUserDefaults standardUserDefaults] stringForKey:kUserDefaultsKey_ReleaseChannel];
   if (![error.domain isEqualToString:SUSparkleErrorDomain] || (error.code != SUNoUpdateError)) {
     XLOG_ERROR(@"App update on channel '%@' aborted: %@", channel, error);
   }
 }
 
-- (void)updater:(SUUpdater*)updater willInstallUpdate:(SUAppcastItem*)item {
+- (void)updater:(SPUUpdater*)updater willInstallUpdate:(SUAppcastItem*)item {
   XLOG_INFO(@"Installing app update for version %@", item.versionString);
 }
 
-- (void)updater:(SUUpdater*)updater willInstallUpdateOnQuit:(SUAppcastItem*)item immediateInstallationInvocation:(NSInvocation*)invocation {
+- (BOOL)updater:(SPUUpdater*)updater willInstallUpdateOnQuit:(SUAppcastItem*)item immediateInstallationBlock:(void (^)(void))installationBlock {
   XLOG_INFO(@"Will install app update for version %@ on quit", item.versionString);
   [self _showNotificationWithTitle:NSLocalizedString(@"Update Available", nil)
                             action:NULL
                            message:NSLocalizedString(@"Relaunch GitUp to update to version %@ (%@).", nil), item.displayVersionString, item.versionString];
+  return NO;
 }
 
 #pragma mark - UNUserNotificationCenterDelegate

GitUp/Application/Document.m

@@ -910,11 +910,11 @@ - (void)_showHelpWithIdentifier:(NSString*)identifier {
     XLOG_DEBUG_UNREACHABLE();
   }
   if (showHelp) {
-    NSWindow *window = _mainTabView.window;
+    NSWindow* window = _mainTabView.window;
     CGRect frame = window.frame;
     CGRect layoutRect = window.contentLayoutRect;
     CGFloat toolbarHeight = frame.size.height - layoutRect.size.height;
-    
+
     NSRect contentBounds = _contentView.bounds;
     _helpView.hidden = NO;
     _mainTabView.frame = NSMakeRect(contentBounds.origin.x, contentBounds.origin.y, contentBounds.size.width, contentBounds.size.height - _helpView.frame.size.height - toolbarHeight);

GitUp/GitUp.xcodeproj/project.pbxproj

@@ -335,7 +335,6 @@
 				E2C338A919F8562F00063D95 /* Resources */,
 				E2653D271A5B3298006A9871 /* Copy Frameworks */,
 				E21DCAF21B2538FB006424E8 /* Copy Tool */,
-				1D7D03E724528390002C1736 /* ShellScript */,
 				1DE5583E2B9D89BF006BA332 /* Xcode 15 Framework Patching */,
 			);
 			buildRules = (
@@ -444,23 +443,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		1D7D03E724528390002C1736 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# Code sign sparkle app\nLOCATION=\"${BUILT_PRODUCTS_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\n\n# By default, use the configured code signing identity for the project/target\nIDENTITY=\"${EXPANDED_CODE_SIGN_IDENTITY}\"\nif [ \"$IDENTITY\" == \"\" ]\nthen\n  # If a code signing identity is not specified, use ad hoc signing\n  IDENTITY=\"-\"\nfi\ncodesign --verbose --force --deep -o runtime --sign \"$IDENTITY\" \"$LOCATION/Sparkle.framework/Versions/A/Resources/AutoUpdate.app\"\ncodesign --verbose --force -o runtime --sign \"$IDENTITY\" \"$LOCATION/Sparkle.framework/Versions/A\"\n";
-		};
 		1DE5583E2B9D89BF006BA332 /* Xcode 15 Framework Patching */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 8;
@@ -724,7 +706,7 @@
 			repositoryURL = "https://github.com/sparkle-project/Sparkle";
 			requirement = {
 				kind = exactVersion;
-				version = 1.27.3;
+				version = 2.8.1;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

GitUpKit/Utilities/GIWindowController.m

@@ -238,38 +238,42 @@ - (void)showOverlayWithStyle:(GIOverlayStyle)style message:(NSString*)message {
     [CATransaction flush];
 
     _overlayTextField.stringValue = message;
-    [NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) {
+    [NSAnimationContext runAnimationGroup:^(NSAnimationContext* _Nonnull context) {
       context.duration = kOverlayAnimationInDuration;
       context.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut];
       _overlayView.animator.alphaValue = 1;
     }];
   } else {
-    [NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) {
-      context.duration = kOverlayAnimationInDuration;
-      context.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn];
-      _overlayTextField.animator.alphaValue = 0.0;
-    } completionHandler:^{
-      _overlayTextField.stringValue = message;
-      [NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) {
-        context.duration = kOverlayAnimationInDuration;
-        context.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut];
-        _overlayTextField.animator.alphaValue = 1.0;
-      }];
-    }];
+    [NSAnimationContext
+        runAnimationGroup:^(NSAnimationContext* _Nonnull context) {
+          context.duration = kOverlayAnimationInDuration;
+          context.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn];
+          _overlayTextField.animator.alphaValue = 0.0;
+        }
+        completionHandler:^{
+          _overlayTextField.stringValue = message;
+          [NSAnimationContext runAnimationGroup:^(NSAnimationContext* _Nonnull context) {
+            context.duration = kOverlayAnimationInDuration;
+            context.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut];
+            _overlayTextField.animator.alphaValue = 1.0;
+          }];
+        }];
   }
 
   CFRunLoopTimerSetNextFireDate(_overlayTimer, CFAbsoluteTimeGetCurrent() + _overlayDelay);
 }
 
 - (void)hideOverlay {
   if (_overlayView.superview) {
-    [NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) {
-      context.duration = kOverlayAnimationOutDuration;
-      context.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut];
-      _overlayView.animator.alphaValue = 0;
-    } completionHandler:^{
-      [_overlayView removeFromSuperview];
-    }];
+    [NSAnimationContext
+        runAnimationGroup:^(NSAnimationContext* _Nonnull context) {
+          context.duration = kOverlayAnimationOutDuration;
+          context.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut];
+          _overlayView.animator.alphaValue = 0;
+        }
+        completionHandler:^{
+          [_overlayView removeFromSuperview];
+        }];
 
     CFRunLoopTimerSetNextFireDate(_overlayTimer, HUGE_VALF);
   } else {