Merge pull request #50 from uphold/feature/migrate-swift3

Xcode 8 & Swift 3 migration

.gitignore

@@ -8,6 +8,10 @@ Carthage/
 # Mac OS X
 .DS_Store
 
+# Swift package manager
+.build/
+Packages/
+
 # Xcode settings
 !default.mode1v3
 !default.mode2v3

.swiftlint.yml

@@ -1,11 +1,14 @@
 disabled_rules:
+  - conditional_binding_cascade
   - control_statement
   - file_length
   - function_body_length
   - function_parameter_count
+  - implicit_getter
   - line_length
   - type_body_length
   - variable_name
+  - unused_optional_binding
 
 included:
   - SampleApplication

.travis.yml

@@ -1,16 +1,17 @@
 language: objective-c
 
-osx_image: xcode7.3
+osx_image: xcode8.3
 
 env:
   - SCHEME=UpholdSdk
   - SCHEME=UpholdSdkSandbox
 
 before_script:
-  - carthage update --platform iOS
-  # Workaround introduced to fix the xctool issue #454 (https://github.com/facebook/xctool/issues/454).
-  - open /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app --args -CurrentDeviceUDID 75FC400A-B2AA-4DD6-B159-8687FAA5018A
+  - carthage bootstrap --platform iOS --no-build
+  - cd Carthage/Checkouts/URITemplate.swift && echo "IPHONEOS_DEPLOYMENT_TARGET = 8.0" > Configuration.xcconfig && swift package generate-xcodeproj --xcconfig-overrides Configuration.xcconfig
+  - cd ../../../
+  - carthage build --platform iOS --configuration ProductionRelease
 
 script:
   - swiftlint lint --strict
-  - xctool -project UpholdSdk.xcodeproj -scheme $SCHEME test sdk iphonesimulator CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
+  - xcodebuild -project UpholdSdk.xcodeproj test -scheme $SCHEME -sdk iphonesimulator -destination "name=iPhone SE" | xcpretty

Cartfile

@@ -1,5 +1,5 @@
-github "Hearst-DD/ObjectMapper" ~> 1.2.0
-github "mxcl/OMGHTTPURLRQ" ~> 3.1.2
-github "mxcl/PromiseKit" ~> 3.2.1
-github "marketplacer/keychain-swift" ~> 3.0.13
-github "theadam/SwiftClient" ~> 2.0.3
+github "Hearst-DD/ObjectMapper" ~> 2.2.8
+github "mxcl/OMGHTTPURLRQ" ~> 3.2.2
+github "mxcl/PromiseKit" ~> 4.1.8
+github "marketplacer/keychain-swift" ~> 7.0.1
+github "theadam/SwiftClient" ~> 3.0.3

Cartfile.private

@@ -1,2 +1,2 @@
-github "vadymmarkov/Fakery" ~> 1.2.0
-github "seegno-forks/Mockingjay" "support/add-carthage-configuration"
+github "vadymmarkov/Fakery" ~> 2.0.0
+github "uphold-forks/Mockingjay" "support/add-carthage-configuration"

Cartfile.resolved

@@ -1,8 +1,8 @@
-github "vadymmarkov/Fakery" "1.4.0"
+github "vadymmarkov/Fakery" "2.0.0"
 github "mxcl/OMGHTTPURLRQ" "3.2.2"
-github "Hearst-DD/ObjectMapper" "1.5.0"
-github "mxcl/PromiseKit" "3.5.3"
-github "theadam/SwiftClient" "2.0.3"
-github "kylef/URITemplate.swift" "175429f708de77e1c894e2fa4bc6c61f461822bb"
-github "marketplacer/keychain-swift" "3.0.16"
-github "seegno-forks/Mockingjay" "68b619819ecee654297ff2349b934032c33581f9"
+github "Hearst-DD/ObjectMapper" "2.2.8"
+github "mxcl/PromiseKit" "4.4.1"
+github "theadam/SwiftClient" "3.0.3"
+github "kylef/URITemplate.swift" "2.0.1"
+github "marketplacer/keychain-swift" "7.0.1"
+github "uphold-forks/Mockingjay" "40275c6b531fb9514327d9ce09e0acf9128a774c"

