Skip to content

Commit ed56c26

Browse files
committedJul 7, 2016
Adds swiftlint support
·
6.0.03.1.4
1 parent f262eee commit ed56c26

File tree

15 files changed

+103
-61
lines changed

15 files changed

+103
-61
lines changed
 

‎.bundle/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
---
2-
BUNDLE_PATH: "./.vendor/bundle"
2+
BUNDLE_PATH: ".vendor/bundle"
33
BUNDLE_DISABLE_SHARED_GEMS: true

‎.slather.yml

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

‎.swiftlint.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
disabled_rules:
2+
- line_length
3+
- type_name
4+
- valid_docs
5+
- trailing_newline
6+
- trailing_whitespace
7+
8+
opt_in_rules:
9+
- empty_count
10+
- force_unwrapping
11+
12+
included:
13+
- Pod/Classes
14+
15+
excluded:
16+
- Example
17+
18+
function_body_length:
19+
warning: 50

‎.travis.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
language: objective-c
22
osx_image: xcode7.3
3+
cache:
4+
directories:
5+
- $HOME/.cocoapods/repos
36
rvm:
47
- "2.3.1"
58

6-
#before_install:
7-
# - rm -rf Example/Podfile.lock
8-
# - rm -rf Example/Pods
9-
# - rm -rf _Pods.xcodeproj
10-
# - rm -rf Example/RxViewModel.xcworkspace
9+
before_install:
10+
- brew install swiftlint
1111

1212
install:
1313
- make bootstrap
@@ -42,5 +42,4 @@ script:
4242
- bundle exec danger
4343

4444
after_success:
45-
- bundle exec slather
46-
- bash <(curl -s https://codecov.io/bash) -J RxViewModel
45+
- bash <(curl -s https://codecov.io/bash)

‎CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Change Log
22

3+
## [Unreleased](https://github.com/RxSwiftCommunity/RxViewModel/tree/HEAD)
4+
5+
[Full Changelog](https://github.com/RxSwiftCommunity/RxViewModel/compare/3.1.3...HEAD)
6+
7+
**Implemented enhancements:**
8+
9+
- Fix the CI [\#28](https://github.com/RxSwiftCommunity/RxViewModel/issues/28)
10+
- Configured Danger [\#34](https://github.com/RxSwiftCommunity/RxViewModel/pull/34) ([esttorhe](https://github.com/esttorhe))
11+
12+
**Fixed bugs:**
13+
14+
- RxViewModel is depending on an old version of RxCocoa [\#29](https://github.com/RxSwiftCommunity/RxViewModel/issues/29)
15+
316
## [3.1.3](https://github.com/RxSwiftCommunity/RxViewModel/tree/3.1.3) (2016-06-06)
417
[Full Changelog](https://github.com/RxSwiftCommunity/RxViewModel/compare/3.1.2...3.1.3)
518

‎Dangerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ fail("Please provide a summary in the Pull Request description", sticky: true) i
2222

2323
# Warn when there is a big PR
2424
warn("Big PR") if lines_of_code > 500
25+
26+
# Run SwiftLint
27+
swiftlint.lint_files

‎Example/Podfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ source 'https://github.com/CocoaPods/Specs.git'
22
use_frameworks!
33
inhibit_all_warnings!
44

5-
plugin 'slather'
6-
75
target :RxViewModel_Tests do
86
pod "RxViewModel", :path => "../"
97
pod 'Nimble'

‎Example/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ SPEC CHECKSUMS:
2020
RxSwift: 402b41a50e922a0368fc14cb3bc9f4427920e8ae
2121
RxViewModel: d2a8f05c008b932131f590f34f4afba4b0948f9a
2222

23-
PODFILE CHECKSUM: 036e4a3dfee9075c82e5ca3270ae8a607ef2b2b5
23+
PODFILE CHECKSUM: 0c182fccc72125b90a6c5ddd69a67e8026fd0fd3
2424

2525
COCOAPODS: 1.0.1

‎Example/Pods/Manifest.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Pods.xcodeproj/project.pbxproj

Lines changed: 18 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ gem 'synx'
1919
# requests.
2020
gem 'github_changelog_generator'
2121

22-
# Test coverage reports for Xcode projects
23-
gem 'slather'
24-
2522
# xcodebuild formatter done right
2623
gem 'xcpretty'
2724

2825
# Automate your PR etiquette.
2926
gem 'danger', '~> 0.8.5'
3027

28+
# A Danger plugin for linting Swift with SwiftLint.
29+
gem 'danger-swiftlint'
30+
3131
# A toolkit of support libraries and Ruby core extensions extracted from the Rails
3232
# framework.
3333
gem 'activesupport'

0 commit comments

Comments
 (0)
Please sign in to comment.