Experimentally upgrading in preparation for universal binary

Update to mainline (3.30) ShortcutRecorder2; update to mainline (1.26)
Sparkle.

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "ShortcutRecorder"]
 	path = ShortcutRecorder
-	url = git://github.com/snark/ShortcutRecorder.git
+	url = git://github.com/Kentzo/ShortcutRecorder.git

Jumpcut/AppDelegate.m

@@ -133,7 +133,7 @@ - (void)keyboardInputSourceChanged:(NSNotification *)notification
     self.veeCode = findVeeCode();
 }
 
-CGKeyCode findVeeCode() {
+CGKeyCode findVeeCode(void) {
     // Under ShortcutRecorder 1, there was a programatic method to determine a keyCode for a given character.
     // This no longer exists in the 64-bit-compatible ShortcutRecorder 2, so we need to do a quick check to
     // determine what matches "v"; this is 9 in the default case of English, QWERTY keyboards, which we optimize

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

@@ -9,11 +9,7 @@
 #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

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

@@ -34,6 +34,7 @@ SU_EXPORT @interface SUAppcastItem : NSObject
 @property (copy, readonly) NSDictionary *deltaUpdates;
 @property (strong, readonly) NSURL *infoURL;
 @property (copy, readonly) NSNumber* phasedRolloutInterval;
+@property (copy, readonly) NSString *minimumAutoupdateVersion;
 
 // Initializes with data from a dictionary provided by the RSS class.
 - (instancetype)initWithDictionary:(NSDictionary *)dict;

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

@@ -30,6 +30,7 @@ typedef NS_ENUM(OSStatus, SUError) {
     SUAppcastError = 1002,
     SURunningFromDiskImageError = 1003,
     SURunningTranslocated = 1004,
+    SUWebKitTerminationError = 1005,
 
     // Download phase errors.
     SUTemporaryDirectoryError = 2000,

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

@@ -149,14 +149,14 @@ SU_EXPORT @interface SUUpdater : NSObject
 @property (strong, readonly) NSBundle *sparkleBundle;
 
 /*!
- The user agent used when checking for updates.
+ The user agent used when checking for and downloading updates.
 
  The default implementation can be overrided.
  */
 @property (nonatomic, copy) NSString *userAgentString;
 
 /*!
- The HTTP headers used when checking for updates.
+ The HTTP headers used when checking for and downloading updates.
 
  The keys of this dictionary are HTTP header fields (NSString) and values are corresponding values (NSString)
  */
@@ -202,7 +202,7 @@ SU_EXPORT @interface SUUpdater : NSObject
     You may want to respond to the userDidCancelDownload delegate method in case
     the user clicks the "Cancel" button while the update is downloading.
  */
-- (void)installUpdatesIfAvailable;
+- (void)installUpdatesIfAvailable __attribute__((deprecated("This method is deprecated. Please set SUAutomaticallyUpdate in your Info.plist or use automaticallyDownloadsUpdates property instead.")));
 
 /*!
     Returns the date of last update check.

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

@@ -36,7 +36,7 @@ SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey;
 SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
 
 // -----------------------------------------------------------------------------
-//	SUUpdater Delegate:
+// SUUpdater Delegate:
 // -----------------------------------------------------------------------------
 
 /*!
@@ -141,6 +141,13 @@ SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
  */
 - (void)updaterDidNotFindUpdate:(SUUpdater *)updater;
 
+/*!
+ Called when the user clicks the Skip This Version button.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updater:(SUUpdater *)updater userDidSkipThisVersion:(SUAppcastItem *)item;
+
 /*!
  Called immediately before downloading the specified update.
  

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

@@ -12,6 +12,10 @@
 // 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:
 
+#pragma clang diagnostic push
+// Do not use <> style includes since 2.x has two frameworks that need to work: Sparkle and SparkleCore
+#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header"
+
 #import "SUAppcast.h"
 #import "SUAppcastItem.h"
 #import "SUStandardVersionComparator.h"
@@ -23,11 +27,12 @@
 
 #import "SPUDownloader.h"
 #import "SPUDownloaderDelegate.h"
-#import "SPUDownloaderDeprecated.h"
 #import "SPUDownloadData.h"
 #import "SPUDownloaderProtocol.h"
 #import "SPUDownloaderSession.h"
 #import "SPUURLRequest.h"
 #import "SUCodeSigningVerifier.h"
 
+#pragma clang diagnostic pop
+
 #endif

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

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>18G59b</string>
+	<string>20E5186d</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -17,33 +17,35 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.22.0rc1 53-g9ae7224a4</string>
+	<string>1.26.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.22.0rc1</string>
+	<string>1.26.0</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>10E1001</string>
+	<string>12C5020f</string>
+	<key>DTPlatformName</key>
+	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>GM</string>
+	<string>11.1</string>
 	<key>DTSDKBuild</key>
-	<string>18E219</string>
+	<string>20C5048g</string>
 	<key>DTSDKName</key>
-	<string>macosx10.14</string>
+	<string>macosx11.1</string>
 	<key>DTXcode</key>
-	<string>1020</string>
+	<string>1230</string>
 	<key>DTXcodeBuild</key>
-	<string>10E1001</string>
+	<string>12C5020f</string>
 	<key>LSBackgroundOnly</key>
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.7</string>
+	<string>10.9</string>
 	<key>LSUIElement</key>
 	<string>1</string>
 	<key>NSMainNibFile</key>