Skip to content

Commit f2e9700

Browse files
committed
Merge branch 'release/1.4.1'
2 parents ca5125a + 4cc56b1 commit f2e9700

33 files changed

+626
-846
lines changed

.jazzy.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ github_url: https://github.com/polydice/ICInputAccessory
55
github_file_prefix: https://github.com/polydice/ICInputAccessory/blob/develop
66
xcodebuild_arguments: [-project, ICInputAccessory.xcodeproj, -scheme, ICInputAccessory-iOS]
77
module: ICInputAccessory
8-
module_version: 1.4.0
8+
module_version: 1.4.1
99
output: docs/output
1010
theme: fullwidth
11+
skip_undocumented: true

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.1
1+
2.4.1

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0
1+
3.1

.swiftlint-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
language: objective-c
2-
osx_image: xcode8.2
2+
osx_image: xcode8.3
33
cache:
44
bundler: true
55
directories:
66
- vendor/bundle
77
- Pods
88
before_install:
99
- export LANG=en_US.UTF-8
10+
- xcrun instruments -s devices
11+
- xcrun instruments -w "iPhone 7 (10.3.1) [" || true
1012
install:
1113
- make install
1214
before_script:
1315
- xcodebuild -workspace ICInputAccessory.xcworkspace -list
1416
script:
15-
- bundle exec rake ci:build
17+
- bundle exec rake ci:test
1618
- make -B carthage
1719
- make -B docs
1820
after_script:

Brewfile

Lines changed: 0 additions & 2 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## v1.4.1
2+
3+
* Fix `tokenField(_:didChangeInputText:)` with the delete key [#20](https://github.com/polydice/ICInputAccessory/pull/20)
4+
5+
#### Project Updates
6+
7+
* Reenable UI tests
8+
* Combine the framework and example projects
9+
* Specify SwiftLint version via CocoaPods
10+
111
## v1.4.0
212

313
* Added delegate methods:

Example.xcodeproj/project.pbxproj

Lines changed: 0 additions & 544 deletions
This file was deleted.

Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 7 deletions
This file was deleted.

Example/CustomizedTokenField.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ class CustomizedTokenField: ICTokenField {
3939
applyCustomizedStyle()
4040
}
4141

42+
override var intrinsicContentSize: CGSize {
43+
return UILayoutFittingExpandedSize
44+
}
45+
4246
}
4347

4448

0 commit comments

Comments
 (0)