Merge pull request #117 from Shufflepuck/release/release-1.3.3

Release 1.3.3
macadmins · May 29, 2019 · 4d13a9e · 4d13a9e
2 parents bbd3f4e + 45e1b10
commit 4d13a9e
Show file tree

Hide file tree

Showing 82 changed files with 520 additions and 532 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,4 @@
-# Xcode
-#
-# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
-
+# MacOS
 .DS_Store
 
 ## Build generated
@@ -43,28 +40,7 @@ playground.xcworkspace
 .build/
 
 # CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
 # Pods/
 
 # Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build
-
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
-# screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
-
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots
-fastlane/test_output
+# Carthage/Build
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -1,5 +1,5 @@
 included:
-- SplashBuddy
+- Sources
 
 line_length: 200
 

diff --git a/.travis.import_identity.sh b/.travis.import_identity.sh
@@ -15,7 +15,7 @@ security unlock-keychain -p travis $KEY_CHAIN
 security set-keychain-settings -t 3600 -u $KEY_CHAIN
 
 # Add certificates to keychain and allow codesign to access them
-security import Assets/Mac-Developer-20180129.p12 -k $KEY_CHAIN -P $KEY_PASSWORD -T /usr/bin/codesign
+security import Assets/Certificate.p12 -k $KEY_CHAIN -P $MAC_DEVELOPER_CERTIFICATE_PASSWORD -T /usr/bin/codesign
 
 security set-key-partition-list -S apple-tool:,apple: -s -k travis $KEY_CHAIN
 

diff --git a/.travis.yml b/.travis.yml
@@ -1,28 +1,26 @@
 language: objective-c
-osx_image: xcode9.1
+osx_image: xcode10.2
 xcode_project: SplashBuddy.xcodeproj
 xcode_scheme: SplashBuddy
 xcode_sdk: macosx10.13
+
 matrix:
   include:
   - xcode_sdk: macosx10.13
   - xcode_sdk: macosx10.12
