Skip to content

Commit 7e83855

Browse files
bcylinbcylin
committed
Merge branch 'release/1.5.0' into develop
2 parents 8031774 + 8cb56bf commit 7e83855

File tree

19 files changed

+70
-85
lines changed

19 files changed

+70
-85
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: 1.4.1
8+
module_version: 1.5.0
99
output: docs/output
1010
theme: fullwidth
1111
skip_undocumented: true

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0
1+
4.1

‎.swiftlint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
disabled_rules:
22
- file_length
3+
- identifier_name
34
- line_length
45
- type_body_length
56
- vertical_whitespace

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode9
2+
osx_image: xcode9.3beta
33
cache:
44
bundler: true
55
directories:
@@ -8,7 +8,7 @@ cache:
88
before_install:
99
- export LANG=en_US.UTF-8
1010
- xcrun instruments -s devices
11-
- xcrun instruments -w "iPhone 8 (11.0) [" || true
11+
- open -b com.apple.iphonesimulator
1212
install:
1313
- make install
1414
before_script:

‎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>1.4.1</string>
20+
<string>1.5.0</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>

‎Gemfile.lock‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
CFPropertyList (2.3.6)
4+
CFPropertyList (3.0.0)
55
activesupport (4.2.10)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
1010
addressable (2.5.2)
1111
public_suffix (>= 2.0.2, < 4.0)
12+
atomos (0.1.2)
1213
claide (1.0.2)
1314
claide-plugins (0.9.2)
1415
cork
1516
nap
1617
open4 (~> 1.3)
17-
cocoapods (1.4.0)
18+
cocoapods (1.5.0)
1819
activesupport (>= 4.0.2, < 5)
1920
claide (>= 1.0.2, < 2.0)
20-
cocoapods-core (= 1.4.0)
21+
cocoapods-core (= 1.5.0)
2122
cocoapods-deintegrate (>= 1.0.2, < 2.0)
22-
cocoapods-downloader (>= 1.1.3, < 2.0)
23+
cocoapods-downloader (>= 1.2.0, < 2.0)
2324
cocoapods-plugins (>= 1.0.0, < 2.0)
2425
cocoapods-search (>= 1.0.0, < 2.0)
2526
cocoapods-stats (>= 1.0.0, < 2.0)
@@ -29,16 +30,16 @@ GEM
2930
escape (~> 0.0.4)
3031
fourflusher (~> 2.0.1)
3132
gh_inspector (~> 1.0)
32-
molinillo (~> 0.6.4)
33+
molinillo (~> 0.6.5)
3334
nap (~> 1.0)
3435
ruby-macho (~> 1.1)
35-
xcodeproj (>= 1.5.4, < 2.0)
36-
cocoapods-core (1.4.0)
36+
xcodeproj (>= 1.5.7, < 2.0)
37+
cocoapods-core (1.5.0)
3738
activesupport (>= 4.0.2, < 6)
3839
fuzzy_match (~> 2.0.4)
3940
nap (~> 1.0)
4041
cocoapods-deintegrate (1.0.2)
41-
cocoapods-downloader (1.1.3)
42+
cocoapods-downloader (1.2.0)
4243
cocoapods-plugins (1.0.0)
4344
nap
4445
cocoapods-search (1.0.0)
@@ -52,7 +53,7 @@ GEM
5253
concurrent-ruby (1.0.5)
5354
cork (0.3.0)
5455
colored2 (~> 3.1)
55-
danger (5.5.6)
56+
danger (5.5.11)
5657
claide (~> 1.0)
5758
claide-plugins (>= 0.9.2)
5859
colored2 (~> 3.1)
@@ -69,12 +70,12 @@ GEM
6970
multipart-post (>= 1.2, < 3)
7071
faraday-http-cache (1.3.1)
7172
faraday (~> 0.8)
72-
ffi (1.9.18)
73+
ffi (1.9.23)
7374
fourflusher (2.0.1)
7475
fuzzy_match (2.0.4)
75-
gh_inspector (1.0.3)
76+
gh_inspector (1.1.3)
7677
git (1.3.0)
77-
i18n (0.9.1)
78+
i18n (0.9.5)
7879
concurrent-ruby (~> 1.0)
7980
jazzy (0.9.1)
8081
cocoapods (~> 1.0)
@@ -88,11 +89,11 @@ GEM
8889
kramdown (1.16.2)
8990
liferaft (0.0.6)
9091
method_source (0.9.0)
91-
minitest (5.11.1)
92-
molinillo (0.6.4)
92+
minitest (5.11.3)
93+
molinillo (0.6.5)
9394
multipart-post (2.0.0)
9495
mustache (0.99.8)
95-
nanaimo (0.2.3)
96+
nanaimo (0.2.5)
9697
nap (1.1.0)
9798
netrc (0.11.0)
9899
no_proxy_fix (0.1.2)
@@ -102,15 +103,15 @@ GEM
102103
pry (0.11.3)
103104
coderay (~> 1.1.0)
104105
method_source (~> 0.9.0)
105-
public_suffix (3.0.1)
106-
rake (12.3.0)
107-
rb-fsevent (0.10.2)
106+
public_suffix (3.0.2)
107+
rake (12.3.1)
108+
rb-fsevent (0.10.3)
108109
rb-inotify (0.9.10)
109110
ffi (>= 0.5.0, < 2)
110111
redcarpet (3.4.0)
111112
rouge (2.0.7)
112113
ruby-macho (1.1.0)
113-
sass (3.5.5)
114+
sass (3.5.6)
114115
sass-listen (~> 4.0.0)
115116
sass-listen (4.0.0)
116117
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -122,16 +123,17 @@ GEM
122123
terminal-table (1.8.0)
123124
unicode-display_width (~> 1.1, >= 1.1.1)
124125
thread_safe (0.3.6)
125-
tzinfo (1.2.4)
126+
tzinfo (1.2.5)
126127
thread_safe (~> 0.1)
127128
unicode-display_width (1.3.0)
128129
xcinvoke (0.3.0)
129130
liferaft (~> 0.0.6)
130-
xcodeproj (1.5.4)
131-
CFPropertyList (~> 2.3.3)
131+
xcodeproj (1.5.7)
132+
CFPropertyList (>= 2.3.3, < 4.0)
133+
atomos (~> 0.1.2)
132134
claide (>= 1.0.2, < 2.0)
133135
colored2 (~> 3.1)
134-
nanaimo (~> 0.2.3)
136+
nanaimo (~> 0.2.4)
135137
xcpretty (0.2.8)
136138
rouge (~> 2.0.7)
137139

