Swift 4 updates

Author: Evan Maloney

Locksmith.xcodeproj/project.pbxproj

@@ -412,11 +412,11 @@
 				TargetAttributes = {
 					0EC25C581BA385AA004191AF = {
 						CreatedOnToolsVersion = 7.0;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 					0EC25C611BA385AB004191AF = {
 						CreatedOnToolsVersion = 7.0;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 						TestTargetID = E3DD3B331D84356500A59312;
 					};
 					0EC25C741BA385F6004191AF = {
@@ -430,7 +430,7 @@
 					};
 					E3DD3B331D84356500A59312 = {
 						CreatedOnToolsVersion = 8.0;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.Keychain = {
@@ -662,7 +662,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "net.matthewpalmer.Locksmith-iOS";
 				PRODUCT_NAME = Locksmith;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -685,7 +685,7 @@
 				PRODUCT_NAME = Locksmith;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -700,7 +700,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "net.matthewpalmer.Locksmith-iOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Test Host.app/Test Host";
 			};
 			name = Debug;
@@ -717,7 +717,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "net.matthewpalmer.Locksmith-iOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Test Host.app/Test Host";
 			};
 			name = Release;
@@ -981,7 +981,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "net.matthewpalmer.Test-Host";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -1003,7 +1003,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "net.matthewpalmer.Test-Host";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

Tests/LocksmithTests/LocksmithTests.swift

@@ -378,7 +378,7 @@ class LocksmithTests: XCTestCase {
                 ])
 
             let p = dict[String(kSecAttrPort)] as! CFNumber
-            XCTAssertEqual(p as Int, port)
+            XCTAssertEqual(p as! Int, port)
 
             expect.fulfill()
 
@@ -438,16 +438,16 @@ class LocksmithTests: XCTestCase {
                 ])
 
             let cr = dict[String(kSecAttrCreator)] as! CFNumber
-            XCTAssertEqual(cr as UInt, creator)
+            XCTAssertEqual(cr as! UInt, creator)
 
             let ty = dict[String(kSecAttrType)] as! CFNumber
-            XCTAssertEqual(ty as UInt, type)
+            XCTAssertEqual(ty as! UInt, type)
 
             let inv = dict[String(kSecAttrIsInvisible)] as! CFBoolean
-            XCTAssertEqual(inv as Bool, isInvisible)
+            XCTAssertEqual(inv as! Bool, isInvisible)
 
             let neg = dict[String(kSecAttrIsNegative)] as! CFBoolean
-            XCTAssertEqual(neg as Bool, isNegative)
+            XCTAssertEqual(neg as! Bool, isNegative)
 
             let gen = dict[String(kSecAttrGeneric)]
             XCTAssertNil(gen)