Merge pull request #29 from michaljach/develop

Swift 4.2 Support

Author: dlackty

Example/AppDelegate.swift

@@ -31,7 +31,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
   var window: UIWindow?
 
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]? = nil) -> Bool {
+    func application(_ application: UIApplication,
+                     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil)
+        -> Bool {
     window = UIWindow(frame: UIScreen.main.bounds)
     window?.backgroundColor = UIColor.white
     window?.rootViewController = UINavigationController(rootViewController: ExampleViewController())

Example/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -29,6 +39,11 @@
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

Example/CustomizedTokenField.swift

@@ -40,7 +40,7 @@ class CustomizedTokenField: TokenField {
   }
 
   override var intrinsicContentSize: CGSize {
-    return UILayoutFittingExpandedSize
+    return UIView.layoutFittingExpandedSize
   }
 
 }

Example/ExampleViewController.swift

@@ -46,7 +46,7 @@ class ExampleViewController: UITableViewController {
   private lazy var flipButton: UIButton = {
     let _button = UIButton(type: .system)
     _button.frame = CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width, height: 88)
-    _button.setTitle("Storyboard", for: UIControlState())
+    _button.setTitle("Storyboard", for: UIControl.State())
     _button.addTarget(self, action: .showStoryboard, for: .touchUpInside)
     return _button
   }()

ICInputAccessory.xcodeproj/project.pbxproj

@@ -502,7 +502,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.polydice.ICInputAccessory.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -521,7 +521,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.polydice.ICInputAccessory.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};