‎ICInputAccessory.podspec‎

Lines changed: 2 additions & 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.4.1"
3+
s.version = "1.5.0"
44
s.summary = "A customized token text field used in the iCook app."
55
s.description = <<-DESC
66
ICKeyboardDismissTextField:
@@ -19,6 +19,7 @@ Pod::Spec.new do |s|
1919
s.license = { type: "MIT", file: "LICENSE" }
2020
s.authors = "bcylin", "trisix"
2121
s.platform = :ios, "8.0"
22+
s.swift_version = "4.0"
2223
s.source = { git: "https://github.com/polydice/ICInputAccessory.git", tag: "v#{s.version}" }
2324
s.requires_arc = true
2425

‎ICInputAccessory.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,6 @@
242242
B53376841F4436D000230739 /* Sources */,
243243
B53376851F4436D000230739 /* Frameworks */,
244244
B53376861F4436D000230739 /* Resources */,
245-
9192772A7DBF8B1D3D564448 /* [CP] Embed Pods Frameworks */,
246-
B00B735ECB485DFE7B769A68 /* [CP] Copy Pods Resources */,
247245
B5E619CA1F44A04A005200E1 /* Embed Frameworks */,
248246
);
249247
buildRules = (
@@ -299,7 +297,7 @@
299297
isa = PBXProject;
300298
attributes = {
301299
LastSwiftUpdateCheck = 0830;
302-
LastUpgradeCheck = 0900;
300+
LastUpgradeCheck = 0930;
303301
ORGANIZATIONNAME = "Polydice, Inc.";
304302
TargetAttributes = {
305303
B53376871F4436D000230739 = {
@@ -386,36 +384,6 @@
386384
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/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# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
387385
showEnvVarsInLog = 0;
388386
};
389-
9192772A7DBF8B1D3D564448 /* [CP] Embed Pods Frameworks */ = {
390-
isa = PBXShellScriptBuildPhase;
391-
buildActionMask = 2147483647;
392-
files = (
393-
);
394-
inputPaths = (
395-
);
396-
name = "[CP] Embed Pods Frameworks";
397-
outputPaths = (
398-
);
399-
runOnlyForDeploymentPostprocessing = 0;
400-
shellPath = /bin/sh;
401-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
402-
showEnvVarsInLog = 0;
403-
};
404-
B00B735ECB485DFE7B769A68 /* [CP] Copy Pods Resources */ = {
405-
isa = PBXShellScriptBuildPhase;
406-
buildActionMask = 2147483647;
407-
files = (
408-
);
409-
inputPaths = (
410-
);
411-
name = "[CP] Copy Pods Resources";
412-
outputPaths = (
413-
);
414-
runOnlyForDeploymentPostprocessing = 0;
415-
shellPath = /bin/sh;
416-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh\"\n";
417-
showEnvVarsInLog = 0;
418-
};
419387
B5FCC31F1F44943A003F7D34 /* SwiftLint */ = {
420388
isa = PBXShellScriptBuildPhase;
421389
buildActionMask = 2147483647;
@@ -428,7 +396,7 @@
428396
);
429397
runOnlyForDeploymentPostprocessing = 0;
430398
shellPath = /bin/sh;
431-
shellScript = "${PODS_ROOT}/SwiftLint/swiftlint";
399+
shellScript = "${PODS_ROOT}/SwiftLint/swiftlint --config .swiftlint.yml";
432400
};
433401
/* End PBXShellScriptBuildPhase section */
434402

@@ -589,12 +557,14 @@
589557
CLANG_WARN_BOOL_CONVERSION = YES;
590558
CLANG_WARN_COMMA = YES;
591559
CLANG_WARN_CONSTANT_CONVERSION = YES;
560+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
592561
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
593562
CLANG_WARN_EMPTY_BODY = YES;
594563
CLANG_WARN_ENUM_CONVERSION = YES;
595564
CLANG_WARN_INFINITE_RECURSION = YES;
596565
CLANG_WARN_INT_CONVERSION = YES;
597566
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
567+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
598568
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
599569
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
600570
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -647,12 +617,14 @@
647617
CLANG_WARN_BOOL_CONVERSION = YES;
648618
CLANG_WARN_COMMA = YES;
649619
CLANG_WARN_CONSTANT_CONVERSION = YES;
620+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
650621
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
651622
CLANG_WARN_EMPTY_BODY = YES;
652623
CLANG_WARN_ENUM_CONVERSION = YES;
653624
CLANG_WARN_INFINITE_RECURSION = YES;
654625
CLANG_WARN_INT_CONVERSION = YES;
655626
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
627+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
656628
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
657629
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
658630
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

‎ICInputAccessory.xcodeproj/xcshareddata/xcschemes/ICInputAccessory-iOS.xcscheme‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -37,7 +36,6 @@
3736
buildConfiguration = "Debug"
3837
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3938
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40-
language = ""
4139
launchStyle = "0"
4240
useCustomWorkingDirectory = "NO"
4341
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)