Merge branch 'feature/swift-2.2' into develop

Author: bcylin

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.2
+osx_image: xcode7.3
 env:
   matrix:
   - VERSION=8.4

Example/Example/CustomizedTokenViewController.swift

@@ -50,7 +50,7 @@ class CustomizedTokenViewController: UIViewController, ICTokenFieldDelegate {
     navigationController?.navigationBar.translucent = false
     navigationController?.navigationBar.barStyle = .Black
 
-    let cancelBarButton = UIBarButtonItem(barButtonSystemItem: .Cancel, target: self, action: Selector("dismiss:"))
+    let cancelBarButton = UIBarButtonItem(barButtonSystemItem: .Cancel, target: self, action: #selector(dismiss(_:)))
     cancelBarButton.tintColor = UIColor.whiteColor()
     navigationItem.rightBarButtonItem = cancelBarButton
 
@@ -72,15 +72,15 @@ class CustomizedTokenViewController: UIViewController, ICTokenFieldDelegate {
   // MARK: - ICTokenFieldDelegate
 
   func tokenFieldDidBeginEditing(tokenField: ICTokenField) {
-    print(__FUNCTION__)
+    print(#function)
   }
 
   func tokenFieldDidEndEditing(tokenField: ICTokenField) {
-    print(__FUNCTION__)
+    print(#function)
   }
 
   func tokenFieldWillReturn(tokenField: ICTokenField) {
-    print(__FUNCTION__)
+    print(#function)
   }
 
   func tokenField(tokenField: ICTokenField, didEnterText text: String) {
@@ -95,7 +95,7 @@ class CustomizedTokenViewController: UIViewController, ICTokenFieldDelegate {
 
   // MARK: - UIResponder Callbacks
 
-  @IBAction private func dismiss(sender: UIBarButtonItem) {
+  @objc private func dismiss(sender: UIBarButtonItem) {
     presentingViewController?.dismissViewControllerAnimated(true, completion: nil)
   }
 

Example/Example/ExampleViewController.swift

@@ -39,7 +39,7 @@ class ExampleViewController: UITableViewController {
     let _button = UIButton(type: .System)
     _button.frame = CGRect(x: 0, y: 0, width: UIScreen.mainScreen().bounds.width, height: 88)
     _button.setTitle("Storyboard", forState: .Normal)
-    _button.addTarget(self, action: Selector("showStoryboard:"), forControlEvents: .TouchUpInside)
+    _button.addTarget(self, action: #selector(showStoryboard(_:)), forControlEvents: .TouchUpInside)
     return _button
   }()
 
@@ -125,7 +125,7 @@ class ExampleViewController: UITableViewController {
 
   // MARK: - UIResponder Callbacks
 
-  @IBAction private func showStoryboard(sender: UIButton) {
+  @objc private func showStoryboard(sender: UIButton) {
     if let controller = UIStoryboard(name: "Main", bundle: NSBundle.mainBundle()).instantiateInitialViewController() {
       controller.modalTransitionStyle = .FlipHorizontal
       presentViewController(controller, animated: true, completion: nil)

README.md

@@ -7,7 +7,7 @@ Try <https://testflight.icook.tw>.
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![CocoaPods Compatible](https://img.shields.io/cocoapods/v/ICInputAccessory.svg)](https://img.shields.io/cocoapods/v/ICInputAccessory.svg)
 ![Platform](https://img.shields.io/cocoapods/p/ICInputAccessory.svg?style=flat)
-![Swift 2.1.1](https://img.shields.io/badge/Swift-2.1.1-orange.svg)
+![Swift 2.2](https://img.shields.io/badge/Swift-2.2-orange.svg)
 
 ### ICKeyboardDismissTextField
 
@@ -24,6 +24,11 @@ Try <https://testflight.icook.tw>.
 
 ## Requirements
 
+ICInputAccessory | iOS  | Xcode | Swift
+---------------- | :--: | :---: | -----
+v1.0.0           | 8.0+ | 7.2   | ![Swift 2.1.1](https://img.shields.io/badge/Swift-2.1.1-orange.svg)
+v1.1.0           | 8.0+ | 7.3   | ![Swift 2.2](https://img.shields.io/badge/Swift-2.2-orange.svg)
+
 iOS 8.0+ with Xcode 7.2 or above.
 
 ## Installation

Source/KeyboardDismissTextField/ICKeyboardDismissTextField.swift

@@ -32,7 +32,7 @@ public class ICKeyboardDismissTextField: UITextField {
   @IBOutlet public var keyboardAccessoryView: ICKeyboardDismissAccessoryView! {
     didSet {
       if UI_USER_INTERFACE_IDIOM() != .Phone { return }
-      keyboardAccessoryView.dismissButton.addTarget(self, action: Selector("dismiss:"), forControlEvents: .TouchUpInside)
+      keyboardAccessoryView.dismissButton.addTarget(self, action: #selector(dismiss(_:)), forControlEvents: .TouchUpInside)
       inputAccessoryView = keyboardAccessoryView
     }
   }
@@ -58,6 +58,13 @@ public class ICKeyboardDismissTextField: UITextField {
     return super.becomeFirstResponder()
   }
 
+  @objc private func dismiss(sender: UIButton) {
+    resignFirstResponder()
+    UIView.animateWithDuration(0.3) {
+      self.keyboardAccessoryView.alpha = 0
+    }
+  }
+
   // MARK: - Private Methods
 
   private func setUpAccessoryView() {
@@ -66,11 +73,4 @@ public class ICKeyboardDismissTextField: UITextField {
     }
   }
 
-  @IBAction private func dismiss(sender: UIButton) {
-    resignFirstResponder()
-    UIView.animateWithDuration(0.3) {
-      self.keyboardAccessoryView.alpha = 0
-    }
-  }
-
 }

Source/TokenField/ICTokenField.swift

@@ -172,7 +172,7 @@ public class ICTokenField: UIView, UITextFieldDelegate, ICBackspaceTextFieldDele
     _textField.returnKeyType = .Search
     _textField.delegate = self
     _textField.backspaceDelegate = self
-    _textField.addTarget(self, action: Selector("togglePlaceholderIfNeeded:"), forControlEvents: .AllEditingEvents)
+    _textField.addTarget(self, action: #selector(togglePlaceholderIfNeeded(_:)), forControlEvents: .AllEditingEvents)
     return _textField
   }()
 
@@ -206,7 +206,7 @@ public class ICTokenField: UIView, UITextFieldDelegate, ICBackspaceTextFieldDele
   }()
 
   private lazy var tapGestureRecognizer: UITapGestureRecognizer = {
-    UITapGestureRecognizer(target: self, action: Selector("handleTapGesture:"))
+    UITapGestureRecognizer(target: self, action: #selector(handleTapGesture(_:)))
   }()
 
   // MARK: - Initialization
@@ -336,12 +336,12 @@ public class ICTokenField: UIView, UITextFieldDelegate, ICBackspaceTextFieldDele
 
   // MARK: - UIResponder Callbacks
 
-  @IBAction private func togglePlaceholderIfNeeded(sender: UITextField? = nil) {
+  @objc private func togglePlaceholderIfNeeded(sender: UITextField? = nil) {
     let showsPlaceholder = tokens.isEmpty && (inputTextField.text?.isEmpty ?? true)
     placeholderLabel.hidden = !showsPlaceholder
   }
 
-  @IBAction private func handleTapGesture(sender: UITapGestureRecognizer) {
+  @objc private func handleTapGesture(sender: UITapGestureRecognizer) {
     if !isFirstResponder() {
       inputTextField.becomeFirstResponder()
     }