README.md

@@ -6,8 +6,8 @@ The Uphold SDK for iOS provides an easy way for developers to integrate iOS appl
 
 ## Requirements
 
-    * Xcode 7
-    * Swift 2
+    * Xcode 8
+    * Swift 3
     * Carthage or CocoaPods
 
 ## Installation
@@ -17,7 +17,7 @@ The Uphold SDK for iOS provides an easy way for developers to integrate iOS appl
 1. Add to your `Podfile`.
 
     ```
-    platform :ios, '9.0'
+    platform :ios, '10.0'
     use_frameworks!
 
     # To use Uphold's production environment.
@@ -117,6 +117,8 @@ upholdClient.getUser().then { (user: User) -> () in
 }
 ```
 
+Note: Don't forget to add keychain sharing capabilities in your application's target inside the `Capabilities` tab.
+
 ### Get user cards with chaining
 
 ```swift
@@ -337,7 +339,8 @@ To build the sample application you need the [Xcode](https://developer.apple.com
  ```
 
 3. Open the sample project `SampleApplication.xcodeproj`.
-4. Build and run the app from inside Xcode.
+4. Add keychain sharing capabilities.
+5. Build and run the app from inside Xcode.
 
 The sample application is configured to use the [sandbox environment](https://sandbox.uphold.com), make sure you use a sandbox account to perform the login.
 

SampleApplication.xcodeproj/project.pbxproj

@@ -184,11 +184,18 @@
 		BC2381051BB461DE0060CC80 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = Uphold;
 				TargetAttributes = {
 					BC23810C1BB461DE0060CC80 = {
 						CreatedOnToolsVersion = 7.0;
+						DevelopmentTeam = Q4SY8DMFN5;
+						LastSwiftMigration = 0800;
+						SystemCapabilities = {
+							com.apple.Keychain = {
+								enabled = 0;
+							};
+						};
 					};
 				};
 			};
@@ -329,8 +336,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -352,7 +361,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -365,11 +374,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = Q4SY8DMFN5;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS";
 				INFOPLIST_FILE = SampleApplication/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uphold.sample;
 				PRODUCT_NAME = SampleApplication;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = ProductionDebug;
@@ -387,8 +399,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -404,9 +418,10 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -416,11 +431,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = Q4SY8DMFN5;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS";
 				INFOPLIST_FILE = SampleApplication/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uphold.sample;
 				PRODUCT_NAME = SampleApplication;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = ProductionRelease;
@@ -438,8 +456,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -461,7 +481,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -483,8 +503,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -500,9 +522,10 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -512,11 +535,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = Q4SY8DMFN5;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS";
 				INFOPLIST_FILE = SampleApplication/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uphold.sample;
 				PRODUCT_NAME = SampleApplication;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = SandboxDebug;
@@ -525,11 +551,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = Q4SY8DMFN5;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS";
 				INFOPLIST_FILE = SampleApplication/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uphold.sample;
 				PRODUCT_NAME = SampleApplication;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = SandboxRelease;

SampleApplication.xcodeproj/xcshareddata/xcschemes/SampleApplication.xcscheme

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

SampleApplication/AppDelegate.swift

@@ -14,8 +14,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
       - returns: A boolean indicating if the application was launch successfully.
     */
