Swift 3 Update

CHANGELOG.yml

@@ -1,3 +1,7 @@
+- Updates app to iOS 10. [ash]
+- Updates project to Xcode 8 / Swift 3. [ash]
+- Enables compiler optimizations. [ash]
+
 upcoming:
 
 releases:
@@ -356,15 +360,3 @@ releases:
   - Bid fulfillment shows in a popover [orta]
   - Bid Fulfillment flow is prototypical via the bottom buttons [orta]
   - Analytics / Hockey setup [orta]
-
-
-
-
-
-
-
-
-
-
-
-

Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     RubyInline (3.12.4)
       ZenTest (~> 4.3)
-    ZenTest (4.11.0)
+    ZenTest (4.11.1)
     activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
@@ -18,38 +18,42 @@ GEM
     cert (1.4.2)
       fastlane_core (>= 0.50.3, < 1.0.0)
       spaceship (>= 0.32.0, < 1.0.0)
-    claide (0.9.1)
-    cocoapods (0.39.0)
-      activesupport (>= 4.0.2)
-      claide (~> 0.9.1)
-      cocoapods-core (= 0.39.0)
-      cocoapods-downloader (~> 0.9.3)
-      cocoapods-plugins (~> 0.4.2)
-      cocoapods-search (~> 0.1.0)
-      cocoapods-stats (~> 0.6.2)
-      cocoapods-trunk (~> 0.6.4)
-      cocoapods-try (~> 0.5.1)
+    claide (1.0.1)
+    cocoapods (1.1.1)
+      activesupport (>= 4.0.2, < 5)
+      claide (>= 1.0.1, < 2.0)
+      cocoapods-core (= 1.1.1)
+      cocoapods-deintegrate (>= 1.0.1, < 2.0)
+      cocoapods-downloader (>= 1.1.2, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-stats (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.1.1, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      molinillo (~> 0.4.0)
+      fourflusher (~> 2.0.1)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.5.1)
       nap (~> 1.0)
-      xcodeproj (~> 0.28.2)
-    cocoapods-core (0.39.0)
-      activesupport (>= 4.0.2)
+      xcodeproj (>= 1.3.3, < 2.0)
+    cocoapods-core (1.1.1)
+      activesupport (>= 4.0.2, < 5)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-downloader (0.9.3)
-    cocoapods-keys (1.6.0)
+    cocoapods-deintegrate (1.0.1)
+    cocoapods-downloader (1.1.2)
+    cocoapods-keys (1.7.0)
       dotenv
       osx_keychain
-    cocoapods-plugins (0.4.2)
+    cocoapods-plugins (1.0.0)
       nap
-    cocoapods-search (0.1.0)
-    cocoapods-stats (0.6.2)
-    cocoapods-trunk (0.6.4)
+    cocoapods-search (1.0.0)
+    cocoapods-stats (1.0.0)
+    cocoapods-trunk (1.1.1)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
-    cocoapods-try (0.5.1)
+    cocoapods-try (1.1.0)
     colored (1.2)
     commander (4.4.0)
       highline (~> 1.7.2)
@@ -121,6 +125,7 @@ GEM
       plist (~> 3.1)
       rubyzip (~> 1.1.6)
       terminal-table (~> 1.4.5)
+    fourflusher (2.0.1)
     frameit (2.7.0)
       deliver (> 0.3)
       fastimage (~> 1.6.3)
@@ -188,8 +193,8 @@ GEM
     mime-types-data (3.2016.0521)
     mini_magick (4.5.1)
     mini_portile2 (2.0.0)
-    minitest (5.9.0)
-    molinillo (0.4.2)
+    minitest (5.9.1)
+    molinillo (0.5.2)
     multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -275,9 +280,9 @@ GEM
     xcode-install (2.0.4)
       claide (>= 0.9.1, < 1.1.0)
       spaceship (>= 0.25.1, < 1.0.0)
-    xcodeproj (0.28.2)
+    xcodeproj (1.3.3)
       activesupport (>= 3)
-      claide (~> 0.9.1)
+      claide (>= 1.0.1, < 2.0)
       colored (~> 1.2)
     xcpretty (0.2.2)
       rouge (~> 1.8)

Kiosk.xcodeproj/xcshareddata/xcschemes/Kiosk.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -85,6 +85,13 @@
             ReferencedContainer = "container:Kiosk.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "OS_ACTIVITY_MODE"
+            value = "disable"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

Kiosk/Admin/AdminCardTestingViewController.swift

@@ -24,14 +24,14 @@ class AdminCardTestingViewController: UIViewController {
         cardHandler.cardStatus
             .subscribe { (event) in
                 switch event {
-                case .Next(let message):
+                case .next(let message):
                     self.log("\(message)")
-                case .Error(let error):
+                case .error(let error):
                     self.log("\n====Error====\n\(error)\nThe card reader may have become disconnected.\n\n")
                     if self.cardHandler.card != nil {
                         self.log("==\n\(self.cardHandler.card!)\n\n")
                     }
-                case .Completed:
+                case .completed:
                     guard let card = self.cardHandler.card else {
                         // Restarts the card reader
                         self.cardHandler.startSearching()
@@ -48,19 +48,17 @@ class AdminCardTestingViewController: UIViewController {
         cardHandler.startSearching()
     }
 
-    override func viewWillDisappear(animated: Bool) {
+    override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         cardHandler.end()
     }
 
-    func log(string: String) {
+    func log(_ string: String) {
         self.logTextView.text = "\(self.logTextView.text)\n\(string)"
 
     }
 
-    @IBAction func backTapped(sender: AnyObject) {
-        navigationController?.popViewControllerAnimated(true)
+    @IBAction func backTapped(_ sender: AnyObject) {
+        _ = navigationController?.popViewController(animated: true)
     }
-
-
-}
+}

Kiosk/Admin/AdminLogViewController.swift

@@ -4,20 +4,20 @@ class AdminLogViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        textView.text = try? NSString(contentsOfURL: logPath(), encoding: NSASCIIStringEncoding) as String
+        textView.text = try? NSString(contentsOf: logPath(), encoding: String.Encoding.ascii.rawValue) as String
     }
 
     @IBOutlet weak var textView: UITextView!
-    @IBAction func backButtonTapped(sender: AnyObject) {
-        self.navigationController?.popViewControllerAnimated(true)
+    @IBAction func backButtonTapped(_ sender: AnyObject) {
+        _ = self.navigationController?.popViewController(animated: true)
     }
 
-    func logPath() -> NSURL {
-        let docs = NSFileManager.defaultManager().URLsForDirectory(.DocumentDirectory, inDomains: .UserDomainMask).last!
-        return docs.URLByAppendingPathComponent("logger.txt")
+    func logPath() -> URL {
+        let docs = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).last!
+        return docs.appendingPathComponent("logger.txt")
     }
 
-    @IBAction func scrollTapped(sender: AnyObject) {
+    @IBAction func scrollTapped(_ sender: AnyObject) {
         textView.scrollRangeToVisible(NSMakeRange(textView.text.characters.count - 1, 1))
     }
 }

Kiosk/Admin/AdminPanelViewController.swift

@@ -6,28 +6,28 @@ class AdminPanelViewController: UIViewController {
     @IBOutlet weak var auctionIDLabel: UILabel!
 
 
-    @IBAction func backTapped(sender: AnyObject) {
-        self.presentingViewController?.dismissViewControllerAnimated(true, completion: nil)
+    @IBAction func backTapped(_ sender: AnyObject) {
+        self.presentingViewController?.dismiss(animated: true, completion: nil)
         appDelegate().setHelpButtonHidden(false)
     }
 
-    @IBAction func closeAppTapped(sender: AnyObject) {
+    @IBAction func closeAppTapped(_ sender: AnyObject) {
         exit(1)
     }
 
-    override func viewDidAppear(animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
 
         appDelegate().setHelpButtonHidden(true)
     }
 
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         if segue == .LoadAdminWebViewController {
-            let webVC = segue.destinationViewController as! AuctionWebViewController
+            let webVC = segue.destination as! AuctionWebViewController
             let auctionID = AppSetup.sharedState.auctionID
             let base = AppSetup.sharedState.useStaging ? "staging.artsy.net" : "artsy.net"
 
-            webVC.URL = NSURL(string: "https://\(base)/feature/\(auctionID)")!
+            webVC.url = URL(string: "https://\(base)/feature/\(auctionID)")!
 
             // TODO: Hide help button
         }
@@ -40,27 +40,27 @@ class AdminPanelViewController: UIViewController {
         if APIKeys.sharedKeys.stubResponses {
             auctionIDLabel.text = "STUBBING API RESPONSES\nNOT CONTACTING ARTSY API"
         } else {
-            let version = (NSBundle.mainBundle().objectForInfoDictionaryKey("CFBundleShortVersionString") as? String)  ?? "Unknown"
+            let version = (Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String)  ?? "Unknown"
             auctionIDLabel.text = "\(state.auctionID), Kiosk version: \(version)"
         }
 
         let environment = state.useStaging ? "PRODUCTION" : "STAGING"
-        environmentChangeButton.setTitle("USE \(environment)", forState: .Normal)
+        environmentChangeButton.setTitle("USE \(environment)", for: .normal)
 
         let buttonsTitle = state.showDebugButtons ? "HIDE" : "SHOW"
-        showAdminButtonsButton.setTitle(buttonsTitle, forState: .Normal)
+        showAdminButtonsButton.setTitle(buttonsTitle, for: .normal)
 
         let readStatus = state.disableCardReader ? "ENABLE" : "DISABLE"
-        toggleCardReaderButton.setTitle(readStatus, forState: .Normal)
+        toggleCardReaderButton.setTitle(readStatus, for: .normal)
     }
 
     @IBOutlet weak var environmentChangeButton: UIButton!
-    @IBAction func switchStagingProductionTapped(sender: AnyObject) {
-        let defaults = NSUserDefaults.standardUserDefaults()
-        defaults.setObject(!AppSetup.sharedState.useStaging, forKey: "KioskUseStaging")
+    @IBAction func switchStagingProductionTapped(_ sender: AnyObject) {
+        let defaults = UserDefaults.standard
+        defaults.set(!AppSetup.sharedState.useStaging, forKey: "KioskUseStaging")
 
-        defaults.removeObjectForKey(XAppToken.DefaultsKeys.TokenKey.rawValue)
-        defaults.removeObjectForKey(XAppToken.DefaultsKeys.TokenExpiry.rawValue)
+        defaults.removeObject(forKey: XAppToken.DefaultsKeys.TokenKey.rawValue)
+        defaults.removeObject(forKey: XAppToken.DefaultsKeys.TokenExpiry.rawValue)
 
         defaults.synchronize()
         delayToMainThread(1){
@@ -70,9 +70,9 @@ class AdminPanelViewController: UIViewController {
     }
 
     @IBOutlet weak var showAdminButtonsButton: UIButton!
-    @IBAction func toggleAdminButtons(sender: UIButton) {
-        let defaults = NSUserDefaults.standardUserDefaults()
-        defaults.setObject(!AppSetup.sharedState.showDebugButtons, forKey: "KioskShowDebugButtons")
+    @IBAction func toggleAdminButtons(_ sender: UIButton) {
+        let defaults = UserDefaults.standard
+        defaults.set(!AppSetup.sharedState.showDebugButtons, forKey: "KioskShowDebugButtons")
         defaults.synchronize()
         delayToMainThread(1){
             exit(1)
@@ -82,9 +82,9 @@ class AdminPanelViewController: UIViewController {
 
     @IBOutlet weak var cardReaderLabel: ARSerifLabel!
     @IBOutlet weak var toggleCardReaderButton: SecondaryActionButton!
-    @IBAction func toggleCardReaderTapped(sender: AnyObject) {
-        let defaults = NSUserDefaults.standardUserDefaults()
-        defaults.setObject(!AppSetup.sharedState.disableCardReader, forKey: "KioskDisableCardReader")
+    @IBAction func toggleCardReaderTapped(_ sender: AnyObject) {
+        let defaults = UserDefaults.standard
+        defaults.set(!AppSetup.sharedState.disableCardReader, forKey: "KioskDisableCardReader")
         defaults.synchronize()
         delayToMainThread(1){
             exit(1)

Kiosk/Admin/AuctionWebViewController.swift

@@ -5,19 +5,19 @@ class AuctionWebViewController: WebViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        let flexibleSpace = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.FlexibleSpace, target: nil, action: nil)
+        let flexibleSpace = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.flexibleSpace, target: nil, action: nil)
 
         let exitImage = UIImage(named: "toolbar_close")
-        let backwardBarItem = UIBarButtonItem(image: exitImage, style: .Plain, target: self, action: #selector(exit));
+        let backwardBarItem = UIBarButtonItem(image: exitImage, style: .plain, target: self, action: #selector(exit));
         let allItems = self.toolbarItems! + [flexibleSpace, backwardBarItem]
         toolbarItems = allItems
     }
 
     func exit() {
         let passwordVC = PasswordAlertViewController.alertView { [weak self] in
-            self?.navigationController?.popViewControllerAnimated(true)
+            _ = self?.navigationController?.popViewController(animated: true)
             return
         }
-        self.presentViewController(passwordVC, animated: true) {}
+        self.present(passwordVC, animated: true) {}
     }
 }