Skip to content

Commit 34ca6dd

Browse files
bcylinbcylin
committed
Merge branch 'hotfix/1.2.1'
2 parents d1ac41c + 1b00e0c commit 34ca6dd

File tree

19 files changed

+129
-102
lines changed

19 files changed

+129
-102
lines changed

‎.jazzy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ github_url: https://github.com/polydice/ICInputAccessory
55
github_file_prefix: https://github.com/polydice/ICInputAccessory/blob/develop
66
xcodebuild_arguments: [-scheme, ICInputAccessory-iOS]
77
module: ICInputAccessory
8-
module_version: 1.2.0
8+
module_version: 1.2.1
99
output: docs/output
1010
theme: fullwidth

‎.travis.yml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
language: objective-c
2-
osx_image: xcode8
3-
matrix:
4-
include:
5-
- env: BUILD=9.3
6-
script: bundle exec rake ci:build[9.3]
7-
- env: BUILD=latest
8-
script: bundle exec rake ci:build[latest]
9-
- env: BUILD=carthage
10-
script: make carthage
11-
after_script:
12-
- make documentation
2+
osx_image: xcode8.2
133
cache:
144
bundler: true
155
directories:
@@ -21,6 +11,10 @@ install:
2111
- make install
2212
before_script:
2313
- xcodebuild -workspace ICInputAccessory.xcworkspace -list
14+
script:
15+
- bundle exec rake ci:build
16+
- make -B carthage
17+
- make -B docs
2418
notifications:
2519
email: false
2620
slack:

‎CHANGELOG.md‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
## v1.2.0
1+
## v1.2.1
2+
3+
* Update to Xcode 8.2
24

3-
#### Changes
5+
## v1.2.0
46

57
* Swift 2.3
68

79
## v1.1.0
810

9-
#### Changes
10-
1111
* Support storyboard
1212
* Support subspecs
1313
* Upgrade to Swift 2.2
@@ -17,7 +17,5 @@
1717

1818
Initial release written in Swift 2.1.
1919

20-
#### Changes
21-
2220
* `ICKeyboardDismissTextField` with an accessory view to dismiss keyboard.
2321
* `ICTokenField`, a text field that groups input texts as tokens.

