Skip to content

Commit 716d0fb

Browse files
committed
Merge branch 'release/1.3.0'
2 parents 34ca6dd + 62c5f09 commit 716d0fb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+399
-255
lines changed

.jazzy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ author: polydice
33
author_url: https://github.com/polydice
44
github_url: https://github.com/polydice/ICInputAccessory
55
github_file_prefix: https://github.com/polydice/ICInputAccessory/blob/develop
6-
xcodebuild_arguments: [-scheme, ICInputAccessory-iOS]
6+
xcodebuild_arguments: [-project, ICInputAccessory.xcodeproj, -scheme, ICInputAccessory-iOS]
77
module: ICInputAccessory
8-
module_version: 1.2.1
8+
module_version: 1.3.0
99
output: docs/output
1010
theme: fullwidth

.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0.0

.swiftlint-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.16.1

.swiftlint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ disabled_rules:
22
- file_length
33
- line_length
44
- type_body_length
5+
- vertical_whitespace
56
excluded:
67
- Carthage
78
- Pods

CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## v1.3.0
2+
3+
* Swift 3.0
4+
* Support `pod try ICInputAccessory`
5+
16
## v1.2.1
27

38
* Update to Xcode 8.2
@@ -8,10 +13,9 @@
813

914
## v1.1.0
1015

16+
* Swift 2.2
1117
* Support storyboard
1218
* Support subspecs
13-
* Upgrade to Swift 2.2
14-
* Use CocoaPods (1.0.1)
1519

1620
## v1.0.0
1721

Dangerfile

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/usr/bin/env ruby
2+
3+
# Sometimes it's a README fix, or something like that - which isn't relevant for
4+
# including in a project's CHANGELOG for example
5+
declared_trivial = (github.pr_title + github.pr_body).include? "#trivial"
6+
7+
# Make it more obvious that a PR is a work in progress and shouldn't be merged yet
8+
warn "PR is classed as Work in Progress" if github.pr_title.include? "[WIP]"
9+
10+
# Warn when there is a big PR
11+
warn "Big PR" if git.lines_of_code > 500
12+
13+
# Ensure there is a summary for a PR
14+
fail "Please provide a summary in the Pull Request description" if github.pr_body.length < 5
15+
16+
# Add a CHANGELOG entry for app changes
17+
if git.lines_of_code > 50 && !git.modified_files.include?("CHANGELOG.md") && !declared_trivial
18+
fail "Please update [CHANGELOG.md](https://github.com/polydice/ICInputAccessory/blob/develop/CHANGELOG.md).", sticky: true
19+
end
20+
21+
# Ensure a clean commits history
22+
if git.commits.any? { |c| c.message =~ /^Merge branch/ }
23+
fail "Please rebase to get rid of the merge commits in this PR", sticky: true
24+
end

Example/Example.xcodeproj/project.pbxproj renamed to Example.xcodeproj/project.pbxproj

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
B5E9F9081C8D3B6E00443DC7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5050
B5E9F90A1C8D3B6E00443DC7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5151
B5F62A5C1C9ECBCB003A1231 /* ICKeyboardDismissTextFieldUITests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ICKeyboardDismissTextFieldUITests.swift; sourceTree = "<group>"; };
52-
CA708B7D49E7D80A75ED81E3 /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
52+
CA708B7D49E7D80A75ED81E3 /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
5353
D0DB1D3E89AB75183DB104E0 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
54-
FE1A89C8A77ED0438A206A24 /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "../Pods/Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
54+
FE1A89C8A77ED0438A206A24 /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
5555
/* End PBXFileReference section */
5656