-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject : AnyObject]?) -> Bool {
-        self.window = UIWindow(frame: UIScreen.mainScreen().bounds)
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+        self.window = UIWindow(frame: UIScreen.main.bounds)
 
         guard let window = self.window else {
             return false
@@ -36,8 +36,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
       - returns: A boolean indicating if the application can handle the URL resource or continue a user activity.
     */
-    func application(application: UIApplication, openURL url: NSURL, options: [String : AnyObject]) -> Bool {
-        guard let window = self.window, rootViewController = window.rootViewController, loginViewController = rootViewController as? LoginViewController else {
+    func application(_ application: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any]) -> Bool {
+        guard let window = self.window, let rootViewController = window.rootViewController, let loginViewController = rootViewController as? LoginViewController else {
             return false
         }
 

SampleApplication/ViewController/LoginViewController/LoginViewController.swift

@@ -24,19 +24,19 @@ class LoginViewController: UIViewController, SFSafariViewControllerDelegate {
 
       - parameter sender: The pressed login button.
     */
-    @IBAction func didTapLoginButton(sender: AnyObject) {
+    @IBAction func didTapLoginButton(_ sender: AnyObject) {
         self.client = UpholdClient()
-        self.loginButton.enabled = false
+        self.loginButton.isEnabled = false
         let scopes: [String] = ["cards:read", "user:read"]
-        self.state = String(format: "oauth2:%@", NSUUID().UUIDString)
+        self.state = String(format: "oauth2:%@", UUID().uuidString)
 
-        guard let client = self.client, state = self.state else {
+        guard let client = self.client, let state = self.state else {
             self.handleError()
 
             return
         }
 
-        self.authorizationViewController = client.beginAuthorization(self, clientId: self.CLIENT_ID, scopes: scopes, state: state)
+        self.authorizationViewController = client.beginAuthorization(applicationViewController: self, clientId: self.CLIENT_ID, scopes: scopes, state: state)
 
         guard let authorizationViewController = self.authorizationViewController else {
             return
@@ -50,40 +50,40 @@ class LoginViewController: UIViewController, SFSafariViewControllerDelegate {
 
       - parameter url: Authorization URL.
     */
-    func completeAuthorization(url: NSURL) {
+    func completeAuthorization(_ url: URL) {
         let userViewController = UserViewController()
 
-        guard authorizationViewController = self.authorizationViewController, client = self.client, state = self.state else {
+        guard let authorizationViewController = self.authorizationViewController, let client = self.client, let state = self.state else {
             return self.handleError()
         }
 
-        client.completeAuthorization(authorizationViewController, clientId: self.CLIENT_ID, clientSecret: self.CLIENT_SECRET, grantType: "authorization_code", state: state, uri: url).then { (response: AuthenticationResponse) -> () in
+        client.completeAuthorization(authorizationViewController: authorizationViewController, clientId: self.CLIENT_ID, clientSecret: self.CLIENT_SECRET, grantType: "authorization_code", state: state, uri: url).then { (response: AuthenticationResponse) -> Void in
             userViewController.bearerToken = response.accessToken
 
-            self.presentViewController(userViewController, animated: true, completion: nil)
-        }.error { (error: ErrorType) -> Void in
+            self.present(userViewController, animated: true, completion: nil)
+        }.catch(execute: { (_: Error) in
             self.handleError()
-        }
+        })
     }
 
     /**
       Handles login errors.
     */
     func handleError() {
-        let alertController = UIAlertController(title: String(NSLocalizedString("login-view-controller.alert-title-login-error", comment: "Login Error.")), message: String(NSLocalizedString("global.unknown-error", comment: "Something went wrong.")), preferredStyle: .Alert)
-        self.loginButton.enabled = true
+        let alertController = UIAlertController(title: String(NSLocalizedString("login-view-controller.alert-title-login-error", comment: "Login Error.")), message: String(NSLocalizedString("global.unknown-error", comment: "Something went wrong.")), preferredStyle: .alert)
+        self.loginButton.isEnabled = true
 
-        alertController.addAction(UIAlertAction(title: String(NSLocalizedString("global.dismiss", comment: "Dismiss.")), style: .Default, handler: nil))
-        self.presentViewController(alertController, animated: true, completion:nil)
+        alertController.addAction(UIAlertAction(title: String(NSLocalizedString("global.dismiss", comment: "Dismiss.")), style: .default, handler: nil))
+        self.present(alertController, animated: true, completion: nil)
     }
 
     /**
       Called when the user taps the done button to dismiss the Safari view.
 
       - parameter controller: The view controller.
     */
-    func safariViewControllerDidFinish(controller: SFSafariViewController) {
-        self.loginButton.enabled = true
+    func safariViewControllerDidFinish(_ controller: SFSafariViewController) {
+        self.loginButton.isEnabled = true
     }
 
 }