‎Example/Example.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,17 +187,17 @@
187187
isa = PBXProject;
188188
attributes = {
189189
LastSwiftUpdateCheck = 0720;
190-
LastUpgradeCheck = 0720;
190+
LastUpgradeCheck = 0820;
191191
ORGANIZATIONNAME = "Polydice, Inc.";
192192
TargetAttributes = {
193193
B548C5C11C8E91B0009D5AEE = {
194194
CreatedOnToolsVersion = 7.2.1;
195-
LastSwiftMigration = 0800;
195+
LastSwiftMigration = 0820;
196196
TestTargetID = B5E9F8FA1C8D3B6E00443DC7;
197197
};
198198
B5E9F8FA1C8D3B6E00443DC7 = {
199199
CreatedOnToolsVersion = 7.2.1;
200-
LastSwiftMigration = 0800;
200+
LastSwiftMigration = 0820;
201201
};
202202
};
203203
};
@@ -269,7 +269,7 @@
269269
);
270270
runOnlyForDeploymentPostprocessing = 0;
271271
shellPath = /bin/sh;
272-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
272+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
273273
showEnvVarsInLog = 0;
274274
};
275275
B5C50ADD1C917F4A0059032B /* Swift Lint */ = {
@@ -385,6 +385,7 @@
385385
B5E9F90B1C8D3B6E00443DC7 /* Debug */ = {
386386
isa = XCBuildConfiguration;
387387
buildSettings = {
388+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
388389
ALWAYS_SEARCH_USER_PATHS = NO;
389390
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
390391
CLANG_CXX_LIBRARY = "libc++";
@@ -395,8 +396,10 @@
395396
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
396397
CLANG_WARN_EMPTY_BODY = YES;
397398
CLANG_WARN_ENUM_CONVERSION = YES;
399+
CLANG_WARN_INFINITE_RECURSION = YES;
398400
CLANG_WARN_INT_CONVERSION = YES;
399401
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
402+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
400403
CLANG_WARN_UNREACHABLE_CODE = YES;
401404
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
402405
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -423,12 +426,14 @@
423426
ONLY_ACTIVE_ARCH = YES;
424427
SDKROOT = iphoneos;
425428
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
429+
SWIFT_VERSION = 2.3;
426430
};
427431
name = Debug;
428432
};
429433
B5E9F90C1C8D3B6E00443DC7 /* Release */ = {
430434
isa = XCBuildConfiguration;
431435
buildSettings = {
436+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
432437
ALWAYS_SEARCH_USER_PATHS = NO;
433438
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
434439
CLANG_CXX_LIBRARY = "libc++";
@@ -439,8 +444,10 @@
439444
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
440445
CLANG_WARN_EMPTY_BODY = YES;
441446
CLANG_WARN_ENUM_CONVERSION = YES;
447+
CLANG_WARN_INFINITE_RECURSION = YES;
442448
CLANG_WARN_INT_CONVERSION = YES;
443449
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
450+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
444451
CLANG_WARN_UNREACHABLE_CODE = YES;
445452
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
446453
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -459,6 +466,8 @@
459466
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
460467
MTL_ENABLE_DEBUG_INFO = NO;
461468
SDKROOT = iphoneos;
469+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
470+
SWIFT_VERSION = 2.3;
462471
VALIDATE_PRODUCT = YES;
463472
};
464473
name = Release;
@@ -467,6 +476,7 @@
467476
isa = XCBuildConfiguration;
468477
baseConfigurationReference = CA708B7D49E7D80A75ED81E3 /* Pods-Example.debug.xcconfig */;
469478
buildSettings = {
479+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
470480
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
471481
INFOPLIST_FILE = Example/Info.plist;
472482
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -482,6 +492,7 @@
482492
isa = XCBuildConfiguration;
483493
baseConfigurationReference = FE1A89C8A77ED0438A206A24 /* Pods-Example.release.xcconfig */;
484494
buildSettings = {
495+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
485496
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
486497
INFOPLIST_FILE = Example/Info.plist;
487498
IPHONEOS_DEPLOYMENT_TARGET = 8.0;

‎Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0800"
3+
LastUpgradeVersion = "0820"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Example/Example/Base.lproj/LaunchScreen.storyboard‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="IdP-BZ-jEu">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1212" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="IdP-BZ-jEu">
3+
<device id="retina4_7" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
47
<deployment identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
9+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
610
</dependencies>
711
<scenes>
812
<!--View Controller-->
@@ -14,9 +18,9 @@
1418
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
1519
</layoutGuides>
1620
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
17-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
21+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
1822
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
19-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
23+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2024
</view>
2125
<navigationItem key="navigationItem" id="wKR-dx-tdo"/>
2226
</viewController>

‎Example/Example/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>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.2.0</string>
18+
<string>1.2.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎Example/Example/Main.storyboard‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="XY5-gz-UXC">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1212" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="XY5-gz-UXC">
3+
<device id="retina4_7" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
47
<deployment identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
69
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
10+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
711
</dependencies>
812
<scenes>
913
<!--ICInputAccessory-->
1014
<scene sceneID="ssv-qC-OfH">
1115
<objects>
1216
<tableViewController id="0fq-Xw-Z0G" customClass="StoryboardViewController" customModule="Example" customModuleProvider="target" sceneMemberID="viewController">
1317
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="ZTV-zA-HhW">
14-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
18+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
1519
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
16-
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
20+
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1721
<button key="tableFooterView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="N87-CU-PrP">
18-
<rect key="frame" x="0.0" y="269.5" width="600" height="88"/>
22+
<rect key="frame" x="0.0" y="219" width="375" height="88"/>
1923
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
2024
<fontDescription key="fontDescription" type="system" pointSize="15"/>
2125
<state key="normal" title="Back to Code"/>
@@ -27,14 +31,14 @@
2731
<tableViewSection headerTitle="Dismiss Keyboard" id="tmE-Ln-PNX">
2832
<cells>
2933
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="hiq-lt-L5I">
30-
<rect key="frame" x="0.0" y="113.5" width="600" height="44"/>
34+
<rect key="frame" x="0.0" y="56" width="375" height="44"/>
3135
<autoresizingMask key="autoresizingMask"/>
3236
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hiq-lt-L5I" id="dNb-Qm-7pq">
33-
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
37+
<rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
3438
<autoresizingMask key="autoresizingMask"/>
3539
<subviews>
3640
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Storyboard ICKeyboardDismissTextField" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="qdb-Ab-nYe" customClass="ICKeyboardDismissTextField" customModule="ICInputAccessory">
37-
<rect key="frame" x="18" y="12" width="564" height="20"/>
41+
<rect key="frame" x="18" y="12" width="339" height="20"/>
3842
<fontDescription key="fontDescription" type="system" pointSize="16"/>
3943
<textInputTraits key="textInputTraits"/>
4044
<connections>
@@ -54,16 +58,16 @@
5458
<tableViewSection headerTitle="Text Field with Tokens" id="dx2-iZ-OPN">
5559
<cells>
5660
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="nCe-ZG-eEP">
57-
<rect key="frame" x="0.0" y="207.5" width="600" height="44"/>
61+
<rect key="frame" x="0.0" y="157" width="375" height="44"/>
5862
<autoresizingMask key="autoresizingMask"/>
5963
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nCe-ZG-eEP" id="6tu-Im-VHX">
60-
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
64+
<rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
6165
<autoresizingMask key="autoresizingMask"/>
6266
<subviews>
6367
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2dP-7v-mWC" customClass="ICTokenField" customModule="ICInputAccessory">
64-
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
65-
<color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
66-
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
68+
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
69+
<color key="backgroundColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
70+
<color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
6771
<userDefinedRuntimeAttributes>
6872
<userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="Storyboard ICTokenField"/>
6973
<userDefinedRuntimeAttribute type="image" keyPath="icon" value="icook-iphone-input-search"/>
@@ -74,7 +78,7 @@
7478
<real key="value" value="0.0"/>
7579
</userDefinedRuntimeAttribute>
7680
<userDefinedRuntimeAttribute type="color" keyPath="textColor">
77-
<color key="value" white="1" alpha="1" colorSpace="calibratedWhite"/>
81+
<color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
7882
</userDefinedRuntimeAttribute>
7983
</userDefinedRuntimeAttributes>
8084
</view>
@@ -104,10 +108,10 @@
104108
<view contentMode="scaleToFill" id="zaj-ho-SsM" customClass="ICKeyboardDismissAccessoryView" customModule="ICInputAccessory">
105109
<rect key="frame" x="0.0" y="0.0" width="320" height="60"/>
106110
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
107-
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
111+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
108112
<userDefinedRuntimeAttributes>
109113
<userDefinedRuntimeAttribute type="color" keyPath="buttonColor">
110-
<color key="value" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
114+
<color key="value" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
111115
</userDefinedRuntimeAttribute>
112116
</userDefinedRuntimeAttributes>
113117
</view>

‎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.2.0</string>
18+
<string>1.2.1</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.1.0"
55
gem "jazzy", "~> 0.7.0"
66
gem "pry"
77
gem "rake"

0 commit comments

Comments
 (0)