5757
/* Begin PBXFrameworksBuildPhase section */
@@ -254,7 +254,7 @@
254254
);
255255
runOnlyForDeploymentPostprocessing = 0;
256256
shellPath = /bin/sh;
257-
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh\"\n";
257+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh\"\n";
258258
showEnvVarsInLog = 0;
259259
};
260260
96705876C946719953BCD0C6 /* [CP] Check Pods Manifest.lock */ = {
@@ -284,7 +284,7 @@
284284
);
285285
runOnlyForDeploymentPostprocessing = 0;
286286
shellPath = /bin/sh;
287-
shellScript = "if which swiftlint >/dev/null; then swiftlint; fi";
287+
shellScript = "sh ${SRCROOT}/scripts/swiftlint.sh";
288288
};
289289
CAB3B20531AAE2438C48D751 /* [CP] Embed Pods Frameworks */ = {
290290
isa = PBXShellScriptBuildPhase;
@@ -298,7 +298,7 @@
298298
);
299299
runOnlyForDeploymentPostprocessing = 0;
300300
shellPath = /bin/sh;
301-
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
301+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
302302
showEnvVarsInLog = 0;
303303
};
304304
/* End PBXShellScriptBuildPhase section */
@@ -359,11 +359,12 @@
359359
B548C5C91C8E91B0009D5AEE /* Debug */ = {
360360
isa = XCBuildConfiguration;
361361
buildSettings = {
362+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
362363
INFOPLIST_FILE = ICInputAccessoryUITests/Info.plist;
363364
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
364365
PRODUCT_BUNDLE_IDENTIFIER = com.polydice.ICInputAccessoryUITests;
365366
PRODUCT_NAME = "$(TARGET_NAME)";
366-
SWIFT_VERSION = 2.3;
367+
SWIFT_VERSION = 3.0;
367368
TEST_TARGET_NAME = Example;
368369
USES_XCTRUNNER = YES;
369370
};
@@ -372,11 +373,13 @@
372373
B548C5CA1C8E91B0009D5AEE /* Release */ = {
373374
isa = XCBuildConfiguration;
374375
buildSettings = {
376+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
375377
INFOPLIST_FILE = ICInputAccessoryUITests/Info.plist;
376378
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
377379
PRODUCT_BUNDLE_IDENTIFIER = com.polydice.ICInputAccessoryUITests;
378380
PRODUCT_NAME = "$(TARGET_NAME)";
379-
SWIFT_VERSION = 2.3;
381+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
382+
SWIFT_VERSION = 3.0;
380383
TEST_TARGET_NAME = Example;
381384
USES_XCTRUNNER = YES;
382385
};
@@ -426,7 +429,7 @@
426429
ONLY_ACTIVE_ARCH = YES;
427430
SDKROOT = iphoneos;
428431
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
429-
SWIFT_VERSION = 2.3;
432+
SWIFT_VERSION = 3.0;
430433
};
431434
name = Debug;
432435
};
@@ -467,7 +470,7 @@
467470
MTL_ENABLE_DEBUG_INFO = NO;
468471
SDKROOT = iphoneos;
469472
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
470-
SWIFT_VERSION = 2.3;
473+
SWIFT_VERSION = 3.0;
471474
VALIDATE_PRODUCT = YES;
472475
};
473476
name = Release;
@@ -483,7 +486,7 @@
483486
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
484487
PRODUCT_BUNDLE_IDENTIFIER = com.polydice.ICInputAccessoryExample;
485488
PRODUCT_NAME = "$(TARGET_NAME)";
486-
SWIFT_VERSION = 2.3;
489+
SWIFT_VERSION = 3.0;
487490
TARGETED_DEVICE_FAMILY = "1,2";
488491
};
489492
name = Debug;
@@ -499,7 +502,8 @@
499502
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
500503
PRODUCT_BUNDLE_IDENTIFIER = com.polydice.ICInputAccessoryExample;
501504
PRODUCT_NAME = "$(TARGET_NAME)";
502-
SWIFT_VERSION = 2.3;
505+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
506+
SWIFT_VERSION = 3.0;
503507
TARGETED_DEVICE_FAMILY = "1,2";
504508
};
505509
name = Release;
File renamed without changes.
File renamed without changes.

Example/.swiftlint.yml

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

0 commit comments

Comments
 (0)