Merge pull request #3 from stuartbreckenridge/main

Sparke 2.x with symlinks removed
Ranchero-Software · Dec 2, 2020 · 67cd263 · 67cd263
2 parents 6b6d1d4 + c05134b
commit 67cd263
Show file tree

Hide file tree

Showing 31 changed files with 107 additions and 116 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,8 +1,8 @@
 // swift-tools-version:5.3
 import PackageDescription
 
-let version = "2.0.0-beta1"
-let checksum = "373e8426a83e6f61f52191420ee9c59c5c898b86dbf9a3ca0f6cc06db0bbb6f6"
+let version = "2.0.0-beta2"
+let checksum = "f43283ba6a7974a4cb863306cff672f6818666b4e19f3fa5ae1ffa4ed1cb9b09"
 let url = "https://github.com/sparkle-project/Sparkle/releases/download/\(version)/Sparkle-SPM-\(version).zip"
 
 

diff --git a/Sources/RSSparkleXPC/Resources/org.sparkle-project.Downloader.xpc/Contents/Info.plist b/Sources/RSSparkleXPC/Resources/org.sparkle-project.Downloader.xpc/Contents/Info.plist
@@ -29,19 +29,19 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>12B45b</string>
+	<string>12C5020f</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>11.0</string>
+	<string>11.1</string>
 	<key>DTSDKBuild</key>
-	<string>20A2408</string>
+	<string>20C5048g</string>
 	<key>DTSDKName</key>
-	<string>macosx11.0</string>
+	<string>macosx11.1</string>
 	<key>DTXcode</key>
-	<string>1220</string>
+	<string>1230</string>
 	<key>DTXcodeBuild</key>
-	<string>12B45b</string>
+	<string>12C5020f</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.9</string>
 	<key>NSAppTransportSecurity</key>

diff --git a/...esources/org.sparkle-project.Downloader.xpc/Contents/MacOS/org.sparkle-project.Downloader b/...esources/org.sparkle-project.Downloader.xpc/Contents/MacOS/org.sparkle-project.Downloader
diff --git a/...es/RSSparkleXPC/Resources/org.sparkle-project.InstallerConnection.xpc/Contents/Info.plist b/...es/RSSparkleXPC/Resources/org.sparkle-project.InstallerConnection.xpc/Contents/Info.plist
@@ -29,19 +29,19 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>12B45b</string>
+	<string>12C5020f</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>11.0</string>
+	<string>11.1</string>
 	<key>DTSDKBuild</key>
-	<string>20A2408</string>
+	<string>20C5048g</string>
 	<key>DTSDKName</key>
-	<string>macosx11.0</string>
+	<string>macosx11.1</string>
 	<key>DTXcode</key>
-	<string>1220</string>
+	<string>1230</string>
 	<key>DTXcodeBuild</key>
-	<string>12B45b</string>
+	<string>12C5020f</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.9</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/...le-project.InstallerConnection.xpc/Contents/MacOS/org.sparkle-project.InstallerConnection b/...le-project.InstallerConnection.xpc/Contents/MacOS/org.sparkle-project.InstallerConnection
diff --git a/Sources/RSSparkleXPC/Resources/org.sparkle-project.InstallerLauncher.xpc/Contents/Info.plist b/Sources/RSSparkleXPC/Resources/org.sparkle-project.InstallerLauncher.xpc/Contents/Info.plist
@@ -29,19 +29,19 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>12B45b</string>
+	<string>12C5020f</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>11.0</string>
+	<string>11.1</string>
 	<key>DTSDKBuild</key>
-	<string>20A2408</string>
+	<string>20C5048g</string>
 	<key>DTSDKName</key>
-	<string>macosx11.0</string>
+	<string>macosx11.1</string>
 	<key>DTXcode</key>
-	<string>1220</string>
+	<string>1230</string>
 	<key>DTXcodeBuild</key>
-	<string>12B45b</string>
+	<string>12C5020f</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.9</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/...SSparkleXPC/Resources/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Autoupdate b/...SSparkleXPC/Resources/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Autoupdate
diff --git a/.../org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Info.plist b/.../org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Info.plist
@@ -29,19 +29,19 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>12B45b</string>
+	<string>12C5020f</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>11.0</string>
+	<string>11.1</string>
 	<key>DTSDKBuild</key>
