Merge pull request #262 from jmjones88/master

Merge several outstanding pull requests and update for Xcode 7.3.

Thanks everyone!

.travis.yml

@@ -1,2 +1,3 @@
+osx_image: xcode7.3
 language: objective-c
 script: make hermes XCB=xctool

Frameworks/Sparkle.framework/Modules

@@ -0,0 +1 @@
+Versions/Current/Modules

Frameworks/Sparkle.framework/PrivateHeaders

@@ -0,0 +1 @@
+Versions/Current/PrivateHeaders

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

@@ -9,28 +9,18 @@
 #ifndef SUAPPCAST_H
 #define SUAPPCAST_H
 
-@class SUAppcastItem;
-@interface SUAppcast : NSObject
-{
-@private
-	NSArray *items;
-	NSString *userAgentString;
-	id delegate;
-	NSString *downloadFilename;
-	NSURLDownload *download;
-}
+#import <Foundation/Foundation.h>
+#import "SUExport.h"
 
-- (void)fetchAppcastFromURL:(NSURL *)url;
-- (void)setDelegate:delegate;
-- (void)setUserAgentString:(NSString *)userAgentString;
+@class SUAppcastItem;
+SU_EXPORT @interface SUAppcast : NSObject<NSURLDownloadDelegate>
 
-- (NSArray *)items;
+@property (copy) NSString *userAgentString;
+@property (copy) NSDictionary *httpHeaders;
 
-@end
+- (void)fetchAppcastFromURL:(NSURL *)url completionBlock:(void (^)(NSError *))err;
 
-@interface NSObject (SUAppcastDelegate)
-- (void)appcastDidFinishLoading:(SUAppcast *)appcast;
-- (void)appcast:(SUAppcast *)appcast failedToLoadWithError:(NSError *)error;
+@property (readonly, copy) NSArray *items;
 @end
 
 #endif

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

@@ -9,51 +9,35 @@
 #ifndef SUAPPCASTITEM_H
 #define SUAPPCASTITEM_H
 
-@interface SUAppcastItem : NSObject
-{
-@private
-	NSString *title;
-	NSDate *date;
-	NSString *itemDescription;
-
-	NSURL *releaseNotesURL;
-
-	NSString *DSASignature;	
-	NSString *minimumSystemVersion;
-    NSString *maximumSystemVersion;
-
-	NSURL *fileURL;
-	NSString *versionString;
-	NSString *displayVersionString;
-
-	NSDictionary *deltaUpdates;
-
-	NSDictionary *propertiesDictionary;
-
-	NSURL *infoURL;	// UK 2007-08-31
-}
+#import <Foundation/Foundation.h>
+#import "SUExport.h"
+
+SU_EXPORT @interface SUAppcastItem : NSObject
+@property (copy, readonly) NSString *title;
+@property (copy, readonly) NSDate *date;
+@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 (copy, readonly) NSString *versionString;
+@property (copy, readonly) NSString *displayVersionString;
+@property (copy, readonly) NSDictionary *deltaUpdates;
+@property (strong, readonly) NSURL *infoURL;
 
 // Initializes with data from a dictionary provided by the RSS class.
-- initWithDictionary:(NSDictionary *)dict;
-- initWithDictionary:(NSDictionary *)dict failureReason:(NSString**)error;
-
-- (NSString *)title;
-- (NSString *)versionString;
-- (NSString *)displayVersionString;
-- (NSDate *)date;
-- (NSString *)itemDescription;
-- (NSURL *)releaseNotesURL;
-- (NSURL *)fileURL;
-- (NSString *)DSASignature;
-- (NSString *)minimumSystemVersion;
-- (NSString *)maximumSystemVersion;
-- (NSDictionary *)deltaUpdates;
-- (BOOL)isDeltaUpdate;
+- (instancetype)initWithDictionary:(NSDictionary *)dict;
+- (instancetype)initWithDictionary:(NSDictionary *)dict failureReason:(NSString **)error;
+
+@property (getter=isDeltaUpdate, readonly) BOOL deltaUpdate;
+@property (getter=isCriticalUpdate, readonly) BOOL criticalUpdate;
+@property (getter=isInformationOnlyUpdate, readonly) BOOL informationOnlyUpdate;
 
 // Returns the dictionary provided in initWithDictionary; this might be useful later for extensions.
-- (NSDictionary *)propertiesDictionary;
+@property (readonly, copy) NSDictionary *propertiesDictionary;
 
-- (NSURL *)infoURL;						// UK 2007-08-31
+- (NSURL *)infoURL;
 
 @end
 

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

@@ -0,0 +1,47 @@
+//
+//  SUErrors.h
+//  Sparkle
+//
+//  Created by C.W. Betts on 10/13/14.
+//  Copyright (c) 2014 Sparkle Project. All rights reserved.
+//
+
+#ifndef SUERRORS_H
+#define SUERRORS_H
+
+#import <Foundation/Foundation.h>
+#import "SUExport.h"
+
+/**
+ * Error domain used by Sparkle
+ */
+SU_EXPORT extern NSString *const SUSparkleErrorDomain;
+
+typedef NS_ENUM(OSStatus, SUError) {
+    // Appcast phase errors.
+    SUAppcastParseError = 1000,
+    SUNoUpdateError = 1001,
+    SUAppcastError = 1002,
+    SURunningFromDiskImageError = 1003,
+
+    // Downlaod phase errors.
+    SUTemporaryDirectoryError = 2000,
+
+    // Extraction phase errors.
+    SUUnarchivingError = 3000,
+    SUSignatureError = 3001,
+
+    // Installation phase errors.
+    SUFileCopyFailure = 4000,
+    SUAuthenticationFailure = 4001,
+    SUMissingUpdateError = 4002,
+    SUMissingInstallerToolError = 4003,
+    SURelaunchError = 4004,
+    SUInstallationError = 4005,
+    SUDowngradeError = 4006,
+
+    // System phase errors
+    SUSystemPowerOffError = 5000
+};
+
+#endif

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

@@ -0,0 +1,18 @@
+//
+//  SUExport.h
+//  Sparkle
+//
+//  Created by Jake Petroules on 2014-08-23.
+//  Copyright (c) 2014 Sparkle Project. All rights reserved.
+//
+
+#ifndef SUEXPORT_H
+#define SUEXPORT_H
+
+#ifdef BUILDING_SPARKLE
+#define SU_EXPORT __attribute__((visibility("default")))
+#else
+#define SU_EXPORT
+#endif
+
+#endif

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

@@ -0,0 +1,38 @@
+//
+//  SUStandardVersionComparator.h
+//  Sparkle
+//
+//  Created by Andy Matuschak on 12/21/07.
+//  Copyright 2007 Andy Matuschak. All rights reserved.
+//
+
+#ifndef SUSTANDARDVERSIONCOMPARATOR_H
+#define SUSTANDARDVERSIONCOMPARATOR_H
+
+#import <Foundation/Foundation.h>
+#import "SUExport.h"
+#import "SUVersionComparisonProtocol.h"
+
+/*!
+    Sparkle's default version comparator.
+
+    This comparator is adapted from MacPAD, by Kevin Ballard.
+    It's "dumb" in that it does essentially string comparison,
+    in components split by character type.
+*/
+SU_EXPORT @interface SUStandardVersionComparator : NSObject <SUVersionComparison>
+
+/*!
+    Returns a singleton instance of the comparator.
+*/
++ (SUStandardVersionComparator *)defaultComparator;
+
+/*!
+    Compares version strings through textual analysis.
+
+    See the implementation for more details.
+*/
+- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB;
+@end
+
+#endif