Merge pull request #19 from dataJAR/1.5

1.5

Author: macmule

.gitignore

@@ -1,3 +1,4 @@
 
 *.xcuserstate
 *.xcuserstate
+.DS_Store

Jamf Switcher.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 53;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -183,8 +183,9 @@
 		798516E61F7AB0D400EF4C1D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 0900;
-				LastUpgradeCheck = 1400;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = dataJAR;
 				TargetAttributes = {
 					798516ED1F7AB0D400EF4C1D = {
@@ -338,7 +339,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -394,7 +395,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -420,7 +421,8 @@
 					"$(inherited)",
 					"@loader_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.4.1;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
+				MARKETING_VERSION = 1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = uk.co.dataJAR.JamfSwitcher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -445,7 +447,8 @@
 					"$(inherited)",
 					"@loader_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.4.1;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
+				MARKETING_VERSION = 1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = uk.co.dataJAR.JamfSwitcher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

Jamf Switcher.xcodeproj/project.xcworkspace/xcuserdata/ben.xcuserdatad/UserInterfaceState.xcuserstate

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Jamf Switcher.xcodeproj/xcshareddata/xcschemes/Jamf Switcher.xcscheme

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>146</string>
+	<string>147</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

Jamf Switcher/Info.plist

@@ -93,7 +93,7 @@ class ViewController: NSViewController {
         panel.directoryURL = getDocumentsDirectory()
 
         panel.beginSheetModal(for: self.view.window!) { (result) -> Void in
-            if result.rawValue == NSFileHandlingPanelOKButton
+            if result.rawValue == NSApplication.ModalResponse.OK.rawValue
             {
                 guard let url = panel.url else { return }
                 do {
@@ -127,7 +127,7 @@ class ViewController: NSViewController {
 
     func processSelection() {
         let stringSelected = filteredDataToShow[itemsSelected]
-        let url = stringSelected.url.replacingOccurrences(of: "/?failover", with: "")
+        let url = stringSelected.url.replacing(/\/\?failover.*/, with:"")
         let userDefaultsValue = UserDefaults(suiteName: "com.jamfsoftware.jss")
         userDefaultsValue?.set(true, forKey: "allowInvalidCertificate")
         userDefaultsValue?.set(url, forKey: "url")
@@ -493,7 +493,7 @@ class ViewController: NSViewController {
     private func ParseURL(url: String) -> String {
         var checkedJSSURL = url
         if checkedJSSURL.contains("?failover") {
-            checkedJSSURL = checkedJSSURL.replacingOccurrences(of: "?failover", with: "")
+            checkedJSSURL = checkedJSSURL.replacing(/\/\?failover.*/, with:"")
         }
         if checkedJSSURL.suffix(1) == "/" {
             checkedJSSURL = String(checkedJSSURL.dropLast())