-	<string>20A2408</string>
+	<string>20C5048g</string>
 	<key>DTSDKName</key>
-	<string>macosx11.0</string>
+	<string>macosx11.1</string>
 	<key>DTXcode</key>
-	<string>1220</string>
+	<string>1230</string>
 	<key>DTXcodeBuild</key>
-	<string>12B45b</string>
+	<string>12C5020f</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.9</string>
 	<key>LSUIElement</key>

diff --git a/...g.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/MacOS/Updater b/...g.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/MacOS/Updater
diff --git a/...e-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/fr_CA.lproj b/...e-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/fr_CA.lproj
diff --git a/...rkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/pt.lproj b/...rkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/pt.lproj
diff --git a/...ct.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/_CodeSignature/CodeResources b/...ct.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/_CodeSignature/CodeResources
@@ -422,11 +422,6 @@
 			<key>optional</key>
 			<true/>
 		</dict>
-		<key>Resources/fr_CA.lproj</key>
-		<dict>
-			<key>symlink</key>
-			<string>fr.lproj</string>
-		</dict>
 		<key>Resources/he.lproj/Sparkle.strings</key>
 		<dict>
 			<key>hash</key>
@@ -531,11 +526,6 @@
 			<key>optional</key>
 			<true/>
 		</dict>
-		<key>Resources/pt.lproj</key>
-		<dict>
-			<key>symlink</key>
-			<string>pt_BR.lproj</string>
-		</dict>
 		<key>Resources/pt_BR.lproj/Sparkle.strings</key>
 		<dict>
 			<key>hash</key>

diff --git a/...parkle-project.InstallerLauncher.xpc/Contents/MacOS/org.sparkle-project.InstallerLauncher b/...parkle-project.InstallerLauncher.xpc/Contents/MacOS/org.sparkle-project.InstallerLauncher
diff --git a/...Resources/org.sparkle-project.InstallerLauncher.xpc/Contents/_CodeSignature/CodeResources b/...Resources/org.sparkle-project.InstallerLauncher.xpc/Contents/_CodeSignature/CodeResources
@@ -10,19 +10,19 @@
 		<dict>
 			<key>cdhash</key>
 			<data>
-			4u6dcWJ/FUGEoMzv+dGop57DXtw=
+			u0qoh2VvBAW6fJEeoXorKHXvhHs=
 			</data>
 			<key>requirement</key>
-			<string>cdhash H"658a70b9d2d389c086433126ff259ee263247b29" or cdhash H"e2ee9d71627f154184a0cceff9d1a8a79ec35edc" or cdhash H"86f6cbd23c573f1aab41c027d28c8c2ba4ea0124" or cdhash H"a666ab9b660affc2ddf89855f05983e54e78a422"</string>
+			<string>cdhash H"20af53f81a546e8334a00fb69c11e37db6dafad2" or cdhash H"bb4aa887656f0405ba7c911ea17a2b2875ef847b" or cdhash H"2e2d7ac632e3634bf426103b3adb73ebe854946a" or cdhash H"2874c18997b7d8e1754efb4483db6a7723402063"</string>
 		</dict>
 		<key>MacOS/Updater.app</key>
 		<dict>
 			<key>cdhash</key>
 			<data>
-			Vd1bV7RYKTFw7rrVvq4vORweSNw=
+			h4o7I1a2kCGl7LiHOV5QKE7dHAg=
 			</data>
 			<key>requirement</key>
-			<string>cdhash H"55c5f5c21d7a1b677908ef0951c008f170413490" or cdhash H"55dd5b57b458293170eebad5beae2f391c1e48dc" or cdhash H"934f6e08232316efc5e602b37471ff2825f20d1a" or cdhash H"cff78d762d3bf40e44394124a874ec43129f0879"</string>
+			<string>cdhash H"1fe27afbf32de48bc327fb837cda4203af9a5678" or cdhash H"878a3b2356b69021a5ecb887395e50284edd1c08" or cdhash H"8f28a4f46acf89c87da9377362334f2ce224b521" or cdhash H"d7fdaab6ca5b9cf986f0d819b555c3d1f57b99e5"</string>
 		</dict>
 	</dict>
 	<key>rules</key>

