Skip to content

Commit 249ee4b

Browse files
bcylinbcylin
committed
Merge branch 'release/2.0.1'
2 parents 30a66f2 + 6f8b5b2 commit 249ee4b

25 files changed

+68
-67
lines changed

‎.jazzy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +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: 2.0.0
8+
module_version: 2.0.1
99
output: docs
1010
theme: fullwidth
1111
skip_undocumented: true

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ before_install:
99
- export LANG=en_US.UTF-8
1010
- xcrun instruments -s devices
1111
- xcrun instruments -w "iPhone X (12.0) [" || true
12+
- gem install bundler
1213
install:
1314
- make install
1415
before_script:

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## v2.0.1
2+
3+
* Fix the embedded standard library issue [#32](https://github.com/polydice/ICInputAccessory/pull/32)
4+
15
## v2.0.0
26

37
* Drop Class Name Prefixes

‎Example/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>2.0.0</string>
20+
<string>2.0.1</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>

‎Gemfile.lock‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ GEM
22
remote: http://rubygems.org/
33
specs:
44
CFPropertyList (3.0.0)
5-
activesupport (4.2.10)
5+
activesupport (4.2.11)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
@@ -15,45 +15,45 @@ GEM
1515
cork
1616
nap
1717
open4 (~> 1.3)
18-
cocoapods (1.5.3)
18+
cocoapods (1.6.1)
1919
activesupport (>= 4.0.2, < 5)
2020
claide (>= 1.0.2, < 2.0)
21-
cocoapods-core (= 1.5.3)
21+
cocoapods-core (= 1.6.1)
2222
cocoapods-deintegrate (>= 1.0.2, < 2.0)
23-
cocoapods-downloader (>= 1.2.0, < 2.0)
23+
cocoapods-downloader (>= 1.2.2, < 2.0)
2424
cocoapods-plugins (>= 1.0.0, < 2.0)
2525
cocoapods-search (>= 1.0.0, < 2.0)
2626
cocoapods-stats (>= 1.0.0, < 2.0)
27-
cocoapods-trunk (>= 1.3.0, < 2.0)
27+
cocoapods-trunk (>= 1.3.1, < 2.0)
2828
cocoapods-try (>= 1.1.0, < 2.0)
2929
colored2 (~> 3.1)
3030
escape (~> 0.0.4)
31-
fourflusher (~> 2.0.1)
31+
fourflusher (>= 2.2.0, < 3.0)
3232
gh_inspector (~> 1.0)
33-
molinillo (~> 0.6.5)
33+
molinillo (~> 0.6.6)
3434
nap (~> 1.0)
35-
ruby-macho (~> 1.1)
36-
xcodeproj (>= 1.5.7, < 2.0)
37-
cocoapods-core (1.5.3)
35+
ruby-macho (~> 1.4)
36+
xcodeproj (>= 1.8.1, < 2.0)
37+
cocoapods-core (1.6.1)
3838
activesupport (>= 4.0.2, < 6)
3939
fuzzy_match (~> 2.0.4)
4040
nap (~> 1.0)
41-
cocoapods-deintegrate (1.0.2)
42-
cocoapods-downloader (1.2.1)
41+
cocoapods-deintegrate (1.0.3)
42+
cocoapods-downloader (1.2.2)
4343
cocoapods-plugins (1.0.0)
4444
nap
4545
cocoapods-search (1.0.0)
46-
cocoapods-stats (1.0.0)
46+
cocoapods-stats (1.1.0)
4747
cocoapods-trunk (1.3.1)
4848
nap (>= 0.8, < 2.0)
4949
netrc (~> 0.11)
5050
cocoapods-try (1.1.0)
5151
coderay (1.1.2)
5252
colored2 (3.1.2)
53-
concurrent-ruby (1.0.5)
53+
concurrent-ruby (1.1.4)
5454
cork (0.3.0)
5555
colored2 (~> 3.1)
56-
danger (5.6.7)
56+
danger (5.15.0)
5757
claide (~> 1.0)
5858
claide-plugins (>= 0.9.2)
5959
colored2 (~> 3.1)
@@ -66,18 +66,18 @@ GEM
6666
octokit (~> 4.7)
6767
terminal-table (~> 1)
6868
escape (0.0.4)
69-
faraday (0.15.3)
69+
faraday (0.15.4)
7070
multipart-post (>= 1.2, < 3)
7171
faraday-http-cache (1.3.1)
7272
faraday (~> 0.8)
73-
ffi (1.9.25)
74-
fourflusher (2.0.1)
73+
ffi (1.10.0)
74+
fourflusher (2.2.0)
7575
fuzzy_match (2.0.4)
7676
gh_inspector (1.1.3)
7777
git (1.5.0)
7878
i18n (0.9.5)
7979
concurrent-ruby (~> 1.0)
80-
jazzy (0.9.3)
80+
jazzy (0.9.4)
8181
cocoapods (~> 1.0)
8282
mustache (~> 0.99)
8383
open4
@@ -88,7 +88,7 @@ GEM
8888
xcinvoke (~> 0.3.0)
8989
kramdown (1.17.0)
9090
liferaft (0.0.6)
91-
method_source (0.9.0)
91+
method_source (0.9.2)
9292
minitest (5.11.3)
9393
molinillo (0.6.6)
9494
multipart-post (2.0.0)
@@ -97,38 +97,38 @@ GEM
9797
nap (1.1.0)
9898
netrc (0.11.0)
9999
no_proxy_fix (0.1.2)
100-
octokit (4.12.0)
100+
octokit (4.13.0)
101101
sawyer (~> 0.8.0, >= 0.5.3)
102102
open4 (1.3.4)
103-
pry (0.11.3)
103+
pry (0.12.2)
104104
coderay (~> 1.1.0)
105105
method_source (~> 0.9.0)
106106
public_suffix (3.0.3)
107-
rake (12.3.1)
107+
rake (12.3.2)
108108
rb-fsevent (0.10.3)
109-
rb-inotify (0.9.10)
110-
ffi (>= 0.5.0, < 2)
109+
rb-inotify (0.10.0)
110+
ffi (~> 1.0)
111111
redcarpet (3.4.0)
112112
rouge (2.0.7)
113-
ruby-macho (1.3.1)
114-
sass (3.6.0)
113+
ruby-macho (1.4.0)
114+
sass (3.7.3)
115115
sass-listen (~> 4.0.0)
116116
sass-listen (4.0.0)
117117
rb-fsevent (~> 0.9, >= 0.9.4)
118118
rb-inotify (~> 0.9, >= 0.9.7)
119119
sawyer (0.8.1)
120120
addressable (>= 2.3.5, < 2.6)
121121
faraday (~> 0.8, < 1.0)
122-
sqlite3 (1.3.13)
122+
sqlite3 (1.4.0)
123123
terminal-table (1.8.0)
124124
unicode-display_width (~> 1.1, >= 1.1.1)
125125
thread_safe (0.3.6)
126126
tzinfo (1.2.5)
127127
thread_safe (~> 0.1)
128-
unicode-display_width (1.4.0)
128+
unicode-display_width (1.4.1)
129129
xcinvoke (0.3.0)
130130
liferaft (~> 0.0.6)
131-
xcodeproj (1.6.0)
131+
xcodeproj (1.8.1)
132132
CFPropertyList (>= 2.3.3, < 4.0)
133133
atomos (~> 0.1.3)
134134
claide (>= 1.0.2, < 2.0)
@@ -149,4 +149,4 @@ DEPENDENCIES
149149
xcpretty
150150

151151
BUNDLED WITH
152-
1.16.4
152+
2.0.1

‎ICInputAccessory.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "ICInputAccessory"
3-
s.version = "2.0.0"
3+
s.version = "2.0.1"
44
s.summary = "A customized token text field used in the iCook app."
55
s.description = <<-DESC
66
KeyboardDismissTextField:
@@ -16,8 +16,8 @@ Pod::Spec.new do |s|
1616
* An easy to use UIControl that displays a UIPickerView with given options.
1717
DESC
1818

19-
s.screenshots = "https://polydice.github.io/ICInputAccessory/screenshots/ICTokenField.png",
20-
"https://polydice.github.io/ICInputAccessory/screenshots/ICKeyboardDismissTextField.png"
19+
s.screenshots = "https://raw.githubusercontent.com/polydice/ICInputAccessory/master/screenshots/ICTokenField.png",
20+
"https://raw.githubusercontent.com/polydice/ICInputAccessory/master/screenshots/ICKeyboardDismissTextField.png"
2121
s.homepage = "https://github.com/polydice/ICInputAccessory"
2222
s.license = { type: "MIT", file: "LICENSE" }
2323
s.authors = "bcylin", "trisix"

‎ICInputAccessory.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,6 @@
571571
B56BC4301C89A7EA00C20AD6 /* Debug */ = {
572572
isa = XCBuildConfiguration;
573573
buildSettings = {
574-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
575574
ALWAYS_SEARCH_USER_PATHS = NO;
576575
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
577576
CLANG_CXX_LIBRARY = "libc++";
@@ -631,7 +630,6 @@
631630
B56BC4311C89A7EA00C20AD6 /* Release */ = {
632631
isa = XCBuildConfiguration;
633632
buildSettings = {
634-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
635633
ALWAYS_SEARCH_USER_PATHS = NO;
636634
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
637635
CLANG_CXX_LIBRARY = "libc++";
@@ -684,7 +682,6 @@
684682
B56BC4331C89A7EA00C20AD6 /* Debug */ = {
685683
isa = XCBuildConfiguration;
686684
buildSettings = {
687-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
688685
CLANG_ENABLE_MODULES = YES;
689686
DEFINES_MODULE = YES;
690687
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -705,7 +702,6 @@
705702
B56BC4341C89A7EA00C20AD6 /* Release */ = {
706703
isa = XCBuildConfiguration;
707704
buildSettings = {
708-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
709705
CLANG_ENABLE_MODULES = YES;
710706
DEFINES_MODULE = YES;
711707
DYLIB_COMPATIBILITY_VERSION = 1;

‎ICInputAccessory/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.0.0</string>
18+
<string>2.0.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎ICInputAccessoryUITests/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.0.0</string>
18+
<string>2.0.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ SPEC CHECKSUMS:
1313

1414
PODFILE CHECKSUM: 74bc2bf59f17e7cc006ae2aa1d4d73e50cc2b4ff
1515

16-
COCOAPODS: 1.5.3
16+
COCOAPODS: 1.6.1

0 commit comments

Comments
 (0)