Upgrade OneTimePassword to a 4.0 pre-release

This upgrade requires adapting to the new throwing initializers, plus bumping the app deployment target to iOS 13

Authenticator.xcodeproj/project.pbxproj

@@ -785,7 +785,7 @@
 					"$(BUILT_PRODUCTS_DIR)",
 				);
 				GCC_DYNAMIC_NO_PIC = NO;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
@@ -800,7 +800,7 @@
 					"$(BUILT_PRODUCTS_DIR)",
 				);
 				GCC_DYNAMIC_NO_PIC = NO;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Release;

Authenticator/Source/Demo.swift

@@ -88,8 +88,8 @@ struct DemoTokenStore: TokenStore {
 
 private extension Token {
     init(name: String = "", issuer: String = "", factor: Generator.Factor) {
-        // swiftlint:disable:next force_unwrapping
-        let generator = Generator(factor: factor, secret: Data(), algorithm: .sha1, digits: 6)!
+        // swiftlint:disable:next force_try
+        let generator = try! Generator(factor: factor, secret: Data(), algorithm: .sha1, digits: 6)
         self.init(name: name, issuer: issuer, generator: generator)
     }
 }

Authenticator/Source/OTPAppDelegate.swift

@@ -62,7 +62,7 @@ class OTPAppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     func application(_ application: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey: Any] = [:]) -> Bool {
-        if let token = Token(url: url) {
+        if let token = try? Token(url: url) {
             let message = "Do you want to add a token for “\(token.name)”?"
 
             let alert = UIAlertController(title: "Add Token", message: message, preferredStyle: .alert)

Authenticator/Source/TokenEntryForm.swift

@@ -224,7 +224,7 @@ extension TokenEntryForm {
             factor = defaultTimerFactor
         }
 
-        guard let generator = Generator(
+        guard let generator = try? Generator(
             factor: factor,
             secret: secretData,
             algorithm: algorithm,

Authenticator/Source/TokenScanner.swift

@@ -77,7 +77,7 @@ struct TokenScanner: Component {
         case .scannerDecodedText(let text):
             // Attempt to create a token from the decoded text
             guard let url = URL(string: text),
-                let token = Token(url: url) else {
+                let token = try? Token(url: url) else {
                     // Show an error message
                     return .showErrorMessage("Invalid Token")
             }

AuthenticatorTests/TableDiffTests.swift

@@ -30,12 +30,12 @@ import XCTest
 class TableDiffTests: XCTestCase {
     private let defaultDigitGroupSize = 2
 
-    func testNoChanges() {
+    func testNoChanges() throws {
         // swiftlint:disable force_unwrapping
-        let generator = Generator(factor: .timer(period: 60),
-                                  secret: "secret".data(using: String.Encoding.utf8)!,
-                                  algorithm: .sha256,
-                                  digits: 6)!
+        let generator = try Generator(factor: .timer(period: 60),
+                                      secret: "secret".data(using: String.Encoding.utf8)!,
+                                      algorithm: .sha256,
+                                      digits: 6)
         // swiftlint:enable force_unwrapping
         let token = Token(name: "Token Name",
                           issuer: "Token Issuer",

AuthenticatorTests/TokenListTests.swift

@@ -158,10 +158,11 @@ func mockPersistentTokens(_ list: [(String, String)]) -> [PersistentToken] {
 
 func mockToken(name: String, issuer: String, secret: String = "mocksecret") -> Token {
     // swiftlint:disable force_unwrapping
-    let generator = Generator(factor: .timer(period: 60),
-                              secret: secret.data(using: String.Encoding.utf8)!,
-                              algorithm: .sha256,
-                              digits: 6)!
+    // swiftlint:disable:next force_try
+    let generator = try! Generator(factor: .timer(period: 60),
+                                   secret: secret.data(using: String.Encoding.utf8)!,
+                                   algorithm: .sha256,
+                                   digits: 6)
     // swiftlint:enable force_unwrapping
     return Token(name: name, issuer: issuer, generator: generator)
 }

AuthenticatorTests/TokenScannerTests.swift

@@ -103,7 +103,7 @@ class TokenScannerTests: XCTestCase {
         XCTAssertTrue(tokenScanner.viewModel.isScanning)
     }
 
-    func testScannerDecodedGoodURL() {
+    func testScannerDecodedGoodURL() throws {
         var tokenScanner = TokenScanner()
         XCTAssertTrue(tokenScanner.viewModel.isScanning)
 
@@ -116,7 +116,7 @@ class TokenScannerTests: XCTestCase {
                 return
         }
         // swiftlint:disable:next force_unwrapping
-        let expectedToken = Token(url: URL(string: urlString)!)
+        let expectedToken = try Token(url: URL(string: urlString)!)
         XCTAssertEqual(token, expectedToken)
 
         // The scanner should stop after the first successful token capture.

Cartfile

@@ -1,4 +1,4 @@
 # Configuration for Carthage (https://github.com/Carthage/Carthage)
 
-github "mattrubin/OneTimePassword" ~> 3.2
+github "mattrubin/OneTimePassword" "4.0.0-pre.0"
 github "SVProgressHUD/SVProgressHUD" ~> 2.2

Cartfile.resolved

@@ -1,5 +1,5 @@
 github "SVProgressHUD/SVProgressHUD" "2.2.5"
-github "mattrubin/Base32" "1.1.2+xcode10.2"
-github "mattrubin/OneTimePassword" "3.2.0"
+github "mattrubin/Base32" "1.2.0"
+github "mattrubin/OneTimePassword" "4.0.0-pre.0"
 github "shinydevelopment/SimulatorStatusMagic" "2.7"
 github "xcconfigs/xcconfigs" "1.1"