diff --git a/Sources/RSSparkleXPC/Resources/org.sparkle-project.InstallerStatus.xpc/Contents/Info.plist b/Sources/RSSparkleXPC/Resources/org.sparkle-project.InstallerStatus.xpc/Contents/Info.plist
@@ -29,19 +29,19 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>12B45b</string>
+	<string>12C5020f</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>11.0</string>
+	<string>11.1</string>
 	<key>DTSDKBuild</key>
-	<string>20A2408</string>
+	<string>20C5048g</string>
 	<key>DTSDKName</key>
-	<string>macosx11.0</string>
+	<string>macosx11.1</string>
 	<key>DTXcode</key>
-	<string>1220</string>
+	<string>1230</string>
 	<key>DTXcodeBuild</key>
-	<string>12B45b</string>
+	<string>12C5020f</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.9</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/...rg.sparkle-project.InstallerStatus.xpc/Contents/MacOS/org.sparkle-project.InstallerStatus b/...rg.sparkle-project.InstallerStatus.xpc/Contents/MacOS/org.sparkle-project.InstallerStatus
diff --git a/Sparkle.xcframework/macos-arm64_x86_64/.DS_Store b/Sparkle.xcframework/macos-arm64_x86_64/.DS_Store
diff --git a/Sparkle.xcframework/macos-arm64_x86_64/Sparkle.framework/Versions/A/Headers/SPUUpdater.h b/Sparkle.xcframework/macos-arm64_x86_64/Sparkle.framework/Versions/A/Headers/SPUUpdater.h
@@ -207,6 +207,12 @@ SU_EXPORT @interface SPUUpdater : NSObject
  */
 - (void)resetUpdateCycle;
 
+
+/*!
+ The system profile information that is sent when checking for updates
+ */
+@property (nonatomic, readonly, copy) NSArray<NSDictionary<NSString *, NSString *> *> *systemProfileArray;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/....xcframework/macos-arm64_x86_64/Sparkle.framework/Versions/A/Headers/SPUUpdaterDelegate.h b/....xcframework/macos-arm64_x86_64/Sparkle.framework/Versions/A/Headers/SPUUpdaterDelegate.h
@@ -37,6 +37,22 @@ SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey;
 // Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo
 SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
 
+// -----------------------------------------------------------------------------
+//    System Profile Keys
+// -----------------------------------------------------------------------------
+
+SU_EXPORT extern NSString *const SUSystemProfilerApplicationNameKey;
+SU_EXPORT extern NSString *const SUSystemProfilerApplicationVersionKey;
+SU_EXPORT extern NSString *const SUSystemProfilerCPU64bitKey;
+SU_EXPORT extern NSString *const SUSystemProfilerCPUCountKey;
+SU_EXPORT extern NSString *const SUSystemProfilerCPUFrequencyKey;
+SU_EXPORT extern NSString *const SUSystemProfilerCPUTypeKey;
+SU_EXPORT extern NSString *const SUSystemProfilerCPUSubtypeKey;
+SU_EXPORT extern NSString *const SUSystemProfilerHardwareModelKey;
+SU_EXPORT extern NSString *const SUSystemProfilerMemoryKey;
+SU_EXPORT extern NSString *const SUSystemProfilerOperatingSystemVersionKey;
+SU_EXPORT extern NSString *const SUSystemProfilerPreferredLanguageKey;
+
 // -----------------------------------------------------------------------------
 //	SPUUpdater Delegate:
 // -----------------------------------------------------------------------------