-script:
-- set -o pipefail
-- xcodebuild build test -project SplashBuddy.xcodeproj -scheme SplashBuddy
-after_success:
-- bash <(curl -s https://codecov.io/bash)
+
 notifications:
   slack:
     secure: Uqxr0LOztaoqdqZeopy20hqQEC3sglDW47xd6MuBADwDRxWHApgzDg2o0bJHGyKpGl4y6v/Yz3RSkuD3JnKkPG1+of95bmqJ0r2Qg0yitylRTr7TjVdbNLY+Z2e6VrPcyGi/SQltOaOmJ9daW9GE/MoR5Be3xgMFmfJslFCjImwlXJvz3VZ6PVxClpmfiLYDFg1lUvZ3sJAqGqaRe06n0/Jzdhr8VpfnUOVOjPK7sP3CWqMhL2Qq4WJUYxdNuHle1pD3aSQsnT1/H231zPPqCAR/wnJ88Nu6nnEIW7aI4C0p/uRvSJ0FHghtAMngdz1jifkC/YRfDtp3ICD937B4wq4h3XE9OQcfrFVHJU0C/b7O1izRu1vlq2zoxeG7DWyN7hk/UOldbgP58qowFxlYcY1llMyQXpzJp1PNPnX6vCfWKm4gw4tjUJxGs2tRv7IiFf4P2StVDiISq2B98EDxShi1hD8J7xJUq/CbQ9c4fGFtlW/J3VZGZsPyZ5/eVyDLqqH2c9fDMPBEB2TBNUelGBHhKkvcGefs74PU9XCDn/4mpiz6gqD0o98M7++uds/N4NkQyAh9hEosYsuhesawyh/Ma1k75anDwA/4uvulPOx0fyCCf2nWQihVndSDNkhWSDvDqRFR8YPjfzLDEv8hJyx8xmfdQaf4NitGqibzrQg=
 slack: macadmins:Q5jgs97J5c9fqvubb1Kk301W
+
 before_install:
-- openssl aes-256-cbc -K $encrypted_280089750dac_key -iv $encrypted_280089750dac_iv
-  -in Assets/Mac-Developer-20180129.p12.enc -out Assets/Mac-Developer-20180129.p12
-  -d
+- gem install xcpretty
+- echo $MAC_DEVELOPER_CERTIFICATE | base64 --decode > ./Assets/Certificate.p12
 - "./.travis.import_identity.sh"
-env:
-  global:
-    secure: FzKTuSMe7KHjDt/oYuSj4qyo6E+jPrVHbtpDjA/jCRTJHoapdY6LfEKSu6MvCUKZ7u5b3YqqJveIfbnPJnZDoMxLLfNd+SJfHCLlgnpmvgN4tFOrIbfbkHcqn2Ae3BGEzMTGg8fvDZQLMn5MlMM/5+oUWSHX9xGBsDW5g2USZnt7L8GmjuBoJ88fFono2btSTbQUDc159Ji0LBDlXmEvGXDiTWmAsCHXVQPGTVDDQ+EeFVBbm+n/FCKdrsRGRn03RXXFuphx6QHjFlgfSCBSQxPTjHXYUqrAAQXZw5igU6K4Xtc+c+dk/iWpbbx40g9LJCWxLRSSdGnu+uFthsgMqmdKqmqOL9k+EpuhA76cGrXLr4VNfhP+8aNd2roGhO/yFauoYS711TEA8M7zQ3oSYzgcdGWV0MF8g8AfQ4TMyZxSP2wDJ0ZpEyRtOeNAGEeE9yCMR8UNLVa6GE9MM70ToAg0p7e6Tcyp2uXepgZdHD1G/oI0Rg6oeltrgOb+/wD3nLN0ZKBd5fxXlX0mNH7Pr7rybhqu2jTDUGMZ2CehcL9OlRENHL81rZD5R2n5HZ20METs4ockpJt4dfKsj+ivGNw2TEiBuvVKdx2m2V5Yd+uA9pHFCI1Sc9VL6TN8OXOEBuoqMHNxNqYSepgudEA3iPsoGXeohaXU+ImnN/czR20=
-dd:
-  secure: qzE6u6esDKQhnqTDObVPWm8yVEWut/SaymexwkAfF0oi4PmE7dJq67iTwitJO2qpIwQelQafTFs+NlFVhUIwDO8NO5JEO7f5YubezSFWyCVOzPfiQD+f2f+V7gxZQTNazyc73vtDQ6V/n8FCFAifXYAtII2YxKdcL+nK+sW+UJRNwqo7+J/l4QknadZD22WouskE4nu5972j9ZgFlaYgIRScpkSYt6BEmIH77ohP66YrpC+5uIegNxOORQCx59y5oODW4u4zkP3HOjR6m03DKRroIjDYD63z9/F4/APu9AM5c5vYdiiEt9I5A1jC8LCLsFdZOWjtJFducKnB7bNN4dC6UmxeTu2LY7klEM7R/12kP9W+sCcf0zxY3UYPYSz5R+ANajXLLriMpKoR1mDAfQE4RjuAyI4UClm6Bt0FH+S2OWXkjJ5Ruv3Hv3MaEGedGRmFRU27ADfiM0PZ+UzW73ML68nqawLxSo9CimFPPbUeuvzHpVcBoveNLJiYJeWFuaYgtycoLFYzNlhZpRBeGw1dVT1vm7TwR6xmaeJ5hNP6ul34SWKizzAQKstCaeVt9dyH0Z3DPXHuBDVysXt4GmG2GZSqCyxaiiR5+joY3i5sisDtIZ1fMEWzJPnWybWHeM46F1Ic2qwNIBn0vM5gdawfalNYg5ftfznk9DbfoKE=
+
+script:
+- set -o pipefail && xcodebuild build test -project SplashBuddy.xcodeproj -scheme SplashBuddy | xcpretty
+
+after_success:
+- bash <(curl -s https://codecov.io/bash)
diff --git a/Assets/Mac-Developer-20180109.p12.enc b/Assets/Mac-Developer-20180109.p12.enc
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [1.3.3]
+
+### Fixed
+
+* Fixed SB hanging out upon clicking on Continue button [[#112](https://github.com/Shufflepuck/SplashBuddy/issues/112)]
+
 ## [1.3.2]
 
 ### Fixed

diff --git a/...hBuddy/Resources/SplashBuddy.entitlements → Configurations/SplashBuddy.entitlements b/...hBuddy/Resources/SplashBuddy.entitlements → Configurations/SplashBuddy.entitlements
diff --git a/SplashBuddy/Resources/Info.plist → Configurations/SplashBuddy.plist b/SplashBuddy/Resources/Info.plist → Configurations/SplashBuddy.plist
@@ -19,13 +19,13 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.2</string>
+	<string>1.3.3</string>
 	<key>CFBundleVersion</key>
-	<string>26</string>
+	<string>27</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016-2018 Amaris Technologies GmbH. All rights reserved.</string>
+	<string>Copyright © 2018-present Amaris Technologies GmbH. All rights reserved.</string>
 	<key>NSMainStoryboardFile</key>
 	<string>SplashBuddy</string>
 	<key>NSPrincipalClass</key>

diff --git a/SplashBuddyTests/Info.plist → Configurations/SplashBuddyTests.plist b/SplashBuddyTests/Info.plist → Configurations/SplashBuddyTests.plist
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright © 2018-present Amaris Technologies GmbH. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/README.md b/README.md
@@ -1,14 +1,13 @@
 # SplashBuddy
 
 [![Build Status](https://travis-ci.org/Shufflepuck/SplashBuddy.svg?branch=master)](https://travis-ci.org/Shufflepuck/SplashBuddy)
-![Swift](https://img.shields.io/badge/Swift-4.0-brightgreen.svg)
-![macOS](https://img.shields.io/badge/macOS-10.12.6-brightgreen.svg)
-![macOS](https://img.shields.io/badge/macOS-10.13-brightgreen.svg)
+![Swift](https://img.shields.io/badge/Swift-5.0-brightgreen.svg)
+![macOS](https://img.shields.io/badge/macOS-10.12+-brightgreen.svg)
 
-![Version](https://img.shields.io/badge/Version-1.2.1-lightgrey.svg)
+![Version](https://img.shields.io/badge/Version-1.3.3-lightgrey.svg)
 ![License](https://img.shields.io/badge/License-Apache%202.0-lightgrey.svg)
 
-SplashBuddy goal is to provide an *elegant* and *secure* onboarding process for Mac users using [DEP](https://www.apple.com/business/dep/).
+SplashBuddy goal is to provide an *elegant* and *secure* onboarding process for Mac users using [DEP](https://www.apple.com/business/dep).
 
 It allows you to:
 
@@ -22,7 +21,7 @@ It currently supports Jamf Pro. You're welcome to [contribute](https://github.co
 
 ![SplashBuddy](Assets/secrid_splashbuddy.jpeg)
 
-Here's a video of the SplashBuddy (v1.0) running at Culture Amp that was presented during [Macbrained](http://smithjw.me/2017/03/24/Onboarding-talk-at-Macbrained/): [Link](https://cultureamp.wistia.com/medias/8gpvhpwgn4).
+Here's a video of the SplashBuddy (v1.0) running at Culture Amp that was presented during [Macbrained](http://smithjw.me/2017/03/24/Onboarding-talk-at-Macbrained): [Link](https://cultureamp.wistia.com/medias/8gpvhpwgn4).
 
 ## Quick Start
 

diff --git a/SplashBuddy/AppDelegate.swift → Sources/AppDelegate.swift b/SplashBuddy/AppDelegate.swift → Sources/AppDelegate.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2018 Amaris Technologies GmbH. All rights reserved.
+//  Copyright © 2018-present Amaris Technologies GmbH. All rights reserved.
 //
 
 import Cocoa
@@ -53,7 +53,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
         // Get preferences from UserDefaults
         do {
-            try Preferences.sharedInstance.getPreferencesApplications()
+            try Preferences.sharedInstance.getApplicationsFromPreferences()
         } catch Preferences.Errors.malformedApplication {
             Log.write(string: "applicationsArray: application is malformed",
                     cat: "Preferences",

diff --git a/...ensions/NSLocalizedStringExtensions.swift → ...ensions/NSLocalizedStringExtensions.swift b/...ensions/NSLocalizedStringExtensions.swift → ...ensions/NSLocalizedStringExtensions.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2018 Amaris Technologies GmbH. All rights reserved.
+//  Copyright © 2018-present Amaris Technologies GmbH. All rights reserved.
 //
 
 import Foundation

diff --git a/SplashBuddy/Tools/ContinueAction.swift → Sources/Models/ContinueAction.swift b/SplashBuddy/Tools/ContinueAction.swift → Sources/Models/ContinueAction.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2018 Amaris Technologies GmbH. All rights reserved.
+//  Copyright © 2018-present Amaris Technologies GmbH. All rights reserved.
 //
 
 import Cocoa
@@ -120,13 +120,14 @@ struct ContinueButton {
                     return
                 }
 
-                if NSWorkspace.shared.launchApplication(applicationPath) {
-                    Log.write(string: "Successfully launched application \(applicationPath)", cat: "ContinueButton", level: .info)
-                    NSApplication.shared.terminate(self)
-                } else {
-                    NSApplication.shared.terminate(self)
-                    Log.write(string: "Couldn't launch application \(applicationPath)", cat: "ContinueButton", level: .error)
+                Log.write(string: "Launching application \(applicationPath)", cat: "ContinueButton", level: .info)
+
+                // Trying to fix #112 as we suspect launchApplication(_) may never return
+                DispatchQueue.global(qos: .userInitiated).async {
+                    _ = NSWorkspace.shared.launchApplication(applicationPath)
                 }
+
+                NSApplication.shared.terminate(self)
             }
         }
     }

diff --git a/SplashBuddy/Tools/LoginWindow.swift → Sources/Models/LoginWindow.swift b/SplashBuddy/Tools/LoginWindow.swift → Sources/Models/LoginWindow.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2018 Amaris Technologies GmbH. All rights reserved.
+//  Copyright © 2018-present Amaris Technologies GmbH. All rights reserved.
 //
 
 import Cocoa