Swift 4

.ruby-version

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

.swift-version

@@ -1 +1 @@
-3.1
+4.0

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.3
+osx_image: xcode9
 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
+  - xcrun instruments -w "iPhone 8 (11.0) [" || true
 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/StoryboardViewController.swift

@@ -32,13 +32,13 @@ class StoryboardViewController: UITableViewController {
   @IBOutlet weak var tokenField: ICTokenField! {
     didSet {
       tokenField.normalTokenAttributes = [
-        NSForegroundColorAttributeName: UIColor.white,
-        NSBackgroundColorAttributeName: UIColor.white.withAlphaComponent(0.25)
+        .foregroundColor: UIColor.white,
+        .backgroundColor: UIColor.white.withAlphaComponent(0.25)
       ]
 
       tokenField.highlightedTokenAttributes = [
-        NSForegroundColorAttributeName: UIColor.darkGray,
-        NSBackgroundColorAttributeName: UIColor.white
+        .foregroundColor: UIColor.darkGray,
+        .backgroundColor: UIColor.white
       ]
     }
   }

Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gem "cocoapods"
 gem "danger"
-gem "jazzy", "~> 0.8.0"
+gem "jazzy", ">= 0.8.0"
 gem "pry"
 gem "rake"
 gem "xcpretty"

Gemfile.lock

@@ -1,57 +1,58 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    CFPropertyList (2.3.5)
-    activesupport (4.2.9)
+    CFPropertyList (2.3.6)
+    activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     claide (1.0.2)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.3.1)
+    cocoapods (1.4.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.3.1)
-      cocoapods-deintegrate (>= 1.0.1, < 2.0)
+      cocoapods-core (= 1.4.0)
+      cocoapods-deintegrate (>= 1.0.2, < 2.0)
       cocoapods-downloader (>= 1.1.3, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.2.0, < 2.0)
+      cocoapods-trunk (>= 1.3.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.7)
+      molinillo (~> 0.6.4)
       nap (~> 1.0)
       ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.1, < 2.0)
-    cocoapods-core (1.3.1)
+      xcodeproj (>= 1.5.4, < 2.0)
+    cocoapods-core (1.4.0)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.1)
+    cocoapods-deintegrate (1.0.2)
     cocoapods-downloader (1.1.3)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.2.0)
+    cocoapods-trunk (1.3.0)
       nap (>= 0.8, < 2.0)
-      netrc (= 0.7.8)
+      netrc (~> 0.11)
     cocoapods-try (1.1.0)
-    coderay (1.1.1)
+    coderay (1.1.2)
     colored2 (3.1.2)
+    concurrent-ruby (1.0.5)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (5.3.4)
+    danger (5.5.6)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -60,10 +61,11 @@ GEM
       faraday-http-cache (~> 1.0)
       git (~> 1)
       kramdown (~> 1.5)
+      no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
     escape (0.0.4)
-    faraday (0.13.0)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (1.3.1)
       faraday (~> 0.8)
@@ -72,77 +74,77 @@ GEM
     fuzzy_match (2.0.4)
     gh_inspector (1.0.3)
     git (1.3.0)
-    i18n (0.8.6)
-    jazzy (0.8.3)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    jazzy (0.9.1)
       cocoapods (~> 1.0)
       mustache (~> 0.99)
       open4
       redcarpet (~> 3.2)
-      rouge (~> 1.5)
+      rouge (>= 2.0.6, < 4.0)
       sass (~> 3.4)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
-    kramdown (1.14.0)
+    kramdown (1.16.2)
     liferaft (0.0.6)
-    method_source (0.8.2)
-    minitest (5.10.3)
-    molinillo (0.5.7)
+    method_source (0.9.0)
+    minitest (5.11.1)
+    molinillo (0.6.4)
     multipart-post (2.0.0)
     mustache (0.99.8)
     nanaimo (0.2.3)
     nap (1.1.0)
-    netrc (0.7.8)
-    octokit (4.7.0)
+    netrc (0.11.0)
+    no_proxy_fix (0.1.2)
+    octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    pry (0.10.4)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (2.0.5)
-    rake (12.0.0)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.1)
+    rake (12.3.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     redcarpet (3.4.0)
-    rouge (1.11.1)
+    rouge (2.0.7)
     ruby-macho (1.1.0)
-    sass (3.5.1)
+    sass (3.5.5)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    slop (3.6.0)
     sqlite3 (1.3.13)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
     unicode-display_width (1.3.0)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.5.1)
+    xcodeproj (1.5.4)
       CFPropertyList (~> 2.3.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.2.3)
-    xcpretty (0.2.6)
-      rouge (~> 1.8)
+    xcpretty (0.2.8)
+      rouge (~> 2.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   cocoapods
   danger
-  jazzy (~> 0.8.0)
+  jazzy (>= 0.8.0)
   pry
   rake
   xcpretty
 
 BUNDLED WITH
-   1.15.3
+   1.16.1