Update to Swift 4.2 (#34)

* Update to Swift 4.2

Signed-off-by: Alex Du Bois <[email protected]>

* Update Readme file for swift 4.2

* update tests for swift 4.2

* update tests to swift 4.2 syntax

* update package manager information to swift 4.2

Author: alextall

.swift-version

@@ -1 +1 @@
-3.0
+4.2

Cely Demo/AppDelegate.swift

@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
 
         Cely.setup(with: window!, forModel: User(), requiredProperties: [.token], withOptions: [
             .loginCompletionBlock: { (username: String, password: String) in

Cely.podspec

@@ -1,20 +1,21 @@
-Pod::Spec.new do |s|
- s.name = 'Cely'
- s.version = '2.0.3'
- s.license = { :type => "MIT", :file => "LICENSE" }
- s.summary = 'Cely’s goal is to add a login system into your app in under 30 seconds!'
- s.homepage = 'https://chaione.com/'
- s.social_media_url = 'https://twitter.com/initfabian'
- s.authors = { "Fabian Buentello" => "[email protected]" }
- s.source = { :git => "https://github.com/ChaiOne/Cely.git", :tag => s.version.to_s }
- s.platforms     = { :ios => "9.0" }
- s.requires_arc = true
+Pod::Spec.new do |spec|
+  spec.swift_version = '4.2'
+  spec.name = 'Cely'
+  spec.version = '2.1.0'
+  spec.license = { :type => "MIT", :file => "LICENSE" }
+  spec.summary = 'Cely’s goal is to add a login system into your app in under 30 seconds!'
+  spec.homepage = 'https://github.com/initFabian/Cely'
+  spec.social_media_url = 'https://twitter.com/initfabian'
+  spec.authors = { "Fabian Buentello" => "[email protected]" }
+  spec.source = { :git => "https://github.com/initFabian/Cely.git", :tag => spec.version.to_s }
+  spec.platforms     = { :ios => "10.3" }
+  spec.requires_arc = true
 
- s.default_subspec = "Core"
- s.subspec "Core" do |ss|
-     ss.resources = 'Sources/Supporting Files/*.{storyboard,xib,xcassets,json,imageset,png}'
-     ss.source_files  = "Sources/*.swift"
-     ss.framework  = "Foundation"
- end
+  spec.default_subspec = "Core"
+  spec.subspec "Core" do |subspec|
+    subspec.resources = 'Sources/Supporting Files/*.{storyboard,xib,xcassets,json,imageset,png}'
+    subspec.source_files  = "Sources/*.swift"
+    subspec.framework  = "Foundation"
+  end
 
 end

Cely.xcodeproj/project.pbxproj

@@ -728,7 +728,7 @@
 					};
 					3549BB601DA38ADB00C63030 = {
 						CreatedOnToolsVersion = 8.0;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Manual;
 						TestTargetID = 1F28642A1E89578700EE8180;
 					};
@@ -749,6 +749,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -1041,7 +1042,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.chaione.Cely-Demo";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1058,7 +1059,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.chaione.Cely-Demo";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1109,7 +1110,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 = 9.1;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1163,7 +1164,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 = 9.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -1195,7 +1196,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1218,7 +1219,7 @@
 				PRODUCT_NAME = Cely;
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1382,8 +1383,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.chaione.Cely.CelyTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Cely Demo.app/Cely Demo";
 			};
 			name = Debug;
@@ -1401,8 +1401,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.chaione.Cely.CelyTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Cely Demo.app/Cely Demo";
 			};
 			name = Release;

README.md

@@ -700,7 +700,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 use_frameworks!
 
-pod 'Cely', '~> 2.0'
+pod 'Cely', '~> 2.1'
 ```
 
 Then, run the following command:
@@ -723,7 +723,7 @@ $ brew install carthage
 To integrate Cely into your Xcode project using Carthage, specify it in your `Cartfile`:
 
 ```ogdl
-github "initFabian/Cely" ~> 2.0
+github "initFabian/Cely" ~> 2.1
 ```
 
 ### Manually

Sources/CelyLoginViewController.swift

@@ -73,18 +73,18 @@ internal extension CelyLoginViewController {
 
     fileprivate func setUpKeyboardNotification() {
          NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardNotification(notification:)),
-                                                name: .UIKeyboardWillChangeFrame, object: nil)
+                                                name: UIResponder.keyboardWillChangeFrameNotification, object: nil)
     }
 
-    func convertNotification(notification: NSNotification) -> (duration: Double, endFrame: CGRect, animationCurve: UIViewAnimationOptions)? {
+    func convertNotification(notification: NSNotification) -> (duration: Double, endFrame: CGRect, animationCurve: UIView.AnimationOptions)? {
 
         guard let userInfo = notification.userInfo,
-            let duration = (userInfo[UIKeyboardAnimationDurationUserInfoKey] as? NSNumber)?.doubleValue,
-            let endFrame = (userInfo[UIKeyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue,
-            let rawCurve = (notification.userInfo![UIKeyboardAnimationCurveUserInfoKey] as? NSNumber)?.uint32Value else { return nil }
+            let duration = (userInfo[UIResponder.keyboardAnimationDurationUserInfoKey] as? NSNumber)?.doubleValue,
+            let endFrame = (userInfo[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue,
+            let rawCurve = (notification.userInfo![UIResponder.keyboardAnimationCurveUserInfoKey] as? NSNumber)?.uint32Value else { return nil }
 
         let rawAnimationCurve = rawCurve << 16
-        let animationCurve = UIViewAnimationOptions(rawValue: UInt(rawAnimationCurve))
+        let animationCurve = UIView.AnimationOptions(rawValue: UInt(rawAnimationCurve))
 
         return (duration, endFrame, animationCurve)
     }

Tests/LoginViewControllerTests.swift

@@ -37,9 +37,12 @@ class LoginViewControllerTests: XCTestCase {
         CelyWindowManager.manager.loginStyle = DummyStyles()
         loginVC = CelyLoginViewController()
 
-        loginVC.usernameField = UITextField()
+        let usernameTextField = UITextField()
+		let passwordTextField = UITextField()
+		
+		loginVC.usernameField = usernameTextField
         loginVC.usernameField?.tag = 0
-        loginVC.passwordField = UITextField()
+        loginVC.passwordField = passwordTextField
         loginVC.passwordField?.tag = 1
         loginVC.textFields = [loginVC.usernameField!, loginVC.passwordField!]
         loginVC.viewDidLoad()
@@ -133,12 +136,12 @@ extension LoginViewControllerTests {
 
     func testConvertNotification_Failure() {
         let fakeUserInfo: [AnyHashable : Any] = [
-            UIKeyboardAnimationDurationUserInfoKey : "FORCE FAIL",
-            UIKeyboardFrameEndUserInfoKey : NSValue(cgRect: .zero),
-            UIKeyboardAnimationCurveUserInfoKey : NSNumber(value: 30)
+            UIResponder.keyboardAnimationDurationUserInfoKey : "FORCE FAIL",
+            UIResponder.keyboardFrameEndUserInfoKey : NSValue(cgRect: .zero),
+            UIWindow.keyboardAnimationCurveUserInfoKey : NSNumber(value: 30)
         ]
 
-        let fakeNotification = NSNotification(name: .UIKeyboardWillChangeFrame, object: nil, userInfo: fakeUserInfo)
+        let fakeNotification = NSNotification(name: UIResponder.keyboardWillChangeFrameNotification, object: nil, userInfo: fakeUserInfo)
 
         let converted = loginVC.convertNotification(notification: fakeNotification)
 
@@ -148,12 +151,12 @@ extension LoginViewControllerTests {
     func testConvertNotification_Success() {
 
         let fakeUserInfo: [AnyHashable : Any] = [
-            UIKeyboardAnimationDurationUserInfoKey : NSNumber(value: 20),
-            UIKeyboardFrameEndUserInfoKey : NSValue(cgRect: .zero),
-            UIKeyboardAnimationCurveUserInfoKey : NSNumber(value: 30)
+            UIResponder.keyboardAnimationDurationUserInfoKey : NSNumber(value: 20),
+            UIResponder.keyboardFrameEndUserInfoKey : NSValue(cgRect: .zero),
+            UIResponder.keyboardAnimationCurveUserInfoKey : NSNumber(value: 30)
         ]
 
-        let fakeNotification = NSNotification(name: .UIKeyboardWillChangeFrame, object: nil, userInfo: fakeUserInfo)
+        let fakeNotification = NSNotification(name: UIResponder.keyboardWillChangeFrameNotification, object: nil, userInfo: fakeUserInfo)
 
         let converted = loginVC.convertNotification(notification: fakeNotification)
 
@@ -163,8 +166,8 @@ extension LoginViewControllerTests {
         XCTAssertEqual(converted?.endFrame, .zero, "failed to set endFrame")
         XCTAssert(type(of: converted!.endFrame) == CGRect.self, "endFrame is not of type CGRect.")
 
-        XCTAssertEqual(converted?.animationCurve, UIViewAnimationOptions(rawValue: UInt(30) << 16), "failed to set duration")
-        XCTAssert(type(of: converted!.animationCurve) == UIViewAnimationOptions.self, "animationCurve is not of type UIViewAnimationOptions.")
+        XCTAssertEqual(converted?.animationCurve, UIView.AnimationOptions(rawValue: UInt(30) << 16), "failed to set duration")
+        XCTAssert(type(of: converted!.animationCurve) == UIView.AnimationOptions.self, "animationCurve is not of type UIViewAnimationOptions.")
 
         print(converted ?? "failed to convert")
     }
@@ -176,12 +179,12 @@ extension LoginViewControllerTests {
         loginVC.bottomLayoutConstraint.constant = 20
 
         let fakeUserInfo: [AnyHashable : Any] = [
-            UIKeyboardAnimationDurationUserInfoKey : NSNumber(value: 20),
-            UIKeyboardFrameEndUserInfoKey : NSValue(cgRect: CGRect(x: 0, y: 200, width: 320, height: 500)),
-            UIKeyboardAnimationCurveUserInfoKey : NSNumber(value: 30)
+            UIResponder.keyboardAnimationDurationUserInfoKey : NSNumber(value: 20),
+            UIResponder.keyboardFrameEndUserInfoKey : NSValue(cgRect: CGRect(x: 0, y: 200, width: 320, height: 500)),
+            UIResponder.keyboardAnimationCurveUserInfoKey : NSNumber(value: 30)
         ]
 
-        let fakeNotification = NSNotification(name: .UIKeyboardWillChangeFrame, object: nil, userInfo: fakeUserInfo)
+        let fakeNotification = NSNotification(name: UIResponder.keyboardWillChangeFrameNotification, object: nil, userInfo: fakeUserInfo)
 
         loginVC.keyboardNotification(notification: fakeNotification)
 
@@ -198,12 +201,12 @@ extension LoginViewControllerTests {
         loginVC.bottomLayoutConstraint.constant = 20
 
         let fakeUserInfo: [AnyHashable : Any] = [
-            UIKeyboardAnimationDurationUserInfoKey : "FORCE FAIL",
-            UIKeyboardFrameEndUserInfoKey : NSValue(cgRect: CGRect(x: 0, y: 200, width: 320, height: 500)),
-            UIKeyboardAnimationCurveUserInfoKey : NSNumber(value: 30)
+            UIResponder.keyboardAnimationDurationUserInfoKey : "FORCE FAIL",
+            UIResponder.keyboardFrameEndUserInfoKey : NSValue(cgRect: CGRect(x: 0, y: 200, width: 320, height: 500)),
+            UIResponder.keyboardAnimationCurveUserInfoKey : NSNumber(value: 30)
         ]
 
-        let fakeNotification = NSNotification(name: .UIKeyboardWillChangeFrame, object: nil, userInfo: fakeUserInfo)
+        let fakeNotification = NSNotification(name: UIResponder.keyboardWillChangeFrameNotification, object: nil, userInfo: fakeUserInfo)
 
         loginVC.keyboardNotification(notification: fakeNotification)