validate project settings and fix errors

thompsonate · Sep 30, 2018 · 0388fb2 · 0388fb2
1 parent 110430c
commit 0388fb2
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 35 deletions.
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Shifty/AppDelegate.swift b/Shifty/AppDelegate.swift
@@ -10,7 +10,7 @@ import Cocoa
 import ServiceManagement
 import Fabric
 import Crashlytics
-import MASPreferences
+import MASPreferences_Shifty
 import AXSwift
 import SwiftLog
 

diff --git a/Shifty/Info.plist b/Shifty/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.5.3</string>
 	<key>CFBundleVersion</key>
-	<string>44</string>
+	<string>45</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/Shifty/PrefAboutViewController.swift b/Shifty/PrefAboutViewController.swift
@@ -7,7 +7,7 @@
 
 import Cocoa
 import Sparkle
-import MASPreferences
+import MASPreferences_Shifty
 
 let ShiftyUpdater = SUUpdater()
 

diff --git a/Shifty/PrefGeneralViewController.swift b/Shifty/PrefGeneralViewController.swift
@@ -6,7 +6,7 @@
 //
 
 import Cocoa
-import MASPreferences
+import MASPreferences_Shifty
 import ServiceManagement
 import AXSwift
 import SwiftLog

diff --git a/Shifty/PrefShortcutsViewController.swift b/Shifty/PrefShortcutsViewController.swift
@@ -6,7 +6,7 @@
 //
 
 import Cocoa
-import MASPreferences
+import MASPreferences_Shifty
 import MASShortcut
 
 @objcMembers

diff --git a/Shifty/Setup.swift b/Shifty/Setup.swift
@@ -135,7 +135,7 @@ class ContainerViewController: NSViewController {
         super.viewDidLoad()
 
         let setupStoryboard = NSStoryboard(name: "Setup", bundle: nil)
-        sourceViewController = setupStoryboard.instantiateController(withIdentifier: "sourceViewController") as! NSViewController
+        sourceViewController = setupStoryboard.instantiateController(withIdentifier: "sourceViewController") as? NSViewController
         self.insertChild(sourceViewController, at: 0)
         self.view.addSubview(sourceViewController.view)
         self.view.frame = sourceViewController.view.frame