Swift 3.1 support

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Verify iOS SDK Changelog
 
+### v1.0.6 (10/05/2017)
+
+- Swift 3.1 support
+
 ### v1.0.4 (16/11/2016)
 
 * New: Push notification sent from APNS

DeviceProperties/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Nexmo/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

NexmoVerify.podspec.json

@@ -1,6 +1,6 @@
 {
     "name": "NexmoVerify",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "license": {
         "type": "Custom"
     },

NexmoVerifyTests/VerifyIosSdkTests.swift

@@ -190,7 +190,7 @@ class VerifyIosSdkTests: XCTestCase {
             }
 
             XCTAssertEqual(200, response!.statusCode, "HttpRequest returned status code [ \(response!.statusCode)")
-            VerifyIosSdkTests.Log.info("Response body = \(response!.body)")
+            VerifyIosSdkTests.Log.info("Response body = \(String(describing: response!.body))")
 
             requestFinished.fulfill()
         }
@@ -234,7 +234,7 @@ class VerifyIosSdkTests: XCTestCase {
             }
 
             XCTAssertEqual(200, response!.statusCode, "HttpRequest returned status code [ \(response!.statusCode)")
-            VerifyIosSdkTests.Log.info("Response body = \(response!.body)")
+            VerifyIosSdkTests.Log.info("Response body = \(String(describing: response!.body))")
 
             if let body = response!.body,
             let json = (try? JSONSerialization.jsonObject(with: body.data(using: .utf8, allowLossyConversion: false)!, options: JSONSerialization.ReadingOptions.mutableContainers)) as? [String: AnyObject] {
@@ -270,14 +270,14 @@ class VerifyIosSdkTests: XCTestCase {
         VerifyIosSdkTests.Log.info("Successfully connected to internet")
         let ipAddress = SDKDeviceProperties.sharedInstance().getIpAddress()
         XCTAssertNotNil(ipAddress, "IP Address returned null")
-        VerifyIosSdkTests.Log.info("IP Address returned = \(ipAddress)")
+        VerifyIosSdkTests.Log.info("IP Address returned = \(String(describing: ipAddress))")
     }
 
     /** Test retrieving or creating the unique device identifier */
     func testGetUid() {
         let uid = SDKDeviceProperties.sharedInstance().getUniqueDeviceIdentifierAsString()
         XCTAssertNotNil(uid, "Uid returned was nil!")
-        VerifyIosSdkTests.Log.info("Returned UID = \(uid)")
+        VerifyIosSdkTests.Log.info("Returned UID = \(String(describing: uid))")
     }
 
     func testVerifySuccess() {
@@ -400,7 +400,7 @@ class VerifyIosSdkTests: XCTestCase {
         VerifyClient.sharedInstance.getVerifiedUser(countryCode: nil, phoneNumber: VerifyIosSdkTests.TEST_NUMBER, onVerifyInProgress: {
                 sleep(30)
                 VerifyClient.cancelVerification() { error in
-                    XCTAssertNil(error, "Cancel request returned error: \(error)")
+                    XCTAssertNil(error, "Cancel request returned error: \(String(describing: error))")
                     cancelExpectation.fulfill()
                 }
             }, onUserVerified: {
@@ -430,7 +430,7 @@ class VerifyIosSdkTests: XCTestCase {
         let nextEventExpetation = expectation(description: "trigger next event callback")
         VerifyClient.getVerifiedUser(countryCode: nil, phoneNumber: VerifyIosSdkTests.TEST_NUMBER, onVerifyInProgress: {
                 VerifyClient.triggerNextEvent() { error in
-                    XCTAssertNil(error, "triggerNextEvent request returned error: \(error)")
+                    XCTAssertNil(error, "triggerNextEvent request returned error: \(String(describing: error))")
                     nextEventExpetation.fulfill()
                 }
             }, onUserVerified: {
@@ -447,7 +447,7 @@ class VerifyIosSdkTests: XCTestCase {
         NexmoClient.start(applicationId: VerifyIosSdkTests.APP_KEY, sharedSecretKey: VerifyIosSdkTests.APP_SECRET)
         let searchExpectation = expectation(description: "search callback")
         VerifyClient.getUserStatus(countryCode: VerifyIosSdkTests.TEST_COUNTRY_CODE, number: VerifyIosSdkTests.TEST_NUMBER) { status, error in
-            XCTAssertNil(error, "search request returned error: \(error)")
+            XCTAssertNil(error, "search request returned error: \(String(describing: error))")
             if let status = status {
                 print("search returned user status: \(status)")
             }

RequestSigning/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

VerifySDK.xcodeproj/project.pbxproj

@@ -887,7 +887,7 @@
 					1091949A1DE48C9F00AC3E68 = {
 						CreatedOnToolsVersion = 8.2;
 						LastSwiftMigration = 0820;
-						ProvisioningStyle = Manual;
+						ProvisioningStyle = Automatic;
 					};
 					109194AD1DE5AD8B00AC3E68 = {
 						CreatedOnToolsVersion = 8.2;
@@ -1254,13 +1254,14 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = 7F2B5ZSP8Q;
 				INFOPLIST_FILE = NexmoDevicePropertiesTest/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.nexmo.verify.NexmoDevicePropertiesTest;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "ad1a5840-00a5-4333-957f-ce9408e2cf58";
+				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OBJC_BRIDGING_HEADER = "NexmoDevicePropertiesTest/NexmoDevicePropertiesTest-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -1282,7 +1283,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.nexmo.verify.NexmoDevicePropertiesTest;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "ad1a5840-00a5-4333-957f-ce9408e2cf58";
+				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "NexmoDevicePropertiesTest/NexmoDevicePropertiesTest-Bridging-Header.h";
 				SWIFT_VERSION = 3.0;
 			};

VerifySDK/BaseResponse.swift

@@ -96,7 +96,7 @@ class BaseResponse {
         if (digest == signature) {
             return true
         } else {
-            BaseResponse.Log.error("Generated signature [ \(digest) ] didn't match response signature [ \(signature) ]")
+            BaseResponse.Log.error("Generated signature [ \(String(describing: digest)) ] didn't match response signature [ \(signature) ]")
             return false
         }
     }
@@ -108,7 +108,7 @@ class BaseResponse {
         if (digest == signature) {
             return true
         } else {
-            BaseResponse.Log.error("Generated signature [ \(digest) ] didn't match response signature [ \(signature) ]")
+            BaseResponse.Log.error("Generated signature [ \(String(describing: digest)) ] didn't match response signature [ \(String(describing: signature)) ]")
             return false
         }
     }

VerifySDK/HttpRequestBuilder.swift

@@ -152,7 +152,7 @@ class HttpRequestBuilder {
 
         // content-type and charset
         let charsetName = CFStringConvertEncodingToIANACharSetName(CFStringConvertNSStringEncodingToEncoding(self.encoding.rawValue))
-        request.addValue(self.contentType.rawValue + "; charset=" + (charsetName as! String), forHTTPHeaderField: "Content-Type")
+        request.addValue(self.contentType.rawValue + "; charset=" + (charsetName! as String), forHTTPHeaderField: "Content-Type")
 
         return HttpRequest(request: request as URLRequest, encoding: self.encoding)
     }

VerifySDK/HttpResponse.swift

@@ -36,7 +36,7 @@ class HttpResponse {
         self.statusCode = response.statusCode
         self.headers = response.allHeaderFields
 
-        if let stringData = NSString(data: data, encoding: encoding.rawValue) as? String {
+        if let stringData = NSString(data: data, encoding: encoding.rawValue) as String? {
             self.body = stringData
             HttpResponse.Log.info("message body = \(stringData)")
         } else  {

VerifySDK/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>