Version 4.2 Release

* First signed version * Updated Sparkle to version 1.18.1
hrubymar10 · Mar 1, 2018 · b40fbe9 · b40fbe9
1 parent 71a76cb
commit b40fbe9
Show file tree

Hide file tree

Showing 167 changed files with 697 additions and 292 deletions.
diff --git a/GoofySwift.xcodeproj/project.pbxproj b/GoofySwift.xcodeproj/project.pbxproj
@@ -17,6 +17,7 @@
 		33A2E9721B6E41990079CB65 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 33A2E96F1B6E40D90079CB65 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		33B93A6B1AD68BE2003EBDDE /* MenuHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33B93A6A1AD68BE2003EBDDE /* MenuHandler.swift */; };
 		33C741E01A2B02840072D81E /* NotificationScriptMessageHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33C741DF1A2B02840072D81E /* NotificationScriptMessageHandler.swift */; };
+		460340C1204891EF00CF147C /* GoofySwift_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 460340BF204891C900CF147C /* GoofySwift_pub.pem */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -46,6 +47,7 @@
 		33A2E96F1B6E40D90079CB65 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
 		33B93A6A1AD68BE2003EBDDE /* MenuHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuHandler.swift; sourceTree = "<group>"; };
 		33C741DF1A2B02840072D81E /* NotificationScriptMessageHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationScriptMessageHandler.swift; sourceTree = "<group>"; };
+		460340BF204891C900CF147C /* GoofySwift_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GoofySwift_pub.pem; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -100,6 +102,7 @@
 			isa = PBXGroup;
 			children = (
 				33942F9B1A2AE7F700E6D361 /* Info.plist */,
+				460340BF204891C900CF147C /* GoofySwift_pub.pem */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -181,6 +184,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				460340C1204891EF00CF147C /* GoofySwift_pub.pem in Resources */,
 				3327A60D1AD16EA100B71853 /* WKPreferences+DevExtras.m in Resources */,
 				33942F9F1A2AE7F700E6D361 /* Images.xcassets in Resources */,
 				33942FA21A2AE7F700E6D361 /* MainMenu.xib in Resources */,

diff --git a/GoofySwift/GoofySwift_pub.pem b/GoofySwift/GoofySwift_pub.pem
@@ -0,0 +1,36 @@
+-----BEGIN PUBLIC KEY-----
+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
+DcjSO3fxwOyO8EnYssmVujbqY3tmgizDQGrH
+-----END PUBLIC KEY-----
diff --git a/GoofySwift/Info.plist b/GoofySwift/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1</string>
+	<string>4.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1158</string>
+	<string>1163</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.social-networking</string>
 	<key>LSMinimumSystemVersion</key>
@@ -43,6 +43,8 @@
 	<true/>
 	<key>SUFeedURL</key>
 	<string>https://raw.githubusercontent.com/hrubymar10/goofy_swift/master/update_feed.xml</string>
+	<key>SUPublicDSAKeyFile</key>
+	<string>GoofySwift_pub.pem</string>
 	<key>SUScheduledCheckInterval</key>
 	<integer>86400</integer>
 </dict>

diff --git a/Sparkle.framework/Versions/A/Headers/SUAppcast.h b/Sparkle.framework/Versions/A/Headers/SUAppcast.h
@@ -9,18 +9,32 @@
 #ifndef SUAPPCAST_H
 #define SUAPPCAST_H
 
-#import <Foundation/NSURLDownload.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>
 
-@property (copy) NSString *userAgentString;
-@property (copy) NSDictionary *httpHeaders;
+@property (copy, nullable) NSString *userAgentString;
 
-- (void)fetchAppcastFromURL:(NSURL *)url completionBlock:(void (^)(NSError *))err;
+#if __has_feature(objc_generics)
+@property (copy, nullable) NSDictionary<NSString *, NSString *> *httpHeaders;
+#else
+@property (copy, nullable) NSDictionary *httpHeaders;
+#endif
 
-@property (readonly, copy) NSArray *items;
+- (void)fetchAppcastFromURL:(NSURL *)url inBackground:(BOOL)bg completionBlock:(void (^)(NSError *_Nullable))err;
+- (SUAppcast *)copyWithoutDeltaUpdates;
+
+@property (readonly, copy, nullable) NSArray *items;
 @end
 
+NS_ASSUME_NONNULL_END
+
 #endif
diff --git a/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h b/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h
@@ -9,18 +9,25 @@
 #ifndef SUAPPCASTITEM_H
 #define SUAPPCASTITEM_H
 
-#include "SUExport.h"
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SUExport.h"
 
 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 (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;
@@ -31,6 +38,8 @@ 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.
 @property (readonly, copy) NSDictionary *propertiesDictionary;

diff --git a/Sparkle.framework/Versions/A/Headers/SUErrors.h b/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"
 
 /**
@@ -23,10 +27,11 @@ typedef NS_ENUM(OSStatus, SUError) {
     SUNoUpdateError = 1001,
     SUAppcastError = 1002,
     SURunningFromDiskImageError = 1003,
-    
-    // Downlaod phase errors.
+
+    // Download phase errors.
     SUTemporaryDirectoryError = 2000,
-
+    SUDownloadError = 2001,
+
     // Extraction phase errors.
     SUUnarchivingError = 3000,
     SUSignatureError = 3001,
@@ -38,7 +43,11 @@ typedef NS_ENUM(OSStatus, SUError) {
     SUMissingInstallerToolError = 4003,
     SURelaunchError = 4004,
     SUInstallationError = 4005,
-    SUDowngradeError = 4006
+    SUDowngradeError = 4006,
+    SUInstallationCancelledError = 4007,
+
+    // System phase errors
+    SUSystemPowerOffError = 5000
 };
 
 #endif
diff --git a/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h b/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h
@@ -9,9 +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.
 
@@ -21,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;
 
@@ -34,4 +48,5 @@ SU_EXPORT @interface SUStandardVersionComparator : NSObject <SUVersionComparison
 - (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB;
 @end
 
+NS_ASSUME_NONNULL_END
 #endif