Update to Swift 4

Author: npmccallum

u2f-ble-test-ios.xcodeproj/project.pbxproj

@@ -173,13 +173,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = Ledger;
 				TargetAttributes = {
 					37A639321CE5D711008A4159 = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = X6LFS5BQKN;
-						LastSwiftMigration = 0830;
+						LastSwiftMigration = 0920;
 					};
 				};
 			};
@@ -269,14 +269,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				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_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -316,14 +322,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				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_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -363,7 +375,8 @@
 				PROVISIONING_PROFILE = "3b6928eb-1bc8-4b44-8bd6-ae18213e7cd0";
 				SWIFT_OBJC_BRIDGING_HEADER = "u2f-ble-test-ios/u2f-ble-test-ios-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -381,7 +394,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "3b6928eb-1bc8-4b44-8bd6-ae18213e7cd0";
 				SWIFT_OBJC_BRIDGING_HEADER = "u2f-ble-test-ios/u2f-ble-test-ios-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

u2f-ble-test-ios/Utils/DataReader.swift

@@ -96,18 +96,18 @@ final class DataReader {
 
     // MARK: Internal methods
 
-    fileprivate func readNextInteger<T: Integer>() -> T? {
+    fileprivate func readNextInteger<T: BinaryInteger>() -> T? {
         guard let data = readNextDataOfLength(MemoryLayout<T>.size) else { return nil }
 
-        var value: T = 0
+        var value: T = T(0)
         (data as NSData).getBytes(&value, length: MemoryLayout<T>.size)
         return value
     }
 
     fileprivate func readNextInteger<T: EndianConvertible>(bigEndian: Bool) -> T? {
         guard let data = readNextDataOfLength(MemoryLayout<T>.size) else { return nil }
 
-        var value: T = 0 as! T
+        var value: T = T(0)
         (data as NSData).getBytes(&value, length: MemoryLayout<T>.size)
         return bigEndian ? value.bigEndian : value.littleEndian
     }

u2f-ble-test-ios/Utils/DataWriter.swift

@@ -82,7 +82,7 @@ final class DataWriter {
         internalData.append(data)
     }
 
-    fileprivate func writeNextInteger<T: Integer>(_ value: T) {
+    fileprivate func writeNextInteger<T: BinaryInteger>(_ value: T) {
         var value = value
         internalData.append(&value, length: MemoryLayout<T>.size)
     }

u2f-ble-test-ios/Utils/EndianConvertible.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-protocol EndianConvertible: Integer {
+protocol EndianConvertible: BinaryInteger {
 
     var bigEndian: Self { get }
     var littleEndian: Self { get }

u2f-ble-test-ios/ViewController.swift

@@ -163,7 +163,7 @@ class ViewController: UIViewController {
 
     fileprivate func appendLogMessage(_ message: String) {
         textView.text = textView.text + "- \(message)\n"
-        let range = NSMakeRange(textView.text.characters.count - 1, 1)
+        let range = NSMakeRange(textView.text.count - 1, 1)
         UIView.setAnimationsEnabled(false)
         textView.scrollRangeToVisible(range)
         UIView.setAnimationsEnabled(true)