Merge branch 'master' into google_reader_compatible_syncing

Appcasts/netnewswire-beta.xml

@@ -6,6 +6,22 @@
         <description>Most recent NetNewsWire changes with links to updates.</description>
         <language>en</language>
 
+<item>
+          <title>NetNewsWire 5.0a4</title>
+            <description><![CDATA[
+               <p>Sidebar: fixed a bug where a drag-and-drop that triggers an error could make the app unresponsive.</p>
+            	<p>Timeline: fixed sorting when two items have the same publication date. Added additional criteria so the sort is stable and predictable.</p>
+            	<p>Timeline: small avatars (16 x 16 favicons, for  instance) are now centered on a gray background. Looks a bit better.</p>
+            	<p>Added How to Support NetNewsWire help menu item.</p>
+	           <p>AppleScript: read/unread and starred status are now read/write via scripts.</p>
+						<p>Updated to the latest Sparkle — the thing that does these in-app version upgrades — which has better support Dark Mode. Also, it might fix a bug where Check for Updates… is sometimes not available when it should be. (Maybe.)</p>
+							<p><b>Status note:</b> At this point we have no known bugs to fix before 5.0 beta. No crashing bugs. All that remains is documentation. So, please keep looking for bugs! :)</p>
+							]]></description>
+            <pubDate>Sat, 15 Jun 2019 19:000:00 -0700</pubDate>
+            <enclosure url="https://ranchero.com/downloads/NetNewsWire5.0a4.zip" sparkle:version="2237" sparkle:shortVersionString="5.0a4" length="5147527" type="application/zip" />
+            <sparkle:minimumSystemVersion>10.14.4</sparkle:minimumSystemVersion>
+        </item>
+
 <item>
           <title>NetNewsWire 5.0a3</title>
             <description><![CDATA[

Frameworks/Account/AccountManager.swift

@@ -172,7 +172,7 @@ public final class AccountManager: UnreadCountProvider {
 			}
 		}
 
-		group.notify(queue: DispatchQueue.main) {
+		group.notify(queue: DispatchQueue.global(qos: .background)) {
 			completion?()
 		}
 	}

Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift

@@ -251,7 +251,9 @@ final class FeedbinAccountDelegate: AccountDelegate {
 			return
 		}
 		
+		refreshProgress.addToNumberOfTasksAndRemaining(1)
 		caller.renameTag(oldName: folder.name ?? "", newName: name) { result in
+			self.refreshProgress.completeTask()
 			switch result {
 			case .success:
 				DispatchQueue.main.async {
@@ -285,7 +287,9 @@ final class FeedbinAccountDelegate: AccountDelegate {
 				
 				if let feedTaggingID = feed.folderRelationship?[folder.name ?? ""] {
 					group.enter()
+					refreshProgress.addToNumberOfTasksAndRemaining(1)
 					caller.deleteTagging(taggingID: feedTaggingID) { result in
+						self.refreshProgress.completeTask()
 						group.leave()
 						switch result {
 						case .success:
@@ -302,7 +306,9 @@ final class FeedbinAccountDelegate: AccountDelegate {
 				
 				if let subscriptionID = feed.subscriptionID {
 					group.enter()
+					refreshProgress.addToNumberOfTasksAndRemaining(1)
 					caller.deleteSubscription(subscriptionID: subscriptionID) { result in
+						self.refreshProgress.completeTask()
 						group.leave()
 						switch result {
 						case .success:
@@ -329,7 +335,9 @@ final class FeedbinAccountDelegate: AccountDelegate {
 	
 	func createFeed(for account: Account, url: String, name: String?, container: Container, completion: @escaping (Result<Feed, Error>) -> Void) {
 		
+		refreshProgress.addToNumberOfTasksAndRemaining(1)
 		caller.createSubscription(url: url) { result in
+			self.refreshProgress.completeTask()
 			switch result {
 			case .success(let subResult):
 				switch subResult {
@@ -365,7 +373,9 @@ final class FeedbinAccountDelegate: AccountDelegate {
 			return
 		}
 		
+		refreshProgress.addToNumberOfTasksAndRemaining(1)
 		caller.renameSubscription(subscriptionID: subscriptionID, newName: name) { result in
+			self.refreshProgress.completeTask()
 			switch result {
 			case .success:
 				DispatchQueue.main.async {
@@ -408,7 +418,9 @@ final class FeedbinAccountDelegate: AccountDelegate {
 	func addFeed(for account: Account, with feed: Feed, to container: Container, completion: @escaping (Result<Void, Error>) -> Void) {
 		
 		if let folder = container as? Folder, let feedID = Int(feed.feedID) {
+			refreshProgress.addToNumberOfTasksAndRemaining(1)
 			caller.createTagging(feedID: feedID, name: folder.name ?? "") { result in
+				self.refreshProgress.completeTask()
 				switch result {
 				case .success(let taggingID):
 					DispatchQueue.main.async {
@@ -935,9 +947,13 @@ private extension FeedbinAccountDelegate {
 	}
 
 	func initialFeedDownload( account: Account, feed: Feed, completion: @escaping (Result<Feed, Error>) -> Void) {
-		
+
+		// refreshArticles is being reused and will clear one of the tasks for us
+		refreshProgress.addToNumberOfTasksAndRemaining(4)
+
 		// Download the initial articles
 		self.caller.retrieveEntries(feedID: feed.feedID) { result in
+			self.refreshProgress.completeTask()
 			
 			switch result {
 			case .success(let (entries, page)):
@@ -945,7 +961,9 @@ private extension FeedbinAccountDelegate {
 				self.processEntries(account: account, entries: entries) {
 					self.refreshArticles(account, page: page) {
 						self.refreshArticleStatus(for: account) {
+							self.refreshProgress.completeTask()
 							self.refreshMissingArticles(account) {
+								self.refreshProgress.completeTask()
 								DispatchQueue.main.async {
 									completion(.success(feed))
 								}
@@ -1191,7 +1209,9 @@ private extension FeedbinAccountDelegate {
 	func deleteTagging(for account: Account, with feed: Feed, from container: Container?, completion: @escaping (Result<Void, Error>) -> Void) {
 		
 		if let folder = container as? Folder, let feedTaggingID = feed.folderRelationship?[folder.name ?? ""] {
+			refreshProgress.addToNumberOfTasksAndRemaining(1)
 			caller.deleteTagging(taggingID: feedTaggingID) { result in
+				self.refreshProgress.completeTask()
 				switch result {
 				case .success:
 					DispatchQueue.main.async {
@@ -1224,7 +1244,9 @@ private extension FeedbinAccountDelegate {
 			return
 		}
 		
+		refreshProgress.addToNumberOfTasksAndRemaining(1)
 		caller.deleteSubscription(subscriptionID: subscriptionID) { result in
+			self.refreshProgress.completeTask()
 			switch result {
 			case .success:
 				DispatchQueue.main.async {

Frameworks/Account/LocalAccount/LocalAccountDelegate.swift

@@ -92,19 +92,23 @@ final class LocalAccountDelegate: AccountDelegate {
 			completion(.failure(LocalAccountDelegateError.invalidParameter))
 			return
 		}
-	
+		
+		refreshProgress.addToNumberOfTasksAndRemaining(1)
 		FeedFinder.find(url: url) { result in
 			
 			switch result {
 			case .success(let feedSpecifiers):
 				
+
 				guard let bestFeedSpecifier = FeedSpecifier.bestFeed(in: feedSpecifiers),
 					let url = URL(string: bestFeedSpecifier.urlString) else {
+						self.refreshProgress.completeTask()
 						completion(.failure(AccountError.createErrorNotFound))
 						return
 				}
 				
 				if account.hasFeed(withURL: bestFeedSpecifier.urlString) {
+					self.refreshProgress.completeTask()
 					completion(.failure(AccountError.createErrorAlreadySubscribed))
 					return
 				}
@@ -113,6 +117,8 @@ final class LocalAccountDelegate: AccountDelegate {
 				
 				InitialFeedDownloader.download(url) { parsedFeed in
 					
+					self.refreshProgress.completeTask()
+
 					if let parsedFeed = parsedFeed {
 						account.update(feed, with: parsedFeed, {})
 					}
@@ -125,6 +131,7 @@ final class LocalAccountDelegate: AccountDelegate {
 				}
 				
 			case .failure:
+				self.refreshProgress.completeTask()
 				completion(.failure(AccountError.createErrorNotFound))
 			}
 			

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h

@@ -0,0 +1,43 @@
+//
+//  SPUDownloadData.h
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 8/10/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+#import "SUExport.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ * A class for containing downloaded data along with some information about it.
+ */
+SU_EXPORT @interface SPUDownloadData : NSObject <NSSecureCoding>
+
+- (instancetype)initWithData:(NSData *)data textEncodingName:(NSString * _Nullable)textEncodingName MIMEType:(NSString * _Nullable)MIMEType;
+
+/*!
+ * The raw data that was downloaded.
+ */
+@property (nonatomic, readonly) NSData *data;
+
+/*!
+ * The IANA charset encoding name if available. Eg: "utf-8"
+ */
+@property (nonatomic, readonly, nullable, copy) NSString *textEncodingName;
+
+/*!
+ * The MIME type if available. Eg: "text/plain"
+ */
+@property (nonatomic, readonly, nullable, copy) NSString *MIMEType;
+
+@end
+
+NS_ASSUME_NONNULL_END

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloader.h

@@ -0,0 +1,25 @@
+//
+//  SPUDownloader.h
+//  Downloader
+//
+//  Created by Mayur Pawashe on 4/1/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SPUDownloaderProtocol.h"
+
+@protocol SPUDownloaderDelegate;
+
+// This object implements the protocol which we have defined. It provides the actual behavior for the service. It is 'exported' by the service to make it available to the process hosting the service over an NSXPCConnection.
+@interface SPUDownloader : NSObject <SPUDownloaderProtocol>
+
+// Due to XPC remote object reasons, this delegate is strongly referenced
+// Invoke cleanup when done with this instance
+- (instancetype)initWithDelegate:(id <SPUDownloaderDelegate>)delegate;
+
+@end

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h

@@ -0,0 +1,38 @@
+//
+//  SPUDownloaderDelegate.h
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 4/1/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SPUDownloadData;
+
+@protocol SPUDownloaderDelegate <NSObject>
+
+// This is only invoked for persistent downloads
+- (void)downloaderDidSetDestinationName:(NSString *)destinationName temporaryDirectory:(NSString *)temporaryDirectory;
+
+// Under rare cases, this may be called more than once, in which case the current progress should be reset back to 0
+// This is only invoked for persistent downloads
+- (void)downloaderDidReceiveExpectedContentLength:(int64_t)expectedContentLength;
+
+// This is only invoked for persistent downloads
+- (void)downloaderDidReceiveDataOfLength:(uint64_t)length;
+
+// downloadData is nil if this is a persisent download, otherwise it's non-nil if it's a temporary download
+- (void)downloaderDidFinishWithTemporaryDownloadData:(SPUDownloadData * _Nullable)downloadData;
+
+- (void)downloaderDidFailWithError:(NSError *)error;
+
+@end
+
+NS_ASSUME_NONNULL_END

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h

@@ -0,0 +1,13 @@
+//
+//  SPUDownloaderDeprecated.h
+//  Sparkle
+//
+//  Created by Deadpikle on 12/20/17.
+//  Copyright © 2017 Sparkle Project. All rights reserved.
+//
+
+#import "SPUDownloader.h"
+
+@interface SPUDownloaderDeprecated : SPUDownloader <SPUDownloaderProtocol>
+
+@end

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h

@@ -0,0 +1,34 @@
+//
+//  SPUDownloaderProtocol.h
+//  PersistentDownloader
+//
+//  Created by Mayur Pawashe on 4/1/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SPUURLRequest;
+
+// The protocol that this service will vend as its API. This header file will also need to be visible to the process hosting the service.
+@protocol SPUDownloaderProtocol
+
+- (void)startPersistentDownloadWithRequest:(SPUURLRequest *)request bundleIdentifier:(NSString *)bundleIdentifier desiredFilename:(NSString *)desiredFilename;
+
+- (void)startTemporaryDownloadWithRequest:(SPUURLRequest *)request;
+
+- (void)downloadDidFinish;
+
+- (void)cleanup;
+
+- (void)cancel;
+
+@end
+
+NS_ASSUME_NONNULL_END

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h

@@ -0,0 +1,20 @@
+//
+//  SPUDownloaderSession.h
+//  Sparkle
+//
+//  Created by Deadpikle on 12/20/17.
+//  Copyright © 2017 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SPUDownloader.h"
+#import "SPUDownloaderProtocol.h"
+
+NS_CLASS_AVAILABLE(NSURLSESSION_AVAILABLE, 7_0)
+@interface SPUDownloaderSession : SPUDownloader <SPUDownloaderProtocol>
+
+@end

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h

@@ -0,0 +1,35 @@
+//
+//  SPUURLRequest.h
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 5/19/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+// A class that wraps NSURLRequest and implements NSSecureCoding
+// This class exists because NSURLRequest did not support NSSecureCoding in macOS 10.8
+// I have not verified if NSURLRequest in 10.9 implements NSSecureCoding or not
+@interface SPUURLRequest : NSObject <NSSecureCoding>
+
+// Creates a new URL request
+// Only these properties are currently tracked:
+// * URL
+// * Cache policy
+// * Timeout interval
+// * HTTP header fields
+// * networkServiceType
++ (instancetype)URLRequestWithRequest:(NSURLRequest *)request;
+
+@property (nonatomic, readonly) NSURLRequest *request;
+
+@end
+
+NS_ASSUME_NONNULL_END

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUAppcast.h

@@ -9,19 +9,27 @@
 #ifndef SUAPPCAST_H
 #define SUAPPCAST_H
 
+#if __has_feature(modules)
+@import Foundation;
+#else
 #import <Foundation/Foundation.h>
+#endif
 #import "SUExport.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class SUAppcastItem;
-SU_EXPORT @interface SUAppcast : NSObject<NSURLDownloadDelegate>
+SU_EXPORT @interface SUAppcast : NSObject
 
-@property (copy) NSString *userAgentString;
-@property (copy) NSDictionary *httpHeaders;
+@property (copy, nullable) NSString *userAgentString;
+@property (copy, nullable) NSDictionary<NSString *, NSString *> *httpHeaders;
 
-- (void)fetchAppcastFromURL:(NSURL *)url completionBlock:(void (^)(NSError *))err;
+- (void)fetchAppcastFromURL:(NSURL *)url inBackground:(BOOL)bg completionBlock:(void (^)(NSError *_Nullable))err;
 - (SUAppcast *)copyWithoutDeltaUpdates;
 
-@property (readonly, copy) NSArray *items;
+@property (readonly, copy, nullable) NSArray *items;
 @end
 
+NS_ASSUME_NONNULL_END
+
 #endif

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h

@@ -9,19 +9,26 @@
 #ifndef SUAPPCASTITEM_H
 #define SUAPPCASTITEM_H
 
+#if __has_feature(modules)
+@import Foundation;
+#else
 #import <Foundation/Foundation.h>
+#endif
 #import "SUExport.h"
+@class SUSignatures;
 
 SU_EXPORT @interface SUAppcastItem : NSObject
 @property (copy, readonly) NSString *title;
-@property (copy, readonly) NSDate *date;
+@property (copy, readonly) NSString *dateString;
 @property (copy, readonly) NSString *itemDescription;
 @property (strong, readonly) NSURL *releaseNotesURL;
-@property (copy, readonly) NSString *DSASignature;
+@property (strong, readonly) SUSignatures *signatures;
 @property (copy, readonly) NSString *minimumSystemVersion;
 @property (copy, readonly) NSString *maximumSystemVersion;
 @property (strong, readonly) NSURL *fileURL;
+@property (nonatomic, readonly) uint64_t contentLength;
 @property (copy, readonly) NSString *versionString;
+@property (copy, readonly) NSString *osString;
 @property (copy, readonly) NSString *displayVersionString;
 @property (copy, readonly) NSDictionary *deltaUpdates;
 @property (strong, readonly) NSURL *infoURL;
@@ -32,6 +39,7 @@ SU_EXPORT @interface SUAppcastItem : NSObject
 
 @property (getter=isDeltaUpdate, readonly) BOOL deltaUpdate;
 @property (getter=isCriticalUpdate, readonly) BOOL criticalUpdate;
+@property (getter=isMacOsUpdate, readonly) BOOL macOsUpdate;
 @property (getter=isInformationOnlyUpdate, readonly) BOOL informationOnlyUpdate;
 
 // Returns the dictionary provided in initWithDictionary; this might be useful later for extensions.

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h

@@ -0,0 +1,22 @@
+//
+//  SUCodeSigningVerifier.h
+//  Sparkle
+//
+//  Created by Andy Matuschak on 7/5/12.
+//
+//
+
+#ifndef SUCODESIGNINGVERIFIER_H
+#define SUCODESIGNINGVERIFIER_H
+
+#import <Foundation/Foundation.h>
+#import "SUExport.h"
+
+SU_EXPORT @interface SUCodeSigningVerifier : NSObject
++ (BOOL)codeSignatureAtBundleURL:(NSURL *)oldBundlePath matchesSignatureAtBundleURL:(NSURL *)newBundlePath error:(NSError  **)error;
++ (BOOL)codeSignatureIsValidAtBundleURL:(NSURL *)bundlePath error:(NSError **)error;
++ (BOOL)bundleAtURLIsCodeSigned:(NSURL *)bundlePath;
++ (NSDictionary *)codeSignatureInfoAtBundleURL:(NSURL *)bundlePath;
+@end
+
+#endif

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUErrors.h

@@ -9,7 +9,11 @@
 #ifndef SUERRORS_H
 #define SUERRORS_H
 
+#if __has_feature(modules)
+@import Foundation;
+#else
 #import <Foundation/Foundation.h>
+#endif
 #import "SUExport.h"
 
 /**
@@ -17,16 +21,19 @@
  */
 SU_EXPORT extern NSString *const SUSparkleErrorDomain;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++98-compat"
 typedef NS_ENUM(OSStatus, SUError) {
     // Appcast phase errors.
     SUAppcastParseError = 1000,
     SUNoUpdateError = 1001,
     SUAppcastError = 1002,
     SURunningFromDiskImageError = 1003,
-    
-    // Downlaod phase errors.
+
+    // Download phase errors.
     SUTemporaryDirectoryError = 2000,
-    
+    SUDownloadError = 2001,
+
     // Extraction phase errors.
     SUUnarchivingError = 3000,
     SUSignatureError = 3001,
@@ -39,9 +46,11 @@ typedef NS_ENUM(OSStatus, SUError) {
     SURelaunchError = 4004,
     SUInstallationError = 4005,
     SUDowngradeError = 4006,
+    SUInstallationCancelledError = 4007,
     
     // System phase errors
     SUSystemPowerOffError = 5000
 };
+#pragma clang diagnostic pop
 
 #endif

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h

@@ -9,10 +9,16 @@
 #ifndef SUSTANDARDVERSIONCOMPARATOR_H
 #define SUSTANDARDVERSIONCOMPARATOR_H
 
+#if __has_feature(modules)
+@import Foundation;
+#else
 #import <Foundation/Foundation.h>
+#endif
 #import "SUExport.h"
 #import "SUVersionComparisonProtocol.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 /*!
     Sparkle's default version comparator.
 
@@ -22,8 +28,15 @@
 */
 SU_EXPORT @interface SUStandardVersionComparator : NSObject <SUVersionComparison>
 
+/*!
+    Initializes a new instance of the standard version comparator.
+ */
+- (instancetype)init;
+
 /*!
     Returns a singleton instance of the comparator.
+ 
+    It is usually preferred to alloc/init new a comparator instead.
 */
 + (SUStandardVersionComparator *)defaultComparator;
 
@@ -35,4 +48,5 @@ SU_EXPORT @interface SUStandardVersionComparator : NSObject <SUVersionComparison
 - (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB;
 @end
 
+NS_ASSUME_NONNULL_END
 #endif

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUUpdater.h

@@ -9,7 +9,11 @@
 #ifndef SUUPDATER_H
 #define SUUPDATER_H
 
-#import <Foundation/Foundation.h>
+#if __has_feature(modules)
+@import Cocoa;
+#else
+#import <Cocoa/Cocoa.h>
+#endif
 #import "SUExport.h"
 #import "SUVersionComparisonProtocol.h"
 #import "SUVersionDisplayProtocol.h"
@@ -28,62 +32,171 @@ SU_EXPORT @interface SUUpdater : NSObject
 
 @property (unsafe_unretained) IBOutlet id<SUUpdaterDelegate> delegate;
 
+/*!
+ The shared updater for the main bundle.
+ 
+ This is equivalent to passing [NSBundle mainBundle] to SUUpdater::updaterForBundle:
+ */
 + (SUUpdater *)sharedUpdater;
+
+/*!
+ The shared updater for a specified bundle.
+
+ If an updater has already been initialized for the provided bundle, that shared instance will be returned.
+ */
 + (SUUpdater *)updaterForBundle:(NSBundle *)bundle;
+
+/*!
+ Designated initializer for SUUpdater.
+ 
+ If an updater has already been initialized for the provided bundle, that shared instance will be returned.
+ */
 - (instancetype)initForBundle:(NSBundle *)bundle;
 
-@property (readonly, strong) NSBundle *hostBundle;
-@property (strong, readonly) NSBundle *sparkleBundle;
-
-@property BOOL automaticallyChecksForUpdates;
-
-@property NSTimeInterval updateCheckInterval;
-
 /*!
- * The URL of the appcast used to download update information.
- *
- * This property must be called on the main thread.
- */
-@property (copy) NSURL *feedURL;
+ Explicitly checks for updates and displays a progress dialog while doing so.
 
-@property (nonatomic, copy) NSString *userAgentString;
+ This method is meant for a main menu item.
+ Connect any menu item to this action in Interface Builder,
+ and Sparkle will check for updates and report back its findings verbosely
+ when it is invoked.
 
-@property (copy) NSDictionary *httpHeaders;
-
-@property BOOL sendsSystemProfile;
-
-@property BOOL automaticallyDownloadsUpdates;
-
-@property (nonatomic, copy) NSString *decryptionPassword;
-
-/*!
-    Explicitly checks for updates and displays a progress dialog while doing so.
-
-    This method is meant for a main menu item.
-    Connect any menu item to this action in Interface Builder,
-    and Sparkle will check for updates and report back its findings verbosely
-    when it is invoked.
+ This will find updates that the user has opted into skipping.
  */
 - (IBAction)checkForUpdates:(id)sender;
 
 /*!
-    Checks for updates, but does not display any UI unless an update is found.
+ The menu item validation used for the -checkForUpdates: action
+ */
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
 
-    This is meant for programmatically initating a check for updates. That is,
-    it will display no UI unless it actually finds an update, in which case it
-    proceeds as usual.
+/*!
+ Checks for updates, but does not display any UI unless an update is found.
 
-    If the fully automated updating is turned on, however, this will invoke that
-    behavior, and if an update is found, it will be downloaded and prepped for
-    installation.
+ This is meant for programmatically initating a check for updates. That is,
+ it will display no UI unless it actually finds an update, in which case it
+ proceeds as usual.
+
+ If automatic downloading of updates it turned on and allowed, however,
+ this will invoke that behavior, and if an update is found, it will be downloaded
+ in the background silently and will be prepped for installation.
+
+ This will not find updates that the user has opted into skipping.
  */
 - (void)checkForUpdatesInBackground;
 
 /*!
-    Checks for updates and, if available, immediately downloads and installs them.
+ A property indicating whether or not to check for updates automatically.
+
+ Setting this property will persist in the host bundle's user defaults.
+ The update schedule cycle will be reset in a short delay after the property's new value is set.
+ This is to allow reverting this property without kicking off a schedule change immediately
+ */
+@property BOOL automaticallyChecksForUpdates;
+
+/*!
+ A property indicating whether or not updates can be automatically downloaded in the background.
+
+ Note that automatic downloading of updates can be disallowed by the developer
+ or by the user's system if silent updates cannot be done (eg: if they require authentication).
+ In this case, -automaticallyDownloadsUpdates will return NO regardless of how this property is set.
+
+ Setting this property will persist in the host bundle's user defaults.
+ */
+@property BOOL automaticallyDownloadsUpdates;
+
+/*!
+ A property indicating the current automatic update check interval.
+
+ Setting this property will persist in the host bundle's user defaults.
+ The update schedule cycle will be reset in a short delay after the property's new value is set.
+ This is to allow reverting this property without kicking off a schedule change immediately
+ */
+@property NSTimeInterval updateCheckInterval;
+
+/*!
+ Begins a "probing" check for updates which will not actually offer to
+ update to that version.
+
+ However, the delegate methods
+ SUUpdaterDelegate::updater:didFindValidUpdate: and
+ SUUpdaterDelegate::updaterDidNotFindUpdate: will be called,
+ so you can use that information in your UI.
+
+ Updates that have been skipped by the user will not be found.
+ */
+- (void)checkForUpdateInformation;
+
+/*!
+ The URL of the appcast used to download update information.
+
+ Setting this property will persist in the host bundle's user defaults.
+ If you don't want persistence, you may want to consider instead implementing
+ SUUpdaterDelegate::feedURLStringForUpdater: or SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile:
+
+ This property must be called on the main thread.
+ */
+@property (copy) NSURL *feedURL;
+
+/*!
+ The host bundle that is being updated.
+ */
+@property (readonly, strong) NSBundle *hostBundle;
+
+/*!
+ The bundle this class (SUUpdater) is loaded into.
+ */
+@property (strong, readonly) NSBundle *sparkleBundle;
+
+/*!
+ The user agent used when checking for updates.
+
+ The default implementation can be overrided.
+ */
+@property (nonatomic, copy) NSString *userAgentString;
+
+/*!
+ The HTTP headers used when checking for updates.
+
+ The keys of this dictionary are HTTP header fields (NSString) and values are corresponding values (NSString)
+ */
+@property (copy) NSDictionary<NSString *, NSString *> *httpHeaders;
+
+/*!
+ A property indicating whether or not the user's system profile information is sent when checking for updates.
+
+ Setting this property will persist in the host bundle's user defaults.
+ */
+@property BOOL sendsSystemProfile;
+
+/*!
+ A property indicating the decryption password used for extracting updates shipped as Apple Disk Images (dmg)
+ */
+@property (nonatomic, copy) NSString *decryptionPassword;
+
+/*!
+    This function ignores normal update schedule, ignores user preferences,
+    and interrupts users with an unwanted immediate app update.
+
+    WARNING: this function should not be used in regular apps. This function
+    is a user-unfriendly hack only for very special cases, like unstable
+    rapidly-changing beta builds that would not run correctly if they were
+    even one day out of date.
+
+    Instead of this function you should set `SUAutomaticallyUpdate` to `YES`,
+    which will gracefully install updates when the app quits.
+
+    For UI-less/daemon apps that aren't usually quit, instead of this function,
+    you can use the delegate method
+    SUUpdaterDelegate::updater:willInstallUpdateOnQuit:immediateInstallationInvocation:
+    to immediately start installation when an update was found.
+
     A progress dialog is shown but the user will never be prompted to read the
     release notes.
-    
+
+    This function will cause update to be downloaded twice if automatic updates are
+    enabled.
+
     You may want to respond to the userDidCancelDownload delegate method in case
     the user clicks the "Cancel" button while the update is downloading.
  */
@@ -96,17 +209,6 @@ SU_EXPORT @interface SUUpdater : NSObject
  */
 @property (readonly, copy) NSDate *lastUpdateCheckDate;
 
-/*!
-    Begins a "probing" check for updates which will not actually offer to
-    update to that version.
-
-    However, the delegate methods
-    SUUpdaterDelegate::updater:didFindValidUpdate: and
-    SUUpdaterDelegate::updaterDidNotFindUpdate: will be called,
-    so you can use that information in your UI.
- */
-- (void)checkForUpdateInformation;
-
 /*!
     Appropriately schedules or cancels the update checking timer according to
     the preferences for time interval and automatic checks.
@@ -116,251 +218,14 @@ SU_EXPORT @interface SUUpdater : NSObject
  */
 - (void)resetUpdateCycle;
 
+/*!
+   A property indicating whether or not an update is in progress.
+
+   Note this property is not indicative of whether or not user initiated updates can be performed.
+   Use SUUpdater::validateMenuItem: for that instead.
+ */
 @property (readonly) BOOL updateInProgress;
 
 @end
 
-// -----------------------------------------------------------------------------
-// SUUpdater Notifications for events that might be interesting to more than just the delegate
-// The updater will be the notification object
-// -----------------------------------------------------------------------------
-SU_EXPORT extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification;
-SU_EXPORT extern NSString *const SUUpdaterDidFindValidUpdateNotification;
-SU_EXPORT extern NSString *const SUUpdaterDidNotFindUpdateNotification;
-SU_EXPORT extern NSString *const SUUpdaterWillRestartNotification;
-#define SUUpdaterWillRelaunchApplicationNotification SUUpdaterWillRestartNotification;
-#define SUUpdaterWillInstallUpdateNotification SUUpdaterWillRestartNotification;
-
-// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification userInfo
-SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey;
-// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo
-SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
-
-// -----------------------------------------------------------------------------
-//	SUUpdater Delegate:
-// -----------------------------------------------------------------------------
-
-/*!
-    Provides methods to control the behavior of an SUUpdater object.
- */
-@protocol SUUpdaterDelegate <NSObject>
-@optional
-
-/*!
-    Returns whether to allow Sparkle to pop up.
-
-    For example, this may be used to prevent Sparkle from interrupting a setup assistant.
-
-    \param updater The SUUpdater instance.
- */
-- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)updater;
-
-/*!
-    Returns additional parameters to append to the appcast URL's query string.
-
-    This is potentially based on whether or not Sparkle will also be sending along the system profile.
-
-    \param updater The SUUpdater instance.
-    \param sendingProfile Whether the system profile will also be sent.
-
-    \return An array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user.
- */
-- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile;
-
-/*!
-    Returns a custom appcast URL.
-
-    Override this to dynamically specify the entire URL.
-
-    \param updater The SUUpdater instance.
- */
-- (NSString *)feedURLStringForUpdater:(SUUpdater *)updater;
-
-/*!
-    Returns whether Sparkle should prompt the user about automatic update checks.
-
-    Use this to override the default behavior.
-
-    \param updater The SUUpdater instance.
- */
-- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)updater;
-
-/*!
-    Called after Sparkle has downloaded the appcast from the remote server.
-
-    Implement this if you want to do some special handling with the appcast once it finishes loading.
-
-    \param updater The SUUpdater instance.
-    \param appcast The appcast that was downloaded from the remote server.
- */
-- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast;
-
-/*!
-    Returns the item in the appcast corresponding to the update that should be installed.
-
-    If you're using special logic or extensions in your appcast,
-    implement this to use your own logic for finding a valid update, if any,
-    in the given appcast.
-
-    \param appcast The appcast that was downloaded from the remote server.
-    \param updater The SUUpdater instance.
- */
-- (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)updater;
-
-/*!
-    Called when a valid update is found by the update driver.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that is proposed to be installed.
- */
-- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item;
-
-/*!
-    Called when a valid update is not found.
-
-    \param updater The SUUpdater instance.
- */
-- (void)updaterDidNotFindUpdate:(SUUpdater *)updater;
-
-/*!
-    Called immediately before downloading the specified update.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that is proposed to be downloaded.
-    \param request The mutable URL request that will be used to download the update.
- */
-- (void)updater:(SUUpdater *)updater willDownloadUpdate:(SUAppcastItem *)item withRequest:(NSMutableURLRequest *)request;
-
-/*!
-    Called after the specified update failed to download.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that failed to download.
-    \param error The error generated by the failed download.
- */
-- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error;
-
-/*!
-    Called when the user clicks the cancel button while and update is being downloaded.
-
-    \param updater The SUUpdater instance.
- */
-- (void)userDidCancelDownload:(SUUpdater *)updater;
-
-/*!
-    Called immediately before installing the specified update.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that is proposed to be installed.
- */
-- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)item;
-
-/*!
-    Returns whether the relaunch should be delayed in order to perform other tasks.
-
-    This is not called if the user didn't relaunch on the previous update,
-    in that case it will immediately restart.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that is proposed to be installed.
-    \param invocation The invocation that must be completed before continuing with the relaunch.
-
-    \return \c YES to delay the relaunch until \p invocation is invoked.
- */
-- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvoking:(NSInvocation *)invocation;
-
-/*!
-    Returns whether the application should be relaunched at all.
-
-    Some apps \b cannot be relaunched under certain circumstances.
-    This method can be used to explicitly prevent a relaunch.
-
-    \param updater The SUUpdater instance.
- */
-- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater;
-
-/*!
-    Called immediately before relaunching.
-
-    \param updater The SUUpdater instance.
- */
-- (void)updaterWillRelaunchApplication:(SUUpdater *)updater;
-
-/*!
-    Returns an object that compares version numbers to determine their arithmetic relation to each other.
-
-    This method allows you to provide a custom version comparator.
-    If you don't implement this method or return \c nil,
-    the standard version comparator will be used.
-
-    \sa SUStandardVersionComparator
-
-    \param updater The SUUpdater instance.
- */
-- (id<SUVersionComparison>)versionComparatorForUpdater:(SUUpdater *)updater;
-
-/*!
-    Returns an object that formats version numbers for display to the user.
-
-    If you don't implement this method or return \c nil,
-    the standard version formatter will be used.
-
-    \sa SUUpdateAlert
-
-    \param updater The SUUpdater instance.
- */
-- (id<SUVersionDisplay>)versionDisplayerForUpdater:(SUUpdater *)updater;
-
-/*!
-    Returns the path which is used to relaunch the client after the update is installed.
-
-    The default is the path of the host bundle.
-
-    \param updater The SUUpdater instance.
- */
-- (NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater;
-
-/*!
-    Called before an updater shows a modal alert window,
-    to give the host the opportunity to hide attached windows that may get in the way.
-
-    \param updater The SUUpdater instance.
- */
-- (void)updaterWillShowModalAlert:(SUUpdater *)updater;
-
-/*!
-    Called after an updater shows a modal alert window,
-    to give the host the opportunity to hide attached windows that may get in the way.
-
-    \param updater The SUUpdater instance.
- */
-- (void)updaterDidShowModalAlert:(SUUpdater *)updater;
-
-/*!
-    Called when an update is scheduled to be silently installed on quit.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that is proposed to be installed.
-    \param invocation Can be used to trigger an immediate silent install and relaunch.
- */
-- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationInvocation:(NSInvocation *)invocation;
-
-/*!
-    Calls after an update that was scheduled to be silently installed on quit has been canceled.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that was proposed to be installed.
- */
-- (void)updater:(SUUpdater *)updater didCancelInstallUpdateOnQuit:(SUAppcastItem *)item;
-
-/*!
-    Called after an update is aborted due to an error.
-
-    \param updater The SUUpdater instance.
-    \param error The error that caused the abort
- */
-- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error;
-
-@end
-
 #endif

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h

@@ -0,0 +1,301 @@
+//
+//  SUUpdaterDelegate.h
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 12/25/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+#import "SUExport.h"
+
+@protocol SUVersionComparison, SUVersionDisplay;
+@class SUUpdater, SUAppcast, SUAppcastItem;
+
+NS_ASSUME_NONNULL_BEGIN
+
+// -----------------------------------------------------------------------------
+// SUUpdater Notifications for events that might be interesting to more than just the delegate
+// The updater will be the notification object
+// -----------------------------------------------------------------------------
+SU_EXPORT extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification;
+SU_EXPORT extern NSString *const SUUpdaterDidFindValidUpdateNotification;
+SU_EXPORT extern NSString *const SUUpdaterDidNotFindUpdateNotification;
+SU_EXPORT extern NSString *const SUUpdaterWillRestartNotification;
+#define SUUpdaterWillRelaunchApplicationNotification SUUpdaterWillRestartNotification;
+#define SUUpdaterWillInstallUpdateNotification SUUpdaterWillRestartNotification;
+
+// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification userInfo
+SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey;
+// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo
+SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
+
+// -----------------------------------------------------------------------------
+//	SUUpdater Delegate:
+// -----------------------------------------------------------------------------
+
+/*!
+ Provides methods to control the behavior of an SUUpdater object.
+ */
+@protocol SUUpdaterDelegate <NSObject>
+@optional
+
+/*!
+ Returns whether to allow Sparkle to pop up.
+ 
+ For example, this may be used to prevent Sparkle from interrupting a setup assistant.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)updater;
+
+/*!
+ Returns additional parameters to append to the appcast URL's query string.
+ 
+ This is potentially based on whether or not Sparkle will also be sending along the system profile.
+ 
+ \param updater The SUUpdater instance.
+ \param sendingProfile Whether the system profile will also be sent.
+ 
+ \return An array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user.
+ */
+- (NSArray<NSDictionary<NSString *, NSString *> *> *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile;
+
+/*!
+ Returns a custom appcast URL.
+ 
+ Override this to dynamically specify the entire URL.
+ 
+ An alternative may be to use SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile:
+ and let the server handle what kind of feed to provide.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (nullable NSString *)feedURLStringForUpdater:(SUUpdater *)updater;
+
+/*!
+ Returns whether Sparkle should prompt the user about automatic update checks.
+ 
+ Use this to override the default behavior.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)updater;
+
+/*!
+ Called after Sparkle has downloaded the appcast from the remote server.
+ 
+ Implement this if you want to do some special handling with the appcast once it finishes loading.
+ 
+ \param updater The SUUpdater instance.
+ \param appcast The appcast that was downloaded from the remote server.
+ */
+- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast;
+
+/*!
+ Returns the item in the appcast corresponding to the update that should be installed.
+ 
+ If you're using special logic or extensions in your appcast,
+ implement this to use your own logic for finding a valid update, if any,
+ in the given appcast.
+ 
+ \param appcast The appcast that was downloaded from the remote server.
+ \param updater The SUUpdater instance.
+ */
+- (nullable SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)updater;
+
+/*!
+ Called when a valid update is found by the update driver.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ */
+- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called when a valid update is not found.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterDidNotFindUpdate:(SUUpdater *)updater;
+
+/*!
+ Called immediately before downloading the specified update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be downloaded.
+ \param request The mutable URL request that will be used to download the update.
+ */
+- (void)updater:(SUUpdater *)updater willDownloadUpdate:(SUAppcastItem *)item withRequest:(NSMutableURLRequest *)request;
+
+/*!
+ Called immediately after succesfull download of the specified update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that has been downloaded.
+ */
+- (void)updater:(SUUpdater *)updater didDownloadUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called after the specified update failed to download.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that failed to download.
+ \param error The error generated by the failed download.
+ */
+- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error;
+
+/*!
+ Called when the user clicks the cancel button while and update is being downloaded.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)userDidCancelDownload:(SUUpdater *)updater;
+
+/*!
+ Called immediately before extracting the specified downloaded update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be extracted.
+ */
+- (void)updater:(SUUpdater *)updater willExtractUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called immediately after extracting the specified downloaded update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that has been extracted.
+ */
+- (void)updater:(SUUpdater *)updater didExtractUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called immediately before installing the specified update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ */
+- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)item;
+
+/*!
+ Returns whether the relaunch should be delayed in order to perform other tasks.
+ 
+ This is not called if the user didn't relaunch on the previous update,
+ in that case it will immediately restart.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ \param invocation The invocation that must be completed with `[invocation invoke]` before continuing with the relaunch.
+ 
+ \return \c YES to delay the relaunch until \p invocation is invoked.
+ */
+- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvoking:(NSInvocation *)invocation;
+
+/*!
+ Returns whether the application should be relaunched at all.
+ 
+ Some apps \b cannot be relaunched under certain circumstances.
+ This method can be used to explicitly prevent a relaunch.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater;
+
+/*!
+ Called immediately before relaunching.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterWillRelaunchApplication:(SUUpdater *)updater;
+
+/*!
+ Called immediately after relaunching. SUUpdater delegate must be set before applicationDidFinishLaunching: to catch this event.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterDidRelaunchApplication:(SUUpdater *)updater;
+
+/*!
+ Returns an object that compares version numbers to determine their arithmetic relation to each other.
+ 
+ This method allows you to provide a custom version comparator.
+ If you don't implement this method or return \c nil,
+ the standard version comparator will be used.
+ 
+ \sa SUStandardVersionComparator
+ 
+ \param updater The SUUpdater instance.
+ */
+- (nullable id<SUVersionComparison>)versionComparatorForUpdater:(SUUpdater *)updater;
+
+/*!
+ Returns an object that formats version numbers for display to the user.
+ 
+ If you don't implement this method or return \c nil,
+ the standard version formatter will be used.
+ 
+ \sa SUUpdateAlert
+ 
+ \param updater The SUUpdater instance.
+ */
+- (nullable id<SUVersionDisplay>)versionDisplayerForUpdater:(SUUpdater *)updater;
+
+/*!
+ Returns the path which is used to relaunch the client after the update is installed.
+ 
+ The default is the path of the host bundle.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (nullable NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater;
+
+/*!
+ Called before an updater shows a modal alert window,
+ to give the host the opportunity to hide attached windows that may get in the way.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterWillShowModalAlert:(SUUpdater *)updater;
+
+/*!
+ Called after an updater shows a modal alert window,
+ to give the host the opportunity to hide attached windows that may get in the way.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterDidShowModalAlert:(SUUpdater *)updater;
+
+/*!
+ Called when an update is scheduled to be silently installed on quit.
+ This is after an update has been automatically downloaded in the background.
+ (i.e. SUUpdater::automaticallyDownloadsUpdates is YES)
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ \param invocation Can be used to trigger an immediate silent install and relaunch.
+ */
+- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationInvocation:(NSInvocation *)invocation;
+
+/*!
+ Calls after an update that was scheduled to be silently installed on quit has been canceled.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that was proposed to be installed.
+ */
+- (void)updater:(SUUpdater *)updater didCancelInstallUpdateOnQuit:(SUAppcastItem *)item;
+
+/*!
+ Called after an update is aborted due to an error.
+ 
+ \param updater The SUUpdater instance.
+ \param error The error that caused the abort
+ */
+- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error;
+
+@end
+
+NS_ASSUME_NONNULL_END

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h

@@ -9,9 +9,15 @@
 #ifndef SUVERSIONCOMPARISONPROTOCOL_H
 #define SUVERSIONCOMPARISONPROTOCOL_H
 
-#import <Cocoa/Cocoa.h>
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
 #import "SUExport.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 /*!
     Provides version comparison facilities for Sparkle.
 */
@@ -27,4 +33,5 @@
 
 @end
 
+NS_ASSUME_NONNULL_END
 #endif

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h

@@ -6,7 +6,11 @@
 //  Copyright 2009 Elgato Systems GmbH. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
 #import "SUExport.h"
 
 /*!
@@ -20,6 +24,6 @@
     Both versions are provided so that important distinguishing information
     can be displayed while also leaving out unnecessary/confusing parts.
 */
-- (void)formatVersion:(NSString **)inOutVersionA andVersion:(NSString **)inOutVersionB;
+- (void)formatVersion:(NSString *_Nonnull*_Nonnull)inOutVersionA andVersion:(NSString *_Nonnull*_Nonnull)inOutVersionB;
 
 @end

Frameworks/Vendor/Sparkle.framework/Versions/A/Headers/Sparkle.h

@@ -9,8 +9,6 @@
 #ifndef SPARKLE_H
 #define SPARKLE_H
 
-#import <Cocoa/Cocoa.h>
-
 // This list should include the shared headers. It doesn't matter if some of them aren't shared (unless
 // there are name-space collisions) so we can list all of them to start with:
 
@@ -18,8 +16,18 @@
 #import "SUAppcastItem.h"
 #import "SUStandardVersionComparator.h"
 #import "SUUpdater.h"
+#import "SUUpdaterDelegate.h"
 #import "SUVersionComparisonProtocol.h"
 #import "SUVersionDisplayProtocol.h"
 #import "SUErrors.h"
 
+#import "SPUDownloader.h"
+#import "SPUDownloaderDelegate.h"
+#import "SPUDownloaderDeprecated.h"
+#import "SPUDownloadData.h"
+#import "SPUDownloaderProtocol.h"
+#import "SPUDownloaderSession.h"
+#import "SPUURLRequest.h"
+#import "SUCodeSigningVerifier.h"
+
 #endif

Frameworks/Vendor/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h

@@ -6,31 +6,16 @@
 //  Copyright 2006 Andy Matuschak. All rights reserved.
 //
 
-#ifndef SUUNARCHIVER_H
-#define SUUNARCHIVER_H
-
 #import <Foundation/Foundation.h>
 
-@class SUHost;
-@protocol SUUnarchiverDelegate;
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol SUUnarchiverProtocol;
 
 @interface SUUnarchiver : NSObject
 
-@property (copy, readonly) NSString *archivePath;
-@property (copy, readonly) NSString *updateHostBundlePath;
-@property (copy, readonly) NSString *decryptionPassword;
-@property (weak) id<SUUnarchiverDelegate> delegate;
++ (nullable id <SUUnarchiverProtocol>)unarchiverForPath:(NSString *)path updatingHostBundlePath:(nullable NSString *)hostPath decryptionPassword:(nullable NSString *)decryptionPassword;
 
-+ (SUUnarchiver *)unarchiverForPath:(NSString *)path updatingHostBundlePath:(NSString *)host withPassword:(NSString *)decryptionPassword;
-
-- (void)start;
 @end
 
-@protocol SUUnarchiverDelegate <NSObject>
-- (void)unarchiverDidFinish:(SUUnarchiver *)unarchiver;
-- (void)unarchiverDidFail:(SUUnarchiver *)unarchiver;
-@optional
-- (void)unarchiver:(SUUnarchiver *)unarchiver extractedProgress:(double)progress;
-@end
-
-#endif
+NS_ASSUME_NONNULL_END

Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist

@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>15E49a</string>
+	<string>18D42</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>Autoupdate</string>
 	<key>CFBundleIconFile</key>
-	<string>AppIcon</string>
+	<string>AppIcon.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.sparkle-project.Sparkle.Autoupdate</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.14.0</string>
+	<string>1.21.3 18-g1ff157710</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,21 +25,21 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.14.0</string>
+	<string>1.21.3</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7C1002</string>
+	<string>10B61</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>15C43</string>
+	<string>18B71</string>
 	<key>DTSDKName</key>
-	<string>macosx10.11</string>
+	<string>macosx10.14</string>
 	<key>DTXcode</key>
-	<string>0721</string>
+	<string>1010</string>
 	<key>DTXcodeBuild</key>
-	<string>7C1002</string>
+	<string>10B61</string>
 	<key>LSBackgroundOnly</key>
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>

Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/DarkAqua.css

@@ -0,0 +1,9 @@
+html {
+    color: #FFFFFFD8;
+}
+:link {
+    color: #419CFF;
+}
+:link:active {
+    color: #FF1919;
+}

Frameworks/Vendor/Sparkle.framework/Versions/A/Resources/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>15E49a</string>
+	<string>18D42</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.14.0</string>
+	<string>1.21.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,20 +25,20 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.14.0</string>
+	<string>1.21.3</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7C1002</string>
+	<string>10B61</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>15C43</string>
+	<string>18B71</string>
 	<key>DTSDKName</key>
-	<string>macosx10.11</string>
+	<string>macosx10.14</string>
 	<key>DTXcode</key>
-	<string>0721</string>
+	<string>1010</string>
 	<key>DTXcodeBuild</key>
-	<string>7C1002</string>
+	<string>10B61</string>
 </dict>
 </plist>