Merge branch 'release/1.4.1'

polydice · Oct 30, 2017 · f2e9700 · f2e9700
2 parents ca5125a + 4cc56b1
commit f2e9700
Show file tree

Hide file tree

Showing 33 changed files with 626 additions and 846 deletions.
diff --git a/.jazzy.yml b/.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
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.3.1
+2.4.1
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.0.0
+3.1
diff --git a/.swiftlint-version b/.swiftlint-version
diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,20 @@
 language: objective-c
-osx_image: xcode8.2
+osx_image: xcode8.3
 cache:
   bundler: true
   directories:
     - vendor/bundle
     - Pods
 before_install:
   - export LANG=en_US.UTF-8
+  - xcrun instruments -s devices
+  - xcrun instruments -w "iPhone 7 (10.3.1) [" || true
 install:
   - make install
 before_script:
   - xcodebuild -workspace ICInputAccessory.xcworkspace -list
 script:
-  - bundle exec rake ci:build
+  - bundle exec rake ci:test
   - make -B carthage
   - make -B docs
 after_script:

diff --git a/Brewfile b/Brewfile
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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:

diff --git a/Example.xcodeproj/project.pbxproj b/Example.xcodeproj/project.pbxproj
diff --git a/Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Example/CustomizedTokenField.swift b/Example/CustomizedTokenField.swift
@@ -39,6 +39,10 @@ class CustomizedTokenField: ICTokenField {
     applyCustomizedStyle()
   }
 
+  override var intrinsicContentSize: CGSize {
+    return UILayoutFittingExpandedSize
+  }
+
 }
 
 

diff --git a/Example/CustomizedTokenViewController.swift b/Example/CustomizedTokenViewController.swift
@@ -56,7 +56,20 @@ class CustomizedTokenViewController: UIViewController, ICTokenFieldDelegate {
     cancelBarButton.tintColor = UIColor.white
     navigationItem.rightBarButtonItem = cancelBarButton
 
-    navigationItem.titleView = tokenField
+    navigationItem.titleView = {
+      if #available(iOS 11, *) {
+        tokenField.translatesAutoresizingMaskIntoConstraints = false
+        let views = ["field": tokenField]
+        let metrics = ["padding": 7]
+        let containerView = UIView()
+        containerView.addSubview(tokenField)
+        containerView.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "H:|[field]-padding-|", options: [], metrics: metrics, views: views))
+        containerView.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "V:|-padding-[field]-padding-|", options: [], metrics: metrics, views: views))
+        return containerView
+      } else {
+        return tokenField
+      }
+    }()
     tokenField.delegate = self
   }
 

diff --git a/Example/ExampleViewController.swift b/Example/ExampleViewController.swift
@@ -54,6 +54,7 @@ class ExampleViewController: UITableViewController {
 
   override func loadView() {
     super.loadView()
+    tableView.rowHeight = 44
     tableView.register(ExampleCell.self, forCellReuseIdentifier: String(describing: ExampleCell.self))
     tableView.tableFooterView = flipButton
     tableView.tableFooterView?.isUserInteractionEnabled = true

diff --git a/Example/Info.plist b/Example/Info.plist
@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>ICInputAccessoryExample</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -15,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>
@@ -35,7 +37,6 @@
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
 </dict>
 </plist>
diff --git a/Gemfile b/Gemfile
@@ -1,9 +1,8 @@
 source "http://rubygems.org"
-ruby "2.3.1"
 
-gem "cocoapods", "~> 1.1.0"
-gem "danger", "~> 4.0.0"
-gem "jazzy", "~> 0.7.0"
+gem "cocoapods"
+gem "danger"
+gem "jazzy", "~> 0.8.0"
 gem "pry"
 gem "rake"
 gem "xcpretty"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,39 +2,39 @@ GEM
   remote: http://rubygems.org/
   specs:
     CFPropertyList (2.3.5)
-    activesupport (4.2.7.1)
+    activesupport (4.2.9)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    claide (1.0.1)
+    claide (1.0.2)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.1.1)
+    cocoapods (1.3.1)
       activesupport (>= 4.0.2, < 5)
-      claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.1.1)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.3.1)
       cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.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.1.1, < 2.0)