@@ -99,6 +115,21 @@ typedef NS_ENUM(NSInteger, SPUUpdateCheck)
 - (NSArray *)feedParametersForUpdater:(SPUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile;
 #endif
 
+/*!
+ Returns a list of system profile keys to be appended to the appcast URL's query string.
+
+ If this is unimplemented then all keys will be included.
+
+ \param updater The updater instance.
+
+ \return An array of system profile keys to include in the appcast URL's query string. Elements must be one of the SUSystemProfiler*Key constants
+ */
+#if __has_feature(objc_generics)
+- (NSArray<NSString *> *)allowedSystemProfileKeysForUpdater:(SPUUpdater *)updater;
+#else
+- (NSArray *)allowedSystemProfileKeysForUpdater:(SPUUpdater *)updater;
+#endif
+
 /*!
  Returns a custom appcast URL.
  

diff --git a/Sparkle.xcframework/macos-arm64_x86_64/Sparkle.framework/Versions/A/Resources/Autoupdate b/Sparkle.xcframework/macos-arm64_x86_64/Sparkle.framework/Versions/A/Resources/Autoupdate
diff --git a/Sparkle.xcframework/macos-arm64_x86_64/Sparkle.framework/Versions/A/Resources/Info.plist b/Sparkle.xcframework/macos-arm64_x86_64/Sparkle.framework/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>20B5022a</string>
+	<string>20C5048k</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0 1010-g94d05336</string>
+	<string>2.0.0 1011-geac45228</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -29,19 +29,19 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>12B5035g</string>
+	<string>12C5020f</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>11.0</string>
+	<string>11.1</string>
 	<key>DTSDKBuild</key>
-	<string>20A5395d</string>
+	<string>20C5048g</string>
 	<key>DTSDKName</key>
-	<string>macosx11.0</string>
+	<string>macosx11.1</string>
 	<key>DTXcode</key>
-	<string>1220</string>
+	<string>1230</string>
 	<key>DTXcodeBuild</key>
-	<string>12B5035g</string>
+	<string>12C5020f</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.9</string>
 </dict>

diff --git a/...macos-arm64_x86_64/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Info.plist b/...macos-arm64_x86_64/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>20B5022a</string>
+	<string>20C5048k</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -29,19 +29,19 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>12B5035g</string>
+	<string>12C5020f</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>11.0</string>
+	<string>11.1</string>
 	<key>DTSDKBuild</key>
-	<string>20A5395d</string>
+	<string>20C5048g</string>
 	<key>DTSDKName</key>
-	<string>macosx11.0</string>
+	<string>macosx11.1</string>
 	<key>DTXcode</key>
-	<string>1220</string>
+	<string>1230</string>
 	<key>DTXcodeBuild</key>
-	<string>12B5035g</string>
+	<string>12C5020f</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.9</string>
 	<key>LSUIElement</key>

diff --git a/...os-arm64_x86_64/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/MacOS/Updater b/...os-arm64_x86_64/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/MacOS/Updater
diff --git a/..._x86_64/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/fr_CA.lproj b/..._x86_64/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/fr_CA.lproj
diff --git a/...m64_x86_64/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/pt.lproj b/...m64_x86_64/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/pt.lproj
diff --git a/.../Sparkle.framework/Versions/A/Resources/Updater.app/Contents/_CodeSignature/CodeResources b/.../Sparkle.framework/Versions/A/Resources/Updater.app/Contents/_CodeSignature/CodeResources
@@ -422,11 +422,6 @@
 			<key>optional</key>
 			<true/>
 		</dict>
-		<key>Resources/fr_CA.lproj</key>
-		<dict>
-			<key>symlink</key>
-			<string>fr.lproj</string>
-		</dict>
 		<key>Resources/he.lproj/Sparkle.strings</key>
 		<dict>
 			<key>hash</key>
@@ -531,11 +526,6 @@
 			<key>optional</key>
 			<true/>
 		</dict>
-		<key>Resources/pt.lproj</key>
-		<dict>
-			<key>symlink</key>
-			<string>pt_BR.lproj</string>
-		</dict>
 		<key>Resources/pt_BR.lproj/Sparkle.strings</key>
 		<dict>
 			<key>hash</key>

diff --git a/Sparkle.xcframework/macos-arm64_x86_64/Sparkle.framework/Versions/A/Resources/fr_CA.lproj b/Sparkle.xcframework/macos-arm64_x86_64/Sparkle.framework/Versions/A/Resources/fr_CA.lproj
diff --git a/Sparkle.xcframework/macos-arm64_x86_64/Sparkle.framework/Versions/A/Resources/pt.lproj b/Sparkle.xcframework/macos-arm64_x86_64/Sparkle.framework/Versions/A/Resources/pt.lproj
diff --git a/Sparkle.xcframework/macos-arm64_x86_64/Sparkle.framework/Versions/A/Sparkle b/Sparkle.xcframework/macos-arm64_x86_64/Sparkle.framework/Versions/A/Sparkle