Fix swift 4 compiler crash (#23)

* Fix issues with Swift 4.

* Fix image in README.md

* update login gif

* rename gif to update readme file

* Update tests for Swift 4

Author: initFabian

Cely Demo/User.swift

@@ -49,7 +49,7 @@ struct User: CelyUser {
 extension User {
 
     static func save(_ value: Any, as property: Property) {
-        property.save(value: value)
+		property.save(value)
     }
 
     static func save(_ data: [Property : Any]) {

Cely.xcodeproj/project.pbxproj

@@ -411,7 +411,8 @@
 			children = (
 				35CD64E51E60192300AF060B /* xcconfigs */,
 			);
-			path = Configuration;
+			name = Configuration;
+			path = Sources/Configuration;
 			sourceTree = "<group>";
 		};
 		35CD64E51E60192300AF060B /* xcconfigs */ = {
@@ -424,7 +425,7 @@
 				35CD65141E60192300AF060B /* watchOS */,
 			);
 			name = xcconfigs;
-			path = Sources/xcconfigs;
+			path = Sources/Configuration/xcconfigs;
 			sourceTree = SOURCE_ROOT;
 		};
 		35CD64E71E60192300AF060B /* Base */ = {
@@ -691,12 +692,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0820;
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = ChaiOne;
 				TargetAttributes = {
 					1F28642A1E89578700EE8180 = {
 						CreatedOnToolsVersion = 8.2.1;
 						DevelopmentTeam = 7CX9JN6SPG;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.Keychain = {
@@ -706,7 +708,7 @@
 					};
 					3549BB201DA389CD00C63030 = {
 						CreatedOnToolsVersion = 8.0;
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 					3549BB2D1DA389DB00C63030 = {
@@ -726,7 +728,7 @@
 					};
 					3549BB601DA38ADB00C63030 = {
 						CreatedOnToolsVersion = 8.0;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Manual;
 						TestTargetID = 1F28642A1E89578700EE8180;
 					};
@@ -1038,7 +1040,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.chaione.Cely-Demo";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -1054,7 +1057,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.chaione.Cely-Demo";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -1068,7 +1072,9 @@
 				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_DOCUMENTATION_COMMENTS = YES;
@@ -1077,6 +1083,8 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_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_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -1107,6 +1115,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1123,7 +1132,9 @@
 				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_DOCUMENTATION_COMMENTS = YES;
@@ -1132,6 +1143,8 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_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_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -1154,6 +1167,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1180,7 +1194,8 @@
 				PRODUCT_NAME = Cely;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -1202,7 +1217,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.chaione.Cely.Cely;
 				PRODUCT_NAME = Cely;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -1366,7 +1382,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.chaione.Cely.CelyTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Cely Demo.app/Cely Demo";
 			};
 			name = Debug;
@@ -1384,7 +1401,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.chaione.Cely.CelyTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Cely Demo.app/Cely Demo";
 			};
 			name = Release;

Cely.xcodeproj/xcshareddata/xcschemes/Cely-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
       <Testables>
@@ -56,6 +57,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Images/background_cely_login.gif

@@ -20,7 +20,7 @@ Cely’s goal is to add a login system into your app in under 30 seconds!
 ## Overview
 Cely's goal is to add a login system into your app in under 30 seconds! 
 
-<div style="text-align:center; background-color: #8B9DFC"><img style="height: 600px" src ="Images/cely_login.gif" /></div>
+<img style="height: 600px" src ="Images/background_cely_login.gif" />
 
 ### Background
 Whether you're building an app for a client or for a hackathon, building a login system, no matter how basic it is, can be very tedious and time-consuming. Cely's architecture has been battle tested on countless apps, and Cely guarantees you a fully functional login system in a fraction of the time. You can trust Cely is handling login credentials correctly as well since Cely is built on top of [Locksmith](https://github.com/matthewpalmer/Locksmith), swift's most popular Keychain wrapper. 

Images/cely_login.gif

@@ -14,10 +14,10 @@ public struct Cely {
     fileprivate init() {}
     public typealias CelyLoginCompletion = (_ username: String, _ password: String) -> Void
     /// Properties that are needed inorder for user to stay logged in.
-    internal static var requiredProperties: [CelyProperty] = []
+    public static var requiredProperties: [CelyProperty] = []
 
     /// A `Storage` instance
-    internal static var store: CelyStorageProtocol = CelyStorage.sharedInstance
+    public static var store: CelyStorageProtocol = CelyStorage.sharedInstance
 
     /// A Completion Block that is expecting a `username:String` and a `password:String`
     public static var loginCompletionBlock: CelyLoginCompletion?
@@ -28,7 +28,7 @@ public struct Cely {
     /// - parameter forModel:           The `Model` Cely will be storing.
     /// - parameter requiredProperties: `[CelyProperty]`: The properties that cely tests against to determine if a user is logged in.
     /// - parameter withOptions:         Dictionary of options to pass into cely upon setup. Please refer to `CelyOptions` to view all options.
-    public static func setup<T: CelyUser, U: RawRepresentable>(with window: UIWindow?, forModel: T, requiredProperties:[U] = [], withOptions options: [CelyOptions : Any?]? = [:]) where T.Property == U {
+    public static func setup<T: CelyUser, U>(with window: UIWindow?, forModel: T, requiredProperties:[U] = [], withOptions options: [CelyOptions : Any?]? = [:]) where T.Property == U {
 
         Cely.requiredProperties = requiredProperties.flatMap({"\($0.rawValue)"})
 

README.md

@@ -57,7 +57,7 @@ class CelyLoginViewController: UIViewController {
         NotificationCenter.default.removeObserver(self)
     }
 
-    func didPressLogin() {
+    @objc func didPressLogin() {
         if let username = usernameField?.text, let password = passwordField?.text {
             Cely.loginCompletionBlock?(username, password)
         }
@@ -89,7 +89,7 @@ internal extension CelyLoginViewController {
         return (duration, endFrame, animationCurve)
     }
 
-    func keyboardNotification(notification: NSNotification) {
+    @objc func keyboardNotification(notification: NSNotification) {
 
         guard let (duration, endFrame, animationCurve) = convertNotification(notification: notification) else {
             return

Sources/Cely.swift

@@ -271,7 +271,7 @@ public extension GenericPasswordSecureStorable {
 }
 
 // dear god what have i done...
-public protocol GenericPasswordSecureStorableResultType: GenericPasswordSecureStorable, SecureStorableResultType, AccountBasedSecureStorableResultType, DescribableSecureStorableResultType, CommentableSecureStorableResultType, CreatorDesignatableSecureStorableResultType, IsInvisibleAssignableSecureStorableResultType {}
+public protocol GenericPasswordSecureStorableResultType: GenericPasswordSecureStorable, AccountBasedSecureStorableResultType, DescribableSecureStorableResultType, CommentableSecureStorableResultType, CreatorDesignatableSecureStorableResultType, IsInvisibleAssignableSecureStorableResultType {}
 
 public extension GenericPasswordSecureStorableResultType {
     var service: String {

Sources/CelyLoginViewController.swift

@@ -288,16 +288,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)

Sources/xcconfigs/Base/Common.xcconfig Sources/Configuration/xcconfigs/Base/Common.xcconfig

@@ -84,7 +84,7 @@ class CelyTests: XCTestCase {
 
 
     func testSetup() {
-        let testRequiredProperties = _properties.flatMap({"\($0.rawValue)"})
+        let testRequiredProperties: [String] = _properties.flatMap({"\($0.rawValue)"})
         XCTAssert(Cely.requiredProperties == testRequiredProperties, "Cely does not match the mock results")
     }