Merge pull request #239 from Skyscanner/swift-4.2-support

[Swift] Add support for Swift 4.2

Author: k0nserv

.swift-version

@@ -1 +1 @@
-4.0
+4.2

SkyFloatingLabelTextField/SkyFloatingLabelTextField.xcodeproj/project.pbxproj

@@ -326,7 +326,7 @@
 				TargetAttributes = {
 					F547D4AB1C3BEA8F0075A0C2 = {
 						CreatedOnToolsVersion = 7.2;
-						LastSwiftMigration = 0810;
+						LastSwiftMigration = 1000;
 					};
 					F56289171C3BE3A20082D9A6 = {
 						CreatedOnToolsVersion = 7.2;
@@ -403,7 +403,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if which swiftlint >/dev/null; then\n    cd .. && swiftlint lint --config .swiftlint.yml\nelse\n    echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
+			shellScript = "if which swiftlint >/dev/null; then\n    cd .. && swiftlint lint --config .swiftlint.yml\nelse\n    echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -504,7 +504,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = net.skyscanner.SkyFloatingLabelTextFieldExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -517,7 +518,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = net.skyscanner.SkyFloatingLabelTextFieldExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -568,6 +570,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -614,6 +617,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";
@@ -637,7 +641,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -658,7 +662,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = net.skyscanner.SkyFloatingLabelTextField;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -669,7 +673,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = net.skyscanner.SkyFloatingLabelTextFieldTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SkyFloatingLabelTextFieldExample.app/SkyFloatingLabelTextFieldExample";
 			};
 			name = Debug;
@@ -681,7 +685,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = net.skyscanner.SkyFloatingLabelTextFieldTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SkyFloatingLabelTextFieldExample.app/SkyFloatingLabelTextFieldExample";
 			};
 			name = Release;

SkyFloatingLabelTextField/SkyFloatingLabelTextField.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/AppDelegate.swift

@@ -13,14 +13,20 @@
 
 import UIKit
 
