Merge branch 'master' of https://github.com/sparkle-project/Sparkle i…

…nto mac/working

* 'master' of https://github.com/sparkle-project/Sparkle: (55 commits)
  Fix timeout in testDeprecatedDownloader()
  Update Croatian (sparkle-project#1603)
  Only use Xcode 10.3 and 11.4
  Fix SUCodeSigningVerifierTest on macOS 10.15
  Only run tests on Xcode 10+
  Set Swift Language Version to 4.2 in top level config
  Fix CI test script
  Remove old code coverage configurations
  Fail the build if xcodebuild runs into an error
  Remove brew update, nothing is being installed afterwards
  Use build matrix to test on multiple Xcode versions
  Allow force tries and force casts in tests
  Relax rules a bit
  Run SwiftLint autocorrect
  Add SwiftLint config
  Persian translation
  Revert "Persian translations"
  Persian translations
  Sets UpdateAlert and AutomaticUpdateAlert window's fullscreen collectionBehavior to NSWindowCollectionBehaviorFullScreenAuxiliary to allow them to present on top of the Main App's window if it's fullscreen.
  Improve best appcast item selection handling
  ...

# Conflicts:
#	Sparkle.xcodeproj/project.pbxproj

.github/ISSUE_TEMPLATE/other-issues.md → .github/ISSUE_TEMPLATE/other-issues-1.md

@@ -2,7 +2,7 @@
 name: Other issues
 about: Found a bug? Want to implement a new feature?
 title: ''
-labels: ''
+labels: '1.x'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/other-issues-2.md

@@ -0,0 +1,10 @@
+---
+name: Other issues related to Sparkle 2.x
+about: Found a bug? Want to implement a new feature?
+title: ''
+labels: '2.x'
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/sparkle-doesn-t-work-in-my-app.md → .github/ISSUE_TEMPLATE/sparkle-doesn-t-work-in-my-app-1.md

@@ -1,8 +1,8 @@
 ---
-name: Sparkle doesn't work in my app
+name: Sparkle 1.x doesn't work in my app
 about: Problems with integration, unexpected errors
 title: ''
-labels: ''
+labels: '1.x'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/sparkle-doesn-t-work-in-my-app-2.md

@@ -0,0 +1,34 @@
+---
+name: Sparkle 2.x doesn't work in my app
+about: Problems with using the beta version of Sparkle 2
+title: ''
+labels: '2.x'
+assignees: ''
+
+---
+
+<!-- 
+
+The answer to your issue is probably already in Console.app on your computer.
+Please use Console.app and search for Sparkle.
+
+Please try troubleshooting steps:
+https://github.com/sparkle-project/Sparkle#troubleshooting
+
+-->
+
+### Description of the problem
+
+
+### Do you use Sandboxing in your app?
+
+### Version of `Sparkle.framework` in the latest version of your app
+
+### Version of `Sparkle.framework` in the old version of app that your users have (or N/A)
+
+### Sparkle's output from Console.app
+```
+
+```
+
+### Steps to reproduce the behavior

.swiftlint.yml

@@ -0,0 +1,20 @@
+excluded:
+  - Vendor
+disabled_rules:
+  - opening_brace
+  - empty_parentheses_with_trailing_closure
+  - function_body_length
+  - line_length
+  - cyclomatic_complexity
+  - large_tuple
+
+# Rule-specific config
+trailing_comma:
+  mandatory_comma: true
+force_try:
+  severity: warning
+force_cast:
+  severity: warning
+identifier_name:
+  min_length:
+    warning: 2

.travis.yml

@@ -1,5 +1,7 @@
+os: osx
 language: objective-c
-osx_image: xcode9
-before_install:
-  - brew update
-script: make ci
+osx_image:
+  - xcode10.3
+  - xcode11.4
+script:
+  - set -o pipefail && xcodebuild test -project Sparkle.xcodeproj -scheme Distribution -derivedDataPath build -enableCodeCoverage YES | xcpretty

CHANGELOG

@@ -1,3 +1,27 @@
+# 1.24.0-alpha
+
+ * Fixed error about "about:blank" release notes (Louis Pontoise)
+ * Use the SHA-256 hash of the archive as the cache path (Nate Weaver)
+ * Don't return an optional from the FileHandle method (Nate Weaver)
+ * Added URL+Hashing (Nate Weaver)
+ * Update SUUpdateAlert.xib (DanielFirlej)
+ * Added help command line option (Dominik H)
+ * Added function that parses all command line options (Dominik H)
+ * Command line option to provide a download url prefix is now parsed and set on each archive item (Dominik H)
+
+# 1.23.0
+
+ * Support generating appcast with localizations (#1499) (Alik Vovkotrub)
+ * Support versions with git commit SHA (#1504) (Alec Larson)
+ * Hide "Skip..." and "Remind..." buttons when they're not relevant (#1480) (Kenneth Johnsen)
+ * Preserve Finder tags while updating apps (#1512) (CoreCode)
+ * Read-only update alert dialog formatting improvements (#1515) (Quinn Taylor)
+ * Check if `SUBundleName` is set before normalizing (Jake Fenton)
+ * `NSInteger` cast warning on Xcode 11 (Marga Keuvelaar)
+ * Correct appcast file extension (Tom Vos)
+ * Update Sparkle.strings (Emir Sarı)
+ * Fix spelling (#1508) (Frank Chiarulli Jr)
+
 # 1.22.0
 
  * Enabled "Hardened Runtime" build option for Apple's notarization requirement
@@ -6,15 +30,21 @@
  * Add phased rollout feature (#1381) (Fabian Jäger)
  * Ignore non-standard permissions in delta updates instead of failing the build (Kornel Lesiński)
  * Notify user when installed version is newer than the latest in the appcast (CoreCode)
+ * Reset timers after computer sleep (CoreCode)
  * Block-based alternatives to `NSInvocation`-based delegate methods (Fabian Jäger)
+ * Add delegate `userDidSkipThisVersion` (BobZombie, Leo Natan, bono yusuke)
  * Pass item to updaterShouldShowUpdateAlertForScheduledUpdate delegate method (George Nachman)
+ * Support providing private key as argument in `generate_appcast` (Yakuhzi, marchyang)
  * Separate the ed25519 sources into a new static library (Tony Arnold)
- * Correction of Czech localization inconsistency (#1403) (vojtakonarik)
  * Disambiguate signing error messages (Nate Weaver)
  * Use `XMLNode.Options.nodePrettyPrint` in `generate_appcast` instead of trying to add whitespace manually (fumoboy007)
  * Annotate SUHost for nullability (Michael Buckley)
  * Use SUAVAILABLE macro (Christiaan Hofman)
  * Fix warnings when using modules (nivekkagicom)
+ * Correction of Czech localization inconsistency (#1403) (vojtakonarik)
+ * BR locale fix (BR Lingo)
+ * Update Japanese localization (fujisoft)
+ * French Sparkle.strings (Jean-Baptiste)
 
 # 1.21.3
 

Configurations/ConfigCommon.xcconfig

@@ -16,7 +16,7 @@ SPARKLE_AUTOMATED_DOWNGRADES = 0
 SPARKLE_NORMALIZE_INSTALLED_APPLICATION_NAME = 0
 
 SPARKLE_VERSION_MAJOR = 1
-SPARKLE_VERSION_MINOR = 22
+SPARKLE_VERSION_MINOR = 24
 SPARKLE_VERSION_PATCH = 0
 SPARKLE_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)
 

Configurations/ConfigSwift.xcconfig

@@ -1,2 +1,2 @@
-SWIFT_VERSION = 4.0
+SWIFT_VERSION = 4.2
 SWIFT_SWIFT3_OBJC_INFERENCE = Off;

Configurations/make-release-package.sh

@@ -12,7 +12,7 @@ if [ "$ACTION" = "" ] ; then
     fi
 
     rm -rf "$CONFIGURATION_BUILD_DIR/staging"
-    rm -f "Sparkle-$CURRENT_PROJECT_VERSION.tar.bz2"
+    rm -f "Sparkle-$CURRENT_PROJECT_VERSION.tar.xz"
 
     mkdir -p "$CONFIGURATION_BUILD_DIR/staging"
     cp "$SRCROOT/CHANGELOG" "$SRCROOT/LICENSE" "$SRCROOT/Resources/SampleAppcast.xml" "$CONFIGURATION_BUILD_DIR/staging"
@@ -37,6 +37,6 @@ if [ "$ACTION" = "" ] ; then
 
     cd "$CONFIGURATION_BUILD_DIR/staging"
     # Sorted file list groups similar files together, which improves tar compression
-    find . \! -type d | rev | sort | rev | tar cjvf "../Sparkle-$CURRENT_PROJECT_VERSION.tar.bz2" --files-from=-
+    find . \! -type d | rev | sort | rev | tar cv --files-from=- | xz -9 > "../Sparkle-$CURRENT_PROJECT_VERSION.tar.xz"
     rm -rf "$CONFIGURATION_BUILD_DIR/staging"
 fi

Makefile

@@ -14,7 +14,7 @@ localizable-strings:
 
 release:
 	xcodebuild -scheme Distribution -configuration Release -derivedDataPath "$(BUILDDIR)" build
-	open -R "$(BUILDDIR)/Build/Products/Release/Sparkle-"*.tar.bz2
+	open -R "$(BUILDDIR)/Build/Products/Release/Sparkle-"*.tar.xz
 	cat Sparkle.podspec
 	@echo "Don't forget to update CocoaPods! pod trunk push"
 

README.markdown

@@ -1,9 +1,12 @@
-# Sparkle [![Build Status](https://travis-ci.org/sparkle-project/Sparkle.svg?branch=master)](https://travis-ci.org/sparkle-project/Sparkle) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![CocoaPods](https://img.shields.io/cocoapods/v/Sparkle.svg?maxAge=2592000)]() <a href="https://www.stackpath.com/?utm_source=sparkle-github&amp;utm_medium=badge&amp;utm_campaign=readme"><img src="https://img.shields.io/badge/sponsored%20by-StackPath-orange.svg" alt="sponsored by: StackPath"></a>
+# Sparkle 1.x [![Build Status](https://travis-ci.org/sparkle-project/Sparkle.svg?branch=master)](https://travis-ci.org/sparkle-project/Sparkle) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![CocoaPods](https://img.shields.io/cocoapods/v/Sparkle.svg?maxAge=2592000)]() <a href="https://www.stackpath.com/?utm_source=sparkle-github&amp;utm_medium=badge&amp;utm_campaign=readme"><img src="https://img.shields.io/badge/sponsored%20by-StackPath-orange.svg" alt="sponsored by: StackPath"></a>
 
 Secure and reliable software update framework for Cocoa developers.
 
 <img src="Resources/Screenshot.png" width="732" alt="Sparkle shows familiar update window with release notes">
 
+This branch is the production ready, battle-tested version of Sparkle used by thousands of Mac apps.  
+The upcoming Sparkle 2 (currently in beta) can be found in the [2.x branch](https://github.com/sparkle-project/Sparkle/tree/2.x).
+
 ## Features
 
 * Seamless. There's no mention of Sparkle; your icons and app name are used.
@@ -23,7 +26,7 @@ Secure and reliable software update framework for Cocoa developers.
 * Runtime: macOS 10.7 or greater
 * Build: Xcode 9 and 10.11 SDK or greater
 * HTTPS server for serving updates (see [App Transport Security](http://sparkle-project.org/documentation/app-transport-security/))
-* No sandboxing. Sparkle 1.x can't update sandboxed apps. Sparkle 2.0 (alpha) can.
+* No sandboxing. Sparkle 1.x can't update sandboxed apps. However, [Sparkle 2.x](https://github.com/sparkle-project/Sparkle/tree/2.x) can.
 
 ## Usage
 

Sparkle.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name        = "Sparkle"
-  s.version     = "1.22.0"
+  s.version     = "1.24.0"
   s.summary     = "A software update framework for macOS"
   s.description = "Sparkle is an easy-to-use software update framework for Cocoa developers."
   s.homepage    = "http://sparkle-project.org"