Release Authenticator 2.0.1

.travis.yml

@@ -5,28 +5,25 @@ language: objective-c
 xcode_workspace: Authenticator.xcworkspace
 xcode_scheme: Authenticator
 
-osx_image: xcode8.3
+osx_image: xcode9
 
 env:
   - RUNTIME="iOS 9.0"  DEVICE="iPhone 4s"
-  - RUNTIME="iOS 9.1"  DEVICE="iPhone 5"
-  - RUNTIME="iOS 9.2"  DEVICE="iPhone 5s"
   - RUNTIME="iOS 9.3"  DEVICE="iPhone 6s"
-  - RUNTIME="iOS 10.0" DEVICE="iPhone 6s Plus"
-  - RUNTIME="iOS 10.1" DEVICE="iPhone SE"
-  - RUNTIME="iOS 10.2" DEVICE="iPhone 7"
+  - RUNTIME="iOS 10.0" DEVICE="iPhone SE"
   - RUNTIME="iOS 10.3" DEVICE="iPhone 7 Plus"
+  - RUNTIME="iOS 11.0" DEVICE="iPhone X"
 
 install:
   - git submodule update --init --recursive
 
 before_script:
-- DEVICE_ID=com.apple.CoreSimulator.SimDeviceType.$(echo $DEVICE | sed -E -e "s/[ \-]+/ /g" -e "s/[^[:alnum:]]/-/g")
-- RUNTIME_ID=com.apple.CoreSimulator.SimRuntime.$(echo $RUNTIME | sed -E -e "s/[ \-]+/ /g" -e "s/[^[:alnum:]]/-/g")
-- DESTINATION_ID=$(xcrun simctl create Travis $DEVICE_ID $RUNTIME_ID)
-- xcrun simctl boot $DESTINATION_ID
+  - DEVICE_ID=com.apple.CoreSimulator.SimDeviceType.$(echo $DEVICE | sed -E -e "s/[ \-]+/ /g" -e "s/[^[:alnum:]]/-/g")
+  - RUNTIME_ID=com.apple.CoreSimulator.SimRuntime.$(echo $RUNTIME | sed -E -e "s/[ \-]+/ /g" -e "s/[^[:alnum:]]/-/g")
+  - DESTINATION_ID=$(xcrun simctl create Travis $DEVICE_ID $RUNTIME_ID)
+  - xcrun simctl boot $DESTINATION_ID
 
-script: set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" -destination "id=$DESTINATION_ID" build test | xcpretty -c
+script: set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" -destination "id=$DESTINATION_ID" build-for-testing test-without-building | xcpretty -c
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

Authenticator.xcodeproj/project.pbxproj

@@ -740,11 +740,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				BUNDLE_DISPLAY_NAME = "${PRODUCT_NAME} ∆";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 0;
 				DEVELOPMENT_TEAM = WD7ETSN9J9;
 				INFOPLIST_FILE = Authenticator/Resources/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = me.mattrubin.authenticator.dev;
 				PRODUCT_NAME = Authenticator;
 				TARGETED_DEVICE_FAMILY = 1;
+				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
 		};
@@ -755,11 +757,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				BUNDLE_DISPLAY_NAME = "${PRODUCT_NAME}";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 0;
 				DEVELOPMENT_TEAM = WD7ETSN9J9;
 				INFOPLIST_FILE = Authenticator/Resources/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = me.mattrubin.authenticator;
 				PRODUCT_NAME = Authenticator;
 				TARGETED_DEVICE_FAMILY = 1;
+				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;
 		};

Authenticator/Resources/GenerateIcons.sh

@@ -27,6 +27,7 @@ inkscape -z -e "${ICONSET}/Icon-120.png" -w 120 $ICON_SVG;
 inkscape -z -e "${ICONSET}/Icon-152.png" -w 152 $ICON_SVG;
 inkscape -z -e "${ICONSET}/Icon-167.png" -w 167 $ICON_SVG;
 inkscape -z -e "${ICONSET}/Icon-180.png" -w 180 $ICON_SVG;
+inkscape -z -e "${ICONSET}/Icon-1024.png" -w 1024 $ICON_SVG;
 
 for ICON in $ICONSET/Icon-*.png; do
   pngcrush -rem alla -ow -res 144 $ICON;

Authenticator/Resources/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -101,6 +101,12 @@
       "idiom" : "ipad",
       "filename" : "Icon-167.png",
       "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "Icon-1024.png",