+#if swift(>=4.2)
+    typealias LaunchOptionsKey = UIApplication.LaunchOptionsKey
+#else
+    typealias LaunchOptionsKey = UIApplicationLaunchOptionsKey
+#endif
+
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
     func application(
         _ application: UIApplication,
-        didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?
+        didFinishLaunchingWithOptions launchOptions: [LaunchOptionsKey: Any]?
     ) -> Bool {
 
         // MARK: - Appearance

SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example0/ShowcaseExampleViewController.swift

@@ -245,7 +245,7 @@ class ShowcaseExampleViewController: UIViewController, UITextFieldDelegate {
 
         // When pressing return, move to the next field
         let nextTag = textField.tag + 1
-        if let nextResponder = textField.superview?.viewWithTag(nextTag) as UIResponder! {
+        if let nextResponder = textField.superview?.viewWithTag(nextTag) {
             nextResponder.becomeFirstResponder()
         } else {
             textField.resignFirstResponder()
@@ -263,7 +263,7 @@ class ShowcaseExampleViewController: UIViewController, UITextFieldDelegate {
             return
         }
 
-        if email.characters.isEmpty {
+        if email.isEmpty {
             emailField.errorMessage = nil
         } else if !validateEmail(email) {
             emailField.errorMessage = NSLocalizedString(

SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example2/CustomizingColorsViewController.swift

@@ -35,11 +35,17 @@ class CustomizingColorsViewController: UIViewController {
         // NOTE: For emojis to appear properly we need to set the color to white
         // http://stackoverflow.com/a/38195951
 
-        var attributes: [String: Any] = [:]
+        #if swift(>=4.2)
+            var attributes: [NSAttributedString.Key: Any] = [:]
+        #else
+            var attributes: [String: Any] = [:]
+        #endif
 
-        #if swift(>=4.0)
+        #if swift(>=4.2) // Swift 4.2
+            attributes = [NSAttributedString.Key.foregroundColor: UIColor.white]
+        #elseif swift(>=4.0) // Swift 4.0 and 4.1
             attributes = [NSAttributedStringKey.foregroundColor.rawValue: UIColor.white]
-        #else
+        #else // Swift 3 and earlier
             attributes = [NSForegroundColorAttributeName: UIColor.white]
         #endif
 

SkyFloatingLabelTextField/SkyFloatingLabelTextFieldTests/SkyFloatingLabelTextFieldTests.swift

@@ -59,7 +59,14 @@ class SkyFloatingLabelTextFieldTests: XCTestCase { // swiftlint:disable:this typ
         floatingLabelTextField.placeholderColor = customColor
 
         // then
-        #if swift(>=4.0)
+        #if swift(>=4.2)
+            XCTAssertEqual(
+                floatingLabelTextField.attributedPlaceholder!.attribute(
+                    NSAttributedString.Key.foregroundColor, at: 0, effectiveRange: &fullRange
+                    ) as? UIColor,
+                customColor
+            )
+        #elseif swift(>=4.0)
             XCTAssertEqual(
                 floatingLabelTextField.attributedPlaceholder!.attribute(
                     NSAttributedStringKey.foregroundColor, at: 0, effectiveRange: &fullRange
@@ -213,7 +220,14 @@ class SkyFloatingLabelTextFieldTests: XCTestCase { // swiftlint:disable:this typ
         floatingLabelTextField.disabledColor = self.customColor
 
         // then
-        #if swift(>=4.0)
+        #if swift(>=4.2)
+            XCTAssertNotEqual(
+                floatingLabelTextField.attributedPlaceholder!.attribute(
+                    NSAttributedString.Key.foregroundColor, at: 0, effectiveRange: &fullRange
+                    ) as? UIColor,
+                customColor
+            )
+        #elseif swift(>=4.0)
             XCTAssertNotEqual(
                 floatingLabelTextField.attributedPlaceholder!.attribute(
                     NSAttributedStringKey.foregroundColor, at: 0, effectiveRange: &fullRange
@@ -263,7 +277,14 @@ class SkyFloatingLabelTextFieldTests: XCTestCase { // swiftlint:disable:this typ
         floatingLabelTextField.disabledColor = self.customColor
 
         // then
-        #if swift(>=4.0)
+        #if swift(>=4.2)
+            XCTAssertEqual(
+                floatingLabelTextField.attributedPlaceholder!.attribute(
+                    NSAttributedString.Key.foregroundColor, at: 0, effectiveRange: &fullRange
+                    ) as? UIColor,
+                customColor
+            )
+        #elseif swift(>=4.0)
             XCTAssertEqual(
                 floatingLabelTextField.attributedPlaceholder!.attribute(
                     NSAttributedStringKey.foregroundColor, at: 0, effectiveRange: &fullRange
@@ -304,7 +325,16 @@ class SkyFloatingLabelTextFieldTests: XCTestCase { // swiftlint:disable:this typ
         floatingLabelTextField.placeholderFont = customFont
 
         // then
-        #if swift(>=4.0)
+        #if swift(>=4.2)
+            XCTAssertEqual(
+                floatingLabelTextField.attributedPlaceholder!.attribute(
+                    NSAttributedString.Key.font,
+                    at: 0,
+                    effectiveRange: &fullRange
+                    ) as? UIFont,
+                customFont
+            )
+        #elseif swift(>=4.0)
             XCTAssertEqual(
                 floatingLabelTextField.attributedPlaceholder!.attribute(
                     NSAttributedStringKey.font,

Sources/SkyFloatingLabelTextField.swift

@@ -78,7 +78,14 @@ open class SkyFloatingLabelTextField: UITextField { // swiftlint:disable:this ty
             return
         }
         let color = isEnabled ? placeholderColor : disabledColor
-        #if swift(>=4.0)
+        #if swift(>=4.2)
+            attributedPlaceholder = NSAttributedString(
+                string: placeholder,
+                attributes: [
+                    NSAttributedString.Key.foregroundColor: color, NSAttributedString.Key.font: font
+                ]
+            )
+        #elseif swift(>=4.0)
             attributedPlaceholder = NSAttributedString(
                 string: placeholder,
                 attributes: [
@@ -531,7 +538,11 @@ open class SkyFloatingLabelTextField: UITextField { // swiftlint:disable:this ty
             self.titleLabel.frame = frame
         }
         if animated {
-            let animationOptions: UIViewAnimationOptions = .curveEaseOut
+            #if swift(>=4.2)
+                let animationOptions: UIView.AnimationOptions = .curveEaseOut
+            #else
+                let animationOptions: UIViewAnimationOptions = .curveEaseOut
+            #endif
             let duration = isTitleVisible() ? titleFadeInDuration : titleFadeOutDuration
             UIView.animate(withDuration: duration, delay: 0, options: animationOptions, animations: { () -> Void in
                 updateBlock()