Skip to content

Commit dbce6a1

Browse files
authored
Merge pull request #1 from polydice/release/1.1.0
Release / 1.1.0
2 parents 5ede7ba + 613aa74 commit dbce6a1

16 files changed

Lines changed: 106 additions & 53 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ install:
1616
before_script:
1717
- xcodebuild -workspace ICInputAccessory.xcworkspace -list
1818
script:
19-
- bundle exec rake ci:test[$VERSION]
19+
- bundle exec rake ci:build[$VERSION]
2020
notifications:
2121
email: false
2222
slack:

CHANGELOG.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
1+
## v1.1.0
2+
3+
#### Changes
4+
5+
* Support storyboard
6+
* Support subspecs
7+
* Upgrade to Swift 2.2
8+
* Use CocoaPods (1.0.1)
9+
110
## v1.0.0
211

312
Initial release written in Swift 2.1.
413

5-
#### Added
14+
#### Changes
615

716
* `ICKeyboardDismissTextField` with an accessory view to dismiss keyboard.
817
* `ICTokenField`, a text field that groups input texts as tokens.

Example/Example.xcodeproj/project.pbxproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,12 @@
163163
isa = PBXNativeTarget;
164164
buildConfigurationList = B5E9F90D1C8D3B6E00443DC7 /* Build configuration list for PBXNativeTarget "Example" */;
165165
buildPhases = (
166-
96705876C946719953BCD0C6 /* 📦 Check Pods Manifest.lock */,
166+
96705876C946719953BCD0C6 /* [CP] Check Pods Manifest.lock */,
167167
B5E9F8F71C8D3B6E00443DC7 /* Sources */,
168168
B5E9F8F81C8D3B6E00443DC7 /* Frameworks */,
169169
B5E9F8F91C8D3B6E00443DC7 /* Resources */,
170-
CAB3B20531AAE2438C48D751 /* 📦 Embed Pods Frameworks */,
171-
7B2FB96C7361D5883F3ADD14 /* 📦 Copy Pods Resources */,
170+
CAB3B20531AAE2438C48D751 /* [CP] Embed Pods Frameworks */,
171+
7B2FB96C7361D5883F3ADD14 /* [CP] Copy Pods Resources */,
172172
B5C50ADD1C917F4A0059032B /* Swift Lint */,
173173
);
174174
buildRules = (
@@ -240,29 +240,29 @@
240240
/* End PBXResourcesBuildPhase section */
241241

242242
/* Begin PBXShellScriptBuildPhase section */
243-
7B2FB96C7361D5883F3ADD14 /* 📦 Copy Pods Resources */ = {
243+
7B2FB96C7361D5883F3ADD14 /* [CP] Copy Pods Resources */ = {
244244
isa = PBXShellScriptBuildPhase;
245245
buildActionMask = 2147483647;
246246
files = (
247247
);
248248
inputPaths = (
249249
);
250-
name = "📦 Copy Pods Resources";
250+
name = "[CP] Copy Pods Resources";
251251
outputPaths = (
252252
);
253253
runOnlyForDeploymentPostprocessing = 0;
254254
shellPath = /bin/sh;
255255
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh\"\n";
256256
showEnvVarsInLog = 0;
257257
};
258-
96705876C946719953BCD0C6 /* 📦 Check Pods Manifest.lock */ = {
258+
96705876C946719953BCD0C6 /* [CP] Check Pods Manifest.lock */ = {
259259
isa = PBXShellScriptBuildPhase;
260260
buildActionMask = 2147483647;
261261
files = (
262262
);
263263
inputPaths = (
264264
);
265-
name = "📦 Check Pods Manifest.lock";
265+
name = "[CP] Check Pods Manifest.lock";
266266
outputPaths = (
267267
);
268268
runOnlyForDeploymentPostprocessing = 0;
@@ -284,14 +284,14 @@
284284
shellPath = /bin/sh;
285285
shellScript = "if which swiftlint >/dev/null; then swiftlint; fi";
286286
};
287-
CAB3B20531AAE2438C48D751 /* 📦 Embed Pods Frameworks */ = {
287+
CAB3B20531AAE2438C48D751 /* [CP] Embed Pods Frameworks */ = {
288288
isa = PBXShellScriptBuildPhase;
289289
buildActionMask = 2147483647;
290290
files = (
291291
);
292292
inputPaths = (
293293
);
294-
name = "📦 Embed Pods Frameworks";
294+
name = "[CP] Embed Pods Frameworks";
295295
outputPaths = (
296296
);
297297
runOnlyForDeploymentPostprocessing = 0;

Example/Example/CustomizedTokenViewController.swift

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class CustomizedTokenViewController: UIViewController, ICTokenFieldDelegate {
5050
navigationController?.navigationBar.translucent = false
5151
navigationController?.navigationBar.barStyle = .Black
5252

53-
let cancelBarButton = UIBarButtonItem(barButtonSystemItem: .Cancel, target: self, action: #selector(dismiss(_:)))
53+
let cancelBarButton = UIBarButtonItem(barButtonSystemItem: .Cancel, target: self, action: .dismiss)
5454
cancelBarButton.tintColor = UIColor.whiteColor()
5555
navigationItem.rightBarButtonItem = cancelBarButton
5656

@@ -106,3 +106,11 @@ class CustomizedTokenViewController: UIViewController, ICTokenFieldDelegate {
106106
}
107107

108108
}
109+
110+
111+
////////////////////////////////////////////////////////////////////////////////
112+
113+
114+
private extension Selector {
115+
static let dismiss = #selector(CustomizedTokenViewController.dismiss(_:))
116+
}

Example/Example/ExampleViewController.swift

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ExampleViewController: UITableViewController {
3939
let _button = UIButton(type: .System)
4040
_button.frame = CGRect(x: 0, y: 0, width: UIScreen.mainScreen().bounds.width, height: 88)
4141
_button.setTitle("Storyboard", forState: .Normal)
42-
_button.addTarget(self, action: #selector(showStoryboard(_:)), forControlEvents: .TouchUpInside)
42+
_button.addTarget(self, action: .showStoryboard, forControlEvents: .TouchUpInside)
4343
return _button
4444
}()
4545

@@ -133,3 +133,11 @@ class ExampleViewController: UITableViewController {
133133
}
134134

135135
}
136+
137+
138+
////////////////////////////////////////////////////////////////////////////////
139+
140+
141+
private extension Selector {
142+
static let showStoryboard = #selector(ExampleViewController.showStoryboard(_:))
143+
}

Example/Example/Info.plist

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0.0</string>
18+
<string>1.1.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>1</string>
22+
<string>101</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
2525
<key>UILaunchStoryboardName</key>
@@ -28,11 +28,14 @@
2828
<array>
2929
<string>armv7</string>
3030
</array>
31+
<key>UIRequiresFullScreen</key>
32+
<false/>
3133
<key>UISupportedInterfaceOrientations</key>
3234
<array>
3335
<string>UIInterfaceOrientationPortrait</string>
3436
<string>UIInterfaceOrientationLandscapeLeft</string>
3537
<string>UIInterfaceOrientationLandscapeRight</string>
38+
<string>UIInterfaceOrientationPortraitUpsideDown</string>
3639
</array>
3740
</dict>
3841
</plist>

Example/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>1.0</string>
18+
<string>1.1.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source "http://rubygems.org"
22
ruby "2.3.1"
33

4-
gem "cocoapods", "1.0.0"
4+
gem "cocoapods", "~> 1.0.0"
55
gem "pry"
66
gem "rake"
77
gem "xcpretty"

Gemfile.lock

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
activesupport (4.2.6)
4+
activesupport (5.0.0)
5+
concurrent-ruby (~> 1.0, >= 1.0.2)
56
i18n (~> 0.7)
6-
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
8-
thread_safe (~> 0.3, >= 0.3.4)
98
tzinfo (~> 1.1)
109
claide (1.0.0)
11-
cocoapods (1.0.0)
10+
cocoapods (1.0.1)
1211
activesupport (>= 4.0.2)
1312
claide (>= 1.0.0, < 2.0)
14-
cocoapods-core (= 1.0.0)
13+
cocoapods-core (= 1.0.1)
1514
cocoapods-deintegrate (>= 1.0.0, < 2.0)
1615
cocoapods-downloader (>= 1.0.0, < 2.0)
1716
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -24,44 +23,44 @@ GEM
2423
fourflusher (~> 0.3.0)
2524
molinillo (~> 0.4.5)
2625
nap (~> 1.0)
27-
xcodeproj (>= 1.0.0, < 2.0)
28-
cocoapods-core (1.0.0)
26+
xcodeproj (>= 1.1.0, < 2.0)
27+
cocoapods-core (1.0.1)
2928
activesupport (>= 4.0.2)
3029
fuzzy_match (~> 2.0.4)
3130
nap (~> 1.0)
3231
cocoapods-deintegrate (1.0.0)
33-
cocoapods-downloader (1.0.0)
32+
cocoapods-downloader (1.1.0)
3433
cocoapods-plugins (1.0.0)
3534
nap
3635
cocoapods-search (1.0.0)
3736
cocoapods-stats (1.0.0)
3837
cocoapods-trunk (1.0.0)
3938
nap (>= 0.8, < 2.0)
4039
netrc (= 0.7.8)
41-
cocoapods-try (1.0.0)
40+
cocoapods-try (1.1.0)
4241
coderay (1.1.1)
4342
colored (1.2)
43+
concurrent-ruby (1.0.2)
4444
escape (0.0.4)
45-
fourflusher (0.3.1)
45+
fourflusher (0.3.2)
4646
fuzzy_match (2.0.4)
4747
i18n (0.7.0)
48-
json (1.8.3)
4948
method_source (0.8.2)
5049
minitest (5.9.0)
5150
molinillo (0.4.5)
5251
nap (1.1.0)
5352
netrc (0.7.8)
54-
pry (0.10.3)
53+
pry (0.10.4)
5554
coderay (~> 1.1.0)
5655
method_source (~> 0.8.1)
5756
slop (~> 3.4)
58-
rake (11.1.2)
59-
rouge (1.10.1)
57+
rake (11.2.2)
58+
rouge (1.11.1)
6059
slop (3.6.0)
6160
thread_safe (0.3.5)
6261
tzinfo (1.2.2)
6362
thread_safe (~> 0.1)
64-
xcodeproj (1.0.0)
63+
xcodeproj (1.2.0)
6564
activesupport (>= 3)
6665
claide (>= 1.0.0, < 2.0)
6766
colored (~> 1.2)
@@ -72,7 +71,7 @@ PLATFORMS
7271
ruby
7372

7473
DEPENDENCIES
75-
cocoapods (= 1.0.0)
74+
cocoapods (~> 1.0.0)
7675
pry
7776
rake
7877
xcpretty

ICInputAccessory.podspec

Lines changed: 1 addition & 1 deletion
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 = "1.0.0"
3+
s.version = "1.1.0"
44
s.summary = "A customized token text field used in the iCook app."
55
s.description = <<-DESC
66
ICKeyboardDismissTextField:

0 commit comments

Comments
 (0)