Skip to content

Commit 749d277

Browse files
committed
Merge branch 'feature/swift-lint' into develop
2 parents b9dfe79 + a15abdd commit 749d277

File tree

6 files changed

+37
-2
lines changed

6 files changed

+37
-2
lines changed

.swiftlint.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
disabled_rules:
2+
- line_length
3+
excluded:
4+
- Carthage
5+
- Pods

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ cache:
1212
before_install:
1313
- export LANG=en_US.UTF-8
1414
install:
15-
- bundle install --without development --deployment --jobs=3 --retry=3
16-
- bundle exec pod install --no-repo-update
15+
- make install
1716
script:
1817
- xcodebuild -project ICInputAccessory.xcodeproj -scheme ICInputAccessory-iOS -sdk iphonesimulator -destination "name=iPhone 6,OS=$VERSION" clean build | xcpretty -c
1918
- xcodebuild -workspace ICInputAccessory.xcworkspace -scheme Example -sdk iphonesimulator -destination "name=iPhone 6,OS=$VERSION" clean test | xcpretty -c

Brewfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
brew "swiftlint"
2+
brew "xcproj"

Example/.swiftlint.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
disabled_rules:
2+
- line_length
3+
included:
4+
- ../Source

Example/Example.xcodeproj/project.pbxproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@
154154
B5E9F8F91C8D3B6E00443DC7 /* Resources */,
155155
CAB3B20531AAE2438C48D751 /* Embed Pods Frameworks */,
156156
7B2FB96C7361D5883F3ADD14 /* Copy Pods Resources */,
157+
B5C50ADD1C917F4A0059032B /* Swift Lint */,
157158
);
158159
buildRules = (
159160
);
@@ -253,6 +254,20 @@
253254
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";
254255
showEnvVarsInLog = 0;
255256
};
257+
B5C50ADD1C917F4A0059032B /* Swift Lint */ = {
258+
isa = PBXShellScriptBuildPhase;
259+
buildActionMask = 2147483647;
260+
files = (
261+
);
262+
inputPaths = (
263+
);
264+
name = "Swift Lint";
265+
outputPaths = (
266+
);
267+
runOnlyForDeploymentPostprocessing = 0;
268+
shellPath = /bin/sh;
269+
shellScript = "if which swiftlint >/dev/null; then swiftlint; fi";
270+
};
256271
CAB3B20531AAE2438C48D751 /* Embed Pods Frameworks */ = {
257272
isa = PBXShellScriptBuildPhase;
258273
buildActionMask = 2147483647;
@@ -460,6 +475,7 @@
460475
B548C5CA1C8E91B0009D5AEE /* Release */,
461476
);
462477
defaultConfigurationIsVisible = 0;
478+
defaultConfigurationName = Release;
463479
};
464480
B5E9F8F61C8D3B6E00443DC7 /* Build configuration list for PBXProject "Example" */ = {
465481
isa = XCConfigurationList;

Makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
1+
install: brew-install bundle-install pod-install
2+
3+
brew-install:
4+
brew tap homebrew/bundle
5+
brew bundle
6+
7+
bundle-install:
8+
bundle install --without development --deployment --jobs=3 --retry=3
9+
110
pod-install:
211
bundle exec pod install --no-repo-update

0 commit comments

Comments
 (0)