+      "scale" : "1x"
     }
   ],
   "info" : {

Authenticator/Resources/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>2.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

Authenticator/Source/ButtonHeaderView.swift

@@ -57,7 +57,7 @@ class ButtonHeaderView<Action>: UIButton {
 
     private func configureSubviews() {
         titleLabel?.textAlignment = .center
-        titleLabel?.textColor = UIColor.otpForegroundColor
+        setTitleColor(.otpForegroundColor, for: UIControlState.normal)
         titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: UIFontWeightLight)
 
         addTarget(self, action: #selector(ButtonHeaderView.buttonWasPressed), for: .touchUpInside)

Authenticator/Source/OTPAppDelegate.swift

@@ -34,8 +34,17 @@ class OTPAppDelegate: UIResponder, UIApplicationDelegate {
     let app = AppController()
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
-        let barButtonAttributes = [NSFontAttributeName: UIFont.systemFont(ofSize: 17, weight: UIFontWeightLight)]
-        UIBarButtonItem.appearance().setTitleTextAttributes(barButtonAttributes, for: .normal)
+        let barButtonItemFont = UIFont.systemFont(ofSize: 17, weight: UIFontWeightLight)
+        let fontAttributes = [NSFontAttributeName: barButtonItemFont]
+        UIBarButtonItem.appearance().setTitleTextAttributes(fontAttributes, for: .normal)
+        UIBarButtonItem.appearance().setTitleTextAttributes(fontAttributes, for: .highlighted)
+        UIBarButtonItem.appearance().setTitleTextAttributes(fontAttributes, for: .selected)
+
+        let disabledAttributes = [
+            NSFontAttributeName: barButtonItemFont,
+            NSForegroundColorAttributeName: UIColor.otpBarForegroundColor.withAlphaComponent(0.3),
+        ]
+        UIBarButtonItem.appearance().setTitleTextAttributes(disabledAttributes, for: .disabled)
 
         // Restore white-on-black style
         SVProgressHUD.setForegroundColor(.otpLightColor)

Authenticator/Source/TokenListViewController.swift

@@ -250,6 +250,15 @@ extension TokenListViewController {
     override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return 85
     }
+
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let rowModel = viewModel.rowModels[indexPath.row]
+        if isEditing {
+            dispatchAction(rowModel.editAction)
+        } else {
+            dispatchAction(rowModel.selectAction)
+        }
+    }
 }
 
 // MARK: TokenListPresenter

Authenticator/Source/TokenRowCell.swift

@@ -140,18 +140,6 @@ class TokenRowCell: UITableViewCell {
 
     // MARK: - Actions
 
-    override func setSelected(_ selected: Bool, animated: Bool) {
-        super.setSelected(selected, animated: animated)
-
-        if selected, let rowModel = rowModel {
-            if self.isEditing {
-                dispatchAction?(rowModel.editAction)
-            } else {
-                dispatchAction?(rowModel.selectAction)
-            }
-        }
-    }
-
     func generateNextPassword() {
         if let action = rowModel?.buttonAction {
             dispatchAction?(action)

Cartfile.private

@@ -1,4 +1,4 @@
 # Configuration for Carthage (https://github.com/Carthage/Carthage)
 
 github "jspahrsummers/xcconfigs" ~> 0.10
-github "shinydevelopment/SimulatorStatusMagic" ~> 1.9
+github "shinydevelopment/SimulatorStatusMagic" ~> 2.0

Cartfile.resolved

@@ -2,4 +2,4 @@ github "SVProgressHUD/SVProgressHUD" "2.1.2"
 github "jspahrsummers/xcconfigs" "0.10"
 github "mattrubin/Base32" "1.1.2+carthage"
 github "mattrubin/OneTimePassword" "3.0"
-github "shinydevelopment/SimulatorStatusMagic" "1.9.5"
+github "shinydevelopment/SimulatorStatusMagic" "2.0"

Gemfile.lock

@@ -2,71 +2,72 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.5)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     babosa (1.0.2)
     claide (1.0.2)
     colored (1.2)
     colored2 (3.1.2)
-    commander-fastlane (4.4.4)
+    commander-fastlane (4.4.5)
       highline (~> 1.7.2)
+    declarative (0.0.10)
+    declarative-option (0.1.0)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.2.1)
-    excon (0.56.0)
-    faraday (0.12.1)
+    excon (0.59.0)
+    faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
-    faraday_middleware (0.11.0.1)
+    faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.0)
-    fastlane (2.37.0)
+    fastlane (2.64.0)
       CFPropertyList (>= 2.3, < 3.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
       bundler (>= 1.12.0, < 2.0.0)
       colored
-      commander-fastlane (>= 4.4.0, < 5.0.0)
+      commander-fastlane (>= 4.4.5, < 5.0.0)
       dotenv (>= 2.1.1, < 3.0.0)
       excon (>= 0.45.0, < 1.0.0)
       faraday (~> 0.9)
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 0.9)
-      fastimage (>= 1.6)
+      fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.0.1, < 2.0.0)
-      google-api-client (~> 0.9.2)
+      google-api-client (>= 0.13.1, < 0.14.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
       mini_magick (~> 4.5.1)
       multi_json
       multi_xml (~> 0.5)
       multipart-post (~> 2.0.0)
       plist (>= 3.1.0, < 4.0.0)
+      public_suffix (~> 2.0.0)
       rubyzip (>= 1.1.0, < 2.0.0)
       security (= 0.1.3)
       slack-notifier (>= 1.3, < 2.0.0)
       terminal-notifier (>= 1.6.2, < 2.0.0)
       terminal-table (>= 1.4.5, < 2.0.0)
       tty-screen (~> 0.5.0)
       word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.4.4, < 2.0.0)
+      xcodeproj (>= 1.5.0, < 2.0.0)
       xcpretty (>= 0.2.4, < 1.0.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.0.3)
-    google-api-client (0.9.28)
-      addressable (~> 2.3)
+    google-api-client (0.13.6)
+      addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.5)
-      httpclient (~> 2.7)
-      hurley (~> 0.1)
-      memoist (~> 0.11)
-      mime-types (>= 1.6)
-      representable (~> 2.3.0)
-      retriable (~> 2.0)
-    googleauth (0.5.1)
-      faraday (~> 0.9)
-      jwt (~> 1.4)
+      httpclient (>= 2.8.1, < 3.0)
+      mime-types (~> 3.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+    googleauth (0.6.1)
+      faraday (~> 0.12)
+      jwt (>= 1.4, < 3.0)
       logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
@@ -76,55 +77,56 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    hurley (0.2)
     json (2.1.0)
-    jwt (1.5.6)
+    jwt (2.1.0)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    memoist (0.15.0)
+    memoist (0.16.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_magick (4.5.1)
-    multi_json (1.12.1)
+    multi_json (1.12.2)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nanaimo (0.2.3)
     os (0.9.6)
     plist (3.3.0)
     public_suffix (2.0.5)
-    representable (2.3.0)
-      uber (~> 0.0.7)
-    retriable (2.1.0)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.1)
     rouge (2.0.7)
     rubyzip (1.2.1)
     security (0.1.3)
-    signet (0.7.3)
+    signet (0.8.1)
       addressable (~> 2.3)
       faraday (~> 0.9)
-      jwt (~> 1.5)
+      jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     slack-notifier (1.5.1)
     terminal-notifier (1.8.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    tty-screen (0.5.0)
-    uber (0.0.15)
+    tty-screen (0.5.1)
+    uber (0.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.4)
-    unicode-display_width (1.2.1)
+    unicode-display_width (1.3.0)
     word_wrap (1.0.0)
-    xcodeproj (1.5.0)
+    xcodeproj (1.5.3)
       CFPropertyList (~> 2.3.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.2.3)
     xcpretty (0.2.8)
       rouge (~> 2.0.7)
-    xcpretty-travis-formatter (0.0.4)
+    xcpretty-travis-formatter (1.0.0)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
@@ -134,4 +136,4 @@ DEPENDENCIES
   fastlane (~> 2.37)
 
 BUNDLED WITH
-   1.15.1
+   1.16.0

fastlane/Fastfile

@@ -34,6 +34,8 @@ platform :ios do
   lane :screenshots do
     # Generate updated screenshots.
     snapshot
+    # Compress the screenshots with pngcrush
+    sh "for IMG in screenshots/**/*.png; do pngcrush -rem alla -ow \"$IMG\"; done"
   end
 
   desc "Build the app for release"

fastlane/Gymfile

@@ -1,2 +1,8 @@
 scheme "Authenticator"
 clean true
+export_options(
+  method: "app-store",
+  provisioningProfiles: {
+    "me.mattrubin.authenticator": "Authenticator Distribution"
+  },
+)

fastlane/README.md

@@ -12,9 +12,9 @@ xcode-select --install
 
 <table width="100%" >
 <tr>
-<th width="33%"><a href="http://brew.sh">Homebrew</a></td>
-<th width="33%">Installer Script</td>
-<th width="33%">Rubygems</td>
+<th width="33%"><a href="http://brew.sh">Homebrew</a></th>
+<th width="33%">Installer Script</th>
+<th width="33%">RubyGems</th>
 </tr>
 <tr>
 <td width="33%" align="center">macOS</td>

fastlane/Snapfile

@@ -4,10 +4,10 @@ workspace "Authenticator.xcworkspace"
 scheme "Authenticator Demo"
 
 devices([
-  "iPhone 4s",
   "iPhone SE",
-  "iPhone 7",
-  "iPhone 7 Plus",
+  "iPhone 8",
+  "iPhone 8 Plus",
+  "iPhone X",
 ])
 
 languages([