diff options
22 files changed, 63 insertions, 29 deletions
diff --git a/macosx/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h b/macosx/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h index 41cd57434..41cd57434 100755..100644 --- a/macosx/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h +++ b/macosx/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h diff --git a/macosx/Sparkle.framework/Versions/A/Headers/SPUDownloader.h b/macosx/Sparkle.framework/Versions/A/Headers/SPUDownloader.h index 5eee9bd5e..5eee9bd5e 100755..100644 --- a/macosx/Sparkle.framework/Versions/A/Headers/SPUDownloader.h +++ b/macosx/Sparkle.framework/Versions/A/Headers/SPUDownloader.h diff --git a/macosx/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h b/macosx/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h index 76e7e750a..76e7e750a 100755..100644 --- a/macosx/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h +++ b/macosx/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h diff --git a/macosx/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h b/macosx/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h index ebe477fe7..ebe477fe7 100755..100644 --- a/macosx/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h +++ b/macosx/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h diff --git a/macosx/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h b/macosx/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h index 694961470..694961470 100755..100644 --- a/macosx/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h +++ b/macosx/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h diff --git a/macosx/Sparkle.framework/Versions/A/Headers/SUAppcast.h b/macosx/Sparkle.framework/Versions/A/Headers/SUAppcast.h index f2f433895..34276b7da 100644 --- a/macosx/Sparkle.framework/Versions/A/Headers/SUAppcast.h +++ b/macosx/Sparkle.framework/Versions/A/Headers/SUAppcast.h @@ -22,12 +22,7 @@ NS_ASSUME_NONNULL_BEGIN SU_EXPORT @interface SUAppcast : NSObject @property (copy, nullable) NSString *userAgentString; - -#if __has_feature(objc_generics) @property (copy, nullable) NSDictionary<NSString *, NSString *> *httpHeaders; -#else -@property (copy, nullable) NSDictionary *httpHeaders; -#endif - (void)fetchAppcastFromURL:(NSURL *)url inBackground:(BOOL)bg completionBlock:(void (^)(NSError *_Nullable))err; - (SUAppcast *)copyWithoutDeltaUpdates; diff --git a/macosx/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h b/macosx/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h new file mode 100644 index 000000000..f034cd20f --- /dev/null +++ b/macosx/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 diff --git a/macosx/Sparkle.framework/Versions/A/Headers/SUUpdater.h b/macosx/Sparkle.framework/Versions/A/Headers/SUUpdater.h index a47447559..bc1d49163 100644 --- a/macosx/Sparkle.framework/Versions/A/Headers/SUUpdater.h +++ b/macosx/Sparkle.framework/Versions/A/Headers/SUUpdater.h @@ -160,11 +160,7 @@ SU_EXPORT @interface SUUpdater : NSObject The keys of this dictionary are HTTP header fields (NSString) and values are corresponding values (NSString) */ -#if __has_feature(objc_generics) @property (copy) NSDictionary<NSString *, NSString *> *httpHeaders; -#else -@property (copy) NSDictionary *httpHeaders; -#endif /*! A property indicating whether or not the user's system profile information is sent when checking for updates. diff --git a/macosx/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h b/macosx/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h index dbc140240..86d1eb9e9 100644 --- a/macosx/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h +++ b/macosx/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h @@ -64,11 +64,7 @@ SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey; \return An array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user. */ -#if __has_feature(objc_generics) - (NSArray<NSDictionary<NSString *, NSString *> *> *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile; -#else -- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile; -#endif /*! Returns a custom appcast URL. @@ -138,6 +134,14 @@ SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey; - (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. @@ -154,6 +158,22 @@ SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey; - (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. diff --git a/macosx/Sparkle.framework/Versions/A/Headers/Sparkle.h b/macosx/Sparkle.framework/Versions/A/Headers/Sparkle.h index 661b1312b..5ae2e6a6d 100644 --- a/macosx/Sparkle.framework/Versions/A/Headers/Sparkle.h +++ b/macosx/Sparkle.framework/Versions/A/Headers/Sparkle.h @@ -28,5 +28,6 @@ #import "SPUDownloaderProtocol.h" #import "SPUDownloaderSession.h" #import "SPUURLRequest.h" +#import "SUCodeSigningVerifier.h" #endif diff --git a/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist b/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist index 9008e169a..5f899bd94 100644 --- a/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist +++ b/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>BuildMachineOSBuild</key> - <string>17F35e</string> + <string>18A326h</string> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleExecutable</key> @@ -17,7 +17,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.19.0</string> + <string>1.20.0</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleSupportedPlatforms</key> @@ -25,21 +25,21 @@ <string>MacOSX</string> </array> <key>CFBundleVersion</key> - <string>1.19.0</string> + <string>1.20.0</string> <key>DTCompiler</key> <string>com.apple.compilers.llvm.clang.1_0</string> <key>DTPlatformBuild</key> - <string>9C34b</string> + <string>10L176w</string> <key>DTPlatformVersion</key> <string>GM</string> <key>DTSDKBuild</key> - <string>17C67a</string> + <string>18A293s</string> <key>DTSDKName</key> - <string>macosx10.13</string> + <string>macosx10.14</string> <key>DTXcode</key> - <string>0920</string> + <string>1000</string> <key>DTXcodeBuild</key> - <string>9C34b</string> + <string>10L176w</string> <key>LSBackgroundOnly</key> <string>1</string> <key>LSMinimumSystemVersion</key> diff --git a/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate b/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate Binary files differindex e252ce6bd..e6b7b2f45 100755 --- a/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate +++ b/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate diff --git a/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop b/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop Binary files differindex 7ef8291eb..bc0b942cd 100755 --- a/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop +++ b/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop diff --git a/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib b/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib Binary files differindex d7904ddc2..da18126a3 100644 --- a/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib +++ b/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib diff --git a/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings b/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings Binary files differnew file mode 100644 index 000000000..698dc6737 --- /dev/null +++ b/macosx/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings diff --git a/macosx/Sparkle.framework/Versions/A/Resources/Info.plist b/macosx/Sparkle.framework/Versions/A/Resources/Info.plist index 922de9dcf..6c98df952 100644 --- a/macosx/Sparkle.framework/Versions/A/Resources/Info.plist +++ b/macosx/Sparkle.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>BuildMachineOSBuild</key> - <string>17F35e</string> + <string>18A326h</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.19.0</string> + <string>1.20.0</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleSupportedPlatforms</key> @@ -25,20 +25,20 @@ <string>MacOSX</string> </array> <key>CFBundleVersion</key> - <string>1.19.0</string> + <string>1.20.0</string> <key>DTCompiler</key> <string>com.apple.compilers.llvm.clang.1_0</string> <key>DTPlatformBuild</key> - <string>9C34b</string> + <string>10L176w</string> <key>DTPlatformVersion</key> <string>GM</string> <key>DTSDKBuild</key> - <string>17C67a</string> + <string>18A293s</string> <key>DTSDKName</key> - <string>macosx10.13</string> + <string>macosx10.14</string> <key>DTXcode</key> - <string>0920</string> + <string>1000</string> <key>DTXcodeBuild</key> - <string>9C34b</string> + <string>10L176w</string> </dict> </plist> diff --git a/macosx/Sparkle.framework/Versions/A/Resources/SUStatus.nib b/macosx/Sparkle.framework/Versions/A/Resources/SUStatus.nib Binary files differindex d7904ddc2..da18126a3 100644 --- a/macosx/Sparkle.framework/Versions/A/Resources/SUStatus.nib +++ b/macosx/Sparkle.framework/Versions/A/Resources/SUStatus.nib diff --git a/macosx/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings b/macosx/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings Binary files differnew file mode 100644 index 000000000..698dc6737 --- /dev/null +++ b/macosx/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings diff --git a/macosx/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib b/macosx/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib Binary files differdeleted file mode 100644 index 4236118ee..000000000 --- a/macosx/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib +++ /dev/null diff --git a/macosx/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib b/macosx/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib Binary files differdeleted file mode 100644 index 44ea780df..000000000 --- a/macosx/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib +++ /dev/null diff --git a/macosx/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib b/macosx/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib Binary files differdeleted file mode 100644 index 1dd0f7849..000000000 --- a/macosx/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib +++ /dev/null diff --git a/macosx/Sparkle.framework/Versions/A/Sparkle b/macosx/Sparkle.framework/Versions/A/Sparkle Binary files differindex 6bbd14b15..7e7be76cd 100755 --- a/macosx/Sparkle.framework/Versions/A/Sparkle +++ b/macosx/Sparkle.framework/Versions/A/Sparkle |