Merge branch 'release/1.4.0' into develop

Author: bcylin

.jazzy.yml

@@ -5,6 +5,6 @@ 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.3.0
+module_version: 1.4.0
 output: docs/output
 theme: fullwidth

CHANGELOG.md

@@ -3,16 +3,16 @@
 * Added delegate methods:
 
   ```swift
-@objc optional func tokenField(_ tokenField: ICTokenField, didChangeInputText text: String)
-@objc optional func tokenField(_ tokenField: ICTokenField, shouldCompleteText text: String) -> Bool
-@objc optional func tokenField(_ tokenField: ICTokenField, subsequentDelimiterForCompletedText text: String) -> String
-```
+  @objc optional func tokenField(_ tokenField: ICTokenField, didChangeInputText text: String)
+  @objc optional func tokenField(_ tokenField: ICTokenField, shouldCompleteText text: String) -> Bool
+  @objc optional func tokenField(_ tokenField: ICTokenField, subsequentDelimiterForCompletedText text: String) -> String
+  ```
 
-* Changed delegate method:
+* Renamed delegate method:
 
   ```swift
-@objc optional func tokenField(_ tokenField: ICTokenField, didCompleteText text: String)
-```
+  @objc optional func tokenField(_ tokenField: ICTokenField, didCompleteText text: String)
+  ```
 
 ## v1.3.0
 

Example/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.0</string>
+	<string>1.4.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

ICInputAccessory.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "ICInputAccessory"
-  s.version       = "1.3.0"
+  s.version       = "1.4.0"
   s.summary       = "A customized token text field used in the iCook app."
   s.description   = <<-DESC
                      ICKeyboardDismissTextField:

ICInputAccessory/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.0</string>
+	<string>1.4.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

ICInputAccessoryUITests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.0</string>
+	<string>1.4.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Makefile

@@ -1,7 +1,6 @@
 install: brew-install bundle-install pod-install
 
 brew-install:
-	brew update
 	brew tap homebrew/bundle
 	brew bundle
 
@@ -11,7 +10,10 @@ bundle-install:
 pod-install:
 	bundle exec pod install --no-repo-update
 
-setup: brew-install
+bootstrap:
+	brew tap homebrew/bundle
+	brew bundle
+	gem install bundler
 	bundle install
 	bundle exec pod install --no-repo-update
 

Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
-  - ICInputAccessory/KeyboardDismissTextField (1.3.0)
-  - ICInputAccessory/TokenField (1.3.0)
+  - ICInputAccessory/KeyboardDismissTextField (1.4.0)
+  - ICInputAccessory/TokenField (1.4.0)
 
 DEPENDENCIES:
   - ICInputAccessory/KeyboardDismissTextField (from `./`)
@@ -11,7 +11,7 @@ EXTERNAL SOURCES:
     :path: "./"
 
 SPEC CHECKSUMS:
-  ICInputAccessory: e9142958152461ddb627e78e3f1f0a8b263b7271
+  ICInputAccessory: dace41bea1ed8b0368bf8ffd439a215efa8effd3
 
 PODFILE CHECKSUM: 6e8fb9f23fc92d92278fbf08ca8ef072ef28a486
 

README.md

@@ -7,7 +7,7 @@ Try <https://testflight.icook.tw>.
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg)](https://github.com/Carthage/Carthage)
 [![CocoaPods Compatible](https://img.shields.io/cocoapods/v/ICInputAccessory.svg)](https://cocoapods.org/pods/ICInputAccessory)
 ![Platform](https://img.shields.io/cocoapods/p/ICInputAccessory.svg)
-[![CocoaDocs](https://img.shields.io/cocoapods/metrics/doc-percent/ICInputAccessory.svg)](http://cocoadocs.org/docsets/ICInputAccessory/)
+[![CocoaDocs](https://img.shields.io/cocoapods/metrics/doc-percent/ICInputAccessory.svg)](https://polydice.github.io/ICInputAccessory)
 ![Swift 3.0](https://img.shields.io/badge/Swift-3.0-orange.svg)
 
 ### ICKeyboardDismissTextField
@@ -30,7 +30,7 @@ ICInputAccessory | iOS  | Xcode | Swift
 `~> 1.0.0`       | 8.0+ | 7.2   | ![Swift 2.1.1](https://img.shields.io/badge/Swift-2.1.1-orange.svg)
 `~> 1.1.0`       | 8.0+ | 7.3   | ![Swift 2.2](https://img.shields.io/badge/Swift-2.2-orange.svg)
 `~> 1.2.0`       | 8.0+ | 8.0   | ![Swift 2.3](https://img.shields.io/badge/Swift-2.3-orange.svg)
-`~> 1.3.0`       | 8.0+ | 8.0   | ![Swift 3.0](https://img.shields.io/badge/Swift-3.0-orange.svg)
+`>= 1.3.0`       | 8.0+ | 8.0   | ![Swift 3.0](https://img.shields.io/badge/Swift-3.0-orange.svg)
 
 ## Installation
 
@@ -155,16 +155,16 @@ The displayed delimiter string can be customized by:
 * Set up dependencies by running the following command in the project root:
 
   ```
-make setup
-```
+  make bootstrap
+  ```
 
 * Open **ICInputAccessory.xcworkspace** and run the demo app with the `Example` scheme.
 
 * See more tasks for building and testing:
 
   ```
-rake -T
-```
+  rake -T
+  ```
 
 ## Contributing
 

Source/TokenField/ICTokenField.swift

@@ -327,7 +327,7 @@ open class ICTokenField: UIView, UITextFieldDelegate, ICBackspaceTextFieldDelega
 
   // MARK: - ICBackspaceTextFieldDelegate
 
-  func textFieldShouldDelete(_ textField: ICBackspaceTextField) -> Bool {
+  @nonobjc func textFieldShouldDelete(_ textField: ICBackspaceTextField) -> Bool {
     if tokens.isEmpty {
       return true
     }