+      cocoapods-trunk (>= 1.2.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
-      colored (~> 1.2)
+      colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.1)
+      molinillo (~> 0.5.7)
       nap (~> 1.0)
-      xcodeproj (>= 1.3.3, < 2.0)
-    cocoapods-core (1.1.1)
-      activesupport (>= 4.0.2, < 5)
+      ruby-macho (~> 1.1)
+      xcodeproj (>= 1.5.1, < 2.0)
+    cocoapods-core (1.3.1)
+      activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.1)
@@ -43,36 +43,37 @@ GEM
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.1.2)
+    cocoapods-trunk (1.2.0)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
     cocoapods-try (1.1.0)
     coderay (1.1.1)
-    colored (1.2)
-    cork (0.2.0)
-      colored (~> 1.2)
-    danger (4.0.5)
+    colored2 (3.1.2)
+    cork (0.3.0)
+      colored2 (~> 3.1)
+    danger (5.3.4)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
-      colored (~> 1.2)
+      colored2 (~> 3.1)
       cork (~> 0.1)
       faraday (~> 0.9)
       faraday-http-cache (~> 1.0)
       git (~> 1)
       kramdown (~> 1.5)
-      octokit (~> 4.2)
+      octokit (~> 4.7)
       terminal-table (~> 1)
     escape (0.0.4)
-    faraday (0.11.0)
+    faraday (0.13.0)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (1.3.1)
       faraday (~> 0.8)
+    ffi (1.9.18)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.0.3)
     git (1.3.0)
-    i18n (0.7.0)
-    jazzy (0.7.3)
+    i18n (0.8.6)
+    jazzy (0.8.3)
       cocoapods (~> 1.0)
       mustache (~> 0.99)
       open4
@@ -81,18 +82,17 @@ GEM
       sass (~> 3.4)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
-    json (1.8.6)
-    kramdown (1.13.2)
+    kramdown (1.14.0)
     liferaft (0.0.6)
     method_source (0.8.2)
-    minitest (5.10.1)
-    molinillo (0.5.5)
+    minitest (5.10.3)
+    molinillo (0.5.7)
     multipart-post (2.0.0)
     mustache (0.99.8)
     nanaimo (0.2.3)
     nap (1.1.0)
     netrc (0.7.8)
-    octokit (4.6.2)
+    octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
     pry (0.10.4)
@@ -101,44 +101,48 @@ GEM
       slop (~> 3.4)
     public_suffix (2.0.5)
     rake (12.0.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     redcarpet (3.4.0)
     rouge (1.11.1)
-    sass (3.4.23)
+    ruby-macho (1.1.0)
+    sass (3.5.1)
+      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.7.3)
-      unicode-display_width (~> 1.1.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.3)
+    unicode-display_width (1.3.0)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.4.2)
+    xcodeproj (1.5.1)
       CFPropertyList (~> 2.3.3)
-      activesupport (>= 3)
-      claide (>= 1.0.1, < 2.0)
-      colored (~> 1.2)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
       nanaimo (~> 0.2.3)
-    xcpretty (0.2.4)
+    xcpretty (0.2.6)
       rouge (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.1.0)
-  danger (~> 4.0.0)
-  jazzy (~> 0.7.0)
+  cocoapods
+  danger
+  jazzy (~> 0.8.0)
   pry
   rake
   xcpretty
 
-RUBY VERSION
-   ruby 2.3.1p112
-
 BUNDLED WITH
-   1.13.6
+   1.15.3
diff --git a/ICInputAccessory.podspec b/ICInputAccessory.podspec
@@ -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:
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,10 @@ class CustomizedTokenField: ICTokenField { @@
         applyCustomizedStyle()
       }
+      override var intrinsicContentSize: CGSize {
+        return UILayoutFittingExpandedSize
+      }
     }
@@ Expand Down @@