Merge branch 'release/1.4.1' into develop

Author: bcylin

.jazzy.yml

@@ -5,6 +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.0
+module_version: 1.4.1
 output: docs/output
 theme: fullwidth
+skip_undocumented: true

Brewfile

@@ -1,3 +1,13 @@
+## v1.4.1
+
+* Fix `tokenField(_:didChangeInputText:)` with the delete key [#20](https://github.com/polydice/ICInputAccessory/pull/20)
+
+#### Project Updates
+
+* Reenable UI tests
+* Combine the framework and example projects
+* Specify SwiftLint version via CocoaPods
+
 ## v1.4.0
 
 * Added delegate methods:

CHANGELOG.md

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

Example/Info.plist

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

ICInputAccessory.podspec

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

ICInputAccessory/Info.plist

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

ICInputAccessoryUITests/Info.plist

@@ -5,16 +5,21 @@ bootstrap:
 
 install: bundle-install pod-install
 
-brew-install:
-	brew tap homebrew/bundle
-	brew bundle
-
 bundle-install:
 	bundle install --without development --deployment --jobs=3 --retry=3
 
 pod-install:
 	bundle exec pod install
 
+bump:
+ifeq (,$(strip $(version)))
+	# Usage: make bump version=<number>
+else
+	ruby -pi -e "gsub(/\d+\.\d+\.\d+/i, \""$(version)"\")" ICInputAccessory.podspec
+	ruby -pi -e "gsub(/:\s\d+\.\d+\.\d+/i, \": "$(version)"\")" .jazzy.yml
+	xcrun agvtool new-marketing-version $(version)
+endif
+
 carthage:
 	set -o pipefail && carthage build --no-skip-current --verbose | bundle exec xcpretty
 

Makefile

@@ -7,8 +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)](https://polydice.github.io/ICInputAccessory)
-![Swift 3.0](https://img.shields.io/badge/Swift-3.0-orange.svg)
+![Swift 3.1](https://img.shields.io/badge/Swift-3.1-orange.svg)
 
 ### ICKeyboardDismissTextField
 
@@ -149,10 +148,13 @@ The displayed delimiter string can be customized by:
 @objc optional func tokenField(_ tokenField: ICTokenField, subsequentDelimiterForCompletedText text: String) -> String
 ```
 
+### Documentation
+
+* [ICInputAccessory Reference](https://polydice.github.io/ICInputAccessory)
+* [Example Project](https://github.com/polydice/ICInputAccessory/tree/develop/Example)
+
 ## Development
 
-* Make sure [Homebrew](http://brew.sh/) is installed.
-* Current `develop` branch requires Ruby `2.3.1`.
 * Set up dependencies by running the following command in the project root:
 
   ```

README.md

@@ -40,33 +40,3 @@ task :test, [:os] do |t, args|
   sh xcodebuild(scheme: "Example", version: args[:os], action: "clean test")
   exit $?.exitstatus if not $?.success?
 end
-
-
-desc "Bump versions"
-task :bump, [:version] do |t, args|
-  version = args[:version]
-  unless version
-    puts %(Usage: rake "bump[version]")
-    next
-  end
-
-  FileUtils.mv "ICInputAccessory.xcodeproj", "ICInputAccessory.tmp"
-  sh %(xcrun agvtool new-marketing-version #{version})
-  FileUtils.mv "ICInputAccessory.tmp", "ICInputAccessory.xcodeproj"
-
-  FileUtils.mv "Example.xcodeproj", "Example.tmp"
-  sh %(xcrun agvtool new-marketing-version #{version})
-  FileUtils.mv "Example.tmp", "Example.xcodeproj"
-
-  podspec = "ICInputAccessory.podspec"
-  text = File.read podspec
-  File.write podspec, text.gsub(%r(\"\d+\.\d+\.\d+\"), "\"#{version}\"")
-  puts "Updated #{podspec} to #{version}"
-
-  jazzy = ".jazzy.yml"
-  text = File.read jazzy
-  File.write jazzy, text.gsub(%r(:\s\d+\.\d+\.\d+), ": #{version}")
-  puts "Updated #{jazzy} to #{version}"
-
-  sh %(bundle exec pod install)
-end