Merge branch 'release/1.5.0'

Author: bcylin

.jazzy.yml

@@ -5,7 +5,7 @@ github_url: https://github.com/polydice/ICInputAccessory
 github_file_prefix: https://github.com/polydice/ICInputAccessory/blob/develop
 xcodebuild_arguments: [-project, ICInputAccessory.xcodeproj, -scheme, ICInputAccessory-iOS]
 module: ICInputAccessory
-module_version: 1.4.1
+module_version: 1.5.0
 output: docs/output
 theme: fullwidth
 skip_undocumented: true

.ruby-version

@@ -1 +1 @@
-2.4.1
+2.4.3

.swift-version

@@ -1 +1 @@
-3.1
+4.1

.swiftlint.yml

@@ -1,5 +1,6 @@
 disabled_rules:
   - file_length
+  - identifier_name
   - line_length
   - type_body_length
   - vertical_whitespace

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.3
+osx_image: xcode9.3beta
 cache:
   bundler: true
   directories:
@@ -8,7 +8,7 @@ cache:
 before_install:
   - export LANG=en_US.UTF-8
   - xcrun instruments -s devices
-  - xcrun instruments -w "iPhone 7 (10.3.1) [" || true
+  - open -b com.apple.iphonesimulator
 install:
   - make install
 before_script:

CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.5.0
+
+* Swift 4.0
+
 ## v1.4.1
 
 * Fix `tokenField(_:didChangeInputText:)` with the delete key [#20](https://github.com/polydice/ICInputAccessory/pull/20)

Example/AppDelegate.swift

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

Example/CustomizedTokenField.swift

@@ -57,7 +57,7 @@ extension ICTokenField {
     layer.cornerRadius = 5
     layer.shouldRasterize = true
     layer.rasterizationScale = UIScreen.main.scale
-    backgroundColor = UIColor(red:0.8, green:0.32, blue:0.24, alpha:1)
+    backgroundColor = UIColor(red: 0.8, green: 0.32, blue: 0.24, alpha: 1)
 
     textField.textColor = UIColor.white
     textField.tintColor = UIColor.white
@@ -66,21 +66,21 @@ extension ICTokenField {
     attributedPlaceholder = NSAttributedString(
       string: String(describing: type(of: self)),
       attributes: [
-        NSForegroundColorAttributeName: UIColor.white.withAlphaComponent(0.5),
-        NSFontAttributeName: UIFont.boldSystemFont(ofSize: 14)
+        .foregroundColor: UIColor.white.withAlphaComponent(0.5),
+        .font: UIFont.boldSystemFont(ofSize: 14)
       ]
     )
 
     normalTokenAttributes = [
-      NSForegroundColorAttributeName: UIColor.white,
-      NSBackgroundColorAttributeName: UIColor.white.withAlphaComponent(0.25),
-      NSFontAttributeName: UIFont.boldSystemFont(ofSize: 14)
+      .foregroundColor: UIColor.white,
+      .backgroundColor: UIColor.white.withAlphaComponent(0.25),
+      .font: UIFont.boldSystemFont(ofSize: 14)
     ]
 
     highlightedTokenAttributes = [
-      NSForegroundColorAttributeName: UIColor(red:0.8, green:0.32, blue:0.24, alpha:1),
-      NSBackgroundColorAttributeName: UIColor.white,
-      NSFontAttributeName: UIFont.boldSystemFont(ofSize: 14)
+      .foregroundColor: UIColor(red: 0.8, green: 0.32, blue: 0.24, alpha: 1),
+      .backgroundColor: UIColor.white,
+      .font: UIFont.boldSystemFont(ofSize: 14)
     ]
   }
 

Example/CustomizedTokenViewController.swift

@@ -48,7 +48,7 @@ class CustomizedTokenViewController: UIViewController, ICTokenFieldDelegate {
 
   override func viewDidLoad() {
     super.viewDidLoad()
-    navigationController?.navigationBar.barTintColor = UIColor(red:0.96, green:0.48, blue:0.4, alpha:1)
+    navigationController?.navigationBar.barTintColor = UIColor(red: 0.96, green: 0.48, blue: 0.4, alpha: 1)
     navigationController?.navigationBar.isTranslucent = false
     navigationController?.navigationBar.barStyle = .black
 

Example/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.1</string>
+	<string>1.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>