Merge branch 'release/1.3.0' into develop

bcylin · bcylin · commit 38fb0970cdb3 · 2017-02-04T14:36:45.000+08:00
diff --git a/.jazzy.yml b/.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.2.1
+module_version: 1.3.0
 output: docs/output
 theme: fullwidth
diff --git a/.swift-version b/.swift-version
@@ -0,0 +1 @@
+3.0.0
diff --git a/.swiftlint-version b/.swiftlint-version
@@ -0,0 +1 @@
+0.16.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,5 @@
 ## v1.3.0
 
-#### Changes
-
 * Swift 3.0
 * Support `pod try ICInputAccessory`
 
diff --git a/Example/Info.plist b/Example/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    CFPropertyList (2.3.4)
+    CFPropertyList (2.3.5)
     activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
@@ -51,7 +51,7 @@ GEM
     colored (1.2)
     cork (0.2.0)
       colored (~> 1.2)
-    danger (4.0.3)
+    danger (4.0.5)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored (~> 1.2)
@@ -63,13 +63,13 @@ GEM
       octokit (~> 4.2)
       terminal-table (~> 1)
     escape (0.0.4)
-    faraday (0.10.0)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (1.3.1)
       faraday (~> 0.8)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.0.2)
+    gh_inspector (1.0.3)
     git (1.3.0)
     i18n (0.7.0)
     jazzy (0.7.3)
@@ -80,15 +80,14 @@ GEM
       rouge (~> 1.5)
       sass (~> 3.4)
       sqlite3 (~> 1.3)
-      xcinvoke (~> 0.2.1)
-    json (1.8.3)
-    kramdown (1.13.1)
+      xcinvoke (~> 0.3.0)
+    json (1.8.6)
+    kramdown (1.13.2)
     liferaft (0.0.6)
     method_source (0.8.2)
     minitest (5.10.1)
-    molinillo (0.5.2)
+    molinillo (0.5.5)
     multipart-post (2.0.0)
-      xcinvoke (~> 0.3.0)
     mustache (0.99.8)
     nanaimo (0.2.3)
     nap (1.1.0)
@@ -100,22 +99,22 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (2.0.4)
-    rake (11.3.0)
+    public_suffix (2.0.5)
+    rake (12.0.0)
     redcarpet (3.4.0)
     rouge (1.11.1)
     sass (3.4.23)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     slop (3.6.0)
-    sqlite3 (1.3.11)
+    sqlite3 (1.3.13)
     terminal-table (1.7.3)
       unicode-display_width (~> 1.1.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.2)
+    unicode-display_width (1.1.3)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
     xcodeproj (1.4.2)
diff --git a/ICInputAccessory.podspec b/ICInputAccessory.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "ICInputAccessory"
-  s.version       = "1.2.1"
+  s.version       = "1.3.0"
   s.summary       = "A customized token text field used in the iCook app."
   s.description   = <<-DESC
                      ICKeyboardDismissTextField:
diff --git a/ICInputAccessory/Info.plist b/ICInputAccessory/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/ICInputAccessoryUITests/Info.plist b/ICInputAccessoryUITests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
-  - ICInputAccessory/KeyboardDismissTextField (1.2.1)
-  - ICInputAccessory/TokenField (1.2.1)
+  - ICInputAccessory/KeyboardDismissTextField (1.3.0)
+  - ICInputAccessory/TokenField (1.3.0)
 
 DEPENDENCIES:
   - ICInputAccessory/KeyboardDismissTextField (from `./`)
@@ -11,7 +11,7 @@ EXTERNAL SOURCES:
     :path: "./"
 
 SPEC CHECKSUMS:
-  ICInputAccessory: 19865bd3efb918c22f8b7b5715566b85bc8b4577
+  ICInputAccessory: e9142958152461ddb627e78e3f1f0a8b263b7271
 
 PODFILE CHECKSUM: 6e8fb9f23fc92d92278fbf08ca8ef072ef28a486
 
diff --git a/README.md b/README.md
@@ -30,35 +30,38 @@ 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)
-`develop`        | 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
 
-### Install via [Carthage](https://github.com/Carthage/Carthage)
+### Use [Carthage](https://github.com/Carthage/Carthage)
 
-* Create a `Cartfile` with the following specification and run `carthage update`.
+Create a `Cartfile` with the following specification and run `carthage update ICInputAccessory`. Follow the [instructions](https://github.com/Carthage/Carthage#if-youre-building-for-ios) to add the framework to an iOS project.
 
-  ```
-  github "polydice/ICInputAccessory"
-  ```
+```
+github "polydice/ICInputAccessory"
+```
 
-* Follow the [instruction](https://github.com/Carthage/Carthage#if-youre-building-for-ios) to add the framework to an iOS project.
+### Use [CocoaPods](http://guides.cocoapods.org/)
 
-### Install via [CocoaPods](http://guides.cocoapods.org/)
+**ICInputAccessory** supports subspecs. Create a `Podfile` with the following specification and run `pod install`.
 
-* **ICInputAccessory** supports subspecs. Create a `Podfile` with the following specification and run `pod install`.
+```rb
+platform :ios, '8.0'
+use_frameworks!
 
-  ```rb
-  platform :ios, '8.0'
-  use_frameworks!
+pod 'ICInputAccessory/TokenField'
+pod 'ICInputAccessory/KeyboardDismissTextField'
+```
 
-  pod 'ICInputAccessory/TokenField'
-  pod 'ICInputAccessory/KeyboardDismissTextField'
-  ```
+### Use Git Submodule
 
-### Install Manually
+```
+git submodule add -b master git@github.com:polydice/ICInputAccessory.git Dependencies/ICInputAccessory
+```
 
-* Everything you need resides in the `Source` directory. Drag those files to a project.
+* Everything you need resides in the `Source` directory. Add those files to your project.
+* Alternatively, drag **ICInputAccessory.xcodeproj** to your app project as a subproject. Add **ICInputAccessory-iOS** to the **Target Dependencies** in the application target's **Build Phases** settings.
 
 ## Usage
 
diff --git a/Rakefile b/Rakefile
@@ -23,6 +23,7 @@ namespace :ci do
   end
 end
 
+
 namespace :example do
   desc "Build the example project"
   task :build, [:os] do |t, args|
@@ -47,3 +48,33 @@ namespace :framework do
     exit $?.exitstatus if not $?.success?
   end
 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
diff --git a/scripts/swiftlint.sh b/scripts/swiftlint.sh
@@ -1,11 +1,10 @@
 #!/bin/sh
 
-SWIFTLINT_VERSION="0.13.2"
-
 if ! command -v swiftlint >/dev/null; then
   brew install swiftlint
-elif [ $(swiftlint version) != "$SWIFTLINT_VERSION" ]; then
+elif [ ! -e .swiftlint-version ] || [ $(swiftlint version) != $(head -n 1 .swiftlint-version) ]; then
   brew upgrade swiftlint
+  swiftlint version >> .swiftlint-version
 fi
 
 swiftlint
