Skip to content

Commit

Permalink
Bump RuboCop to 0.74.0
Browse files Browse the repository at this point in the history
### Summary

RuboCop 0.74.0 has been released.
https://github.com/rubocop-hq/rubocop/releases/tag/v0.74.0

And rubocop-0-74 channel is available in Code Climate.
https://github.com/codeclimate/codeclimate/releases/tag/v0.85.5

This PR specifies the same RuboCop Performance (1.3.0) and RuboCop Rails (2.0.0)
versions as Code Climate's Gemfile.lock.
https://github.com/codeclimate/codeclimate-rubocop/blob/channel/rubocop-0-74/Gemfile.lock#L51-L55

Also, the `EnforcedStyle` of `Layout/IndentationConsistency` has been renamed
from `EnforcedStyle: rails` to `EnforcedStyle: indented_internal_methods`

- rubocop/rubocop#7113
- rubocop/rubocop#7163

And this commit disables `Layout/SpaceAroundOperators`
that was changed from RuboCop 0.74 by rubocop/rubocop#7211.

cf. rails#36943 (comment)
  • Loading branch information
koic committed Aug 15, 2019
1 parent 8ab4fd1 commit 1c66e04
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .codeclimate.yml
Expand Up @@ -25,6 +25,6 @@ checks:
plugins:
rubocop:
enabled: true
channel: rubocop-0-71
channel: rubocop-0-74

exclude_patterns: []
5 changes: 1 addition & 4 deletions .rubocop.yml
Expand Up @@ -91,7 +91,7 @@ Layout/IndentFirstArgument:
# extra level of indentation.
Layout/IndentationConsistency:
Enabled: true
EnforcedStyle: rails
EnforcedStyle: indented_internal_methods

# Two spaces, no tabs (for indentation).
Layout/IndentationWidth:
Expand All @@ -115,9 +115,6 @@ Layout/SpaceAroundEqualsInParameterDefault:
Layout/SpaceAroundKeyword:
Enabled: true

Layout/SpaceAroundOperators:
Enabled: true

Layout/SpaceBeforeComma:
Enabled: true

Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock
Expand Up @@ -281,8 +281,8 @@ GEM
image_processing (1.7.1)
mini_magick (~> 4.0)
ruby-vips (>= 2.0.13, < 3)
jaro_winkler (1.5.2)
jaro_winkler (1.5.2-java)
jaro_winkler (1.5.3)
jaro_winkler (1.5.3-java)
jdbc-mysql (5.1.46)
jdbc-postgres (42.1.4)
jdbc-sqlite3 (3.20.1)
Expand Down Expand Up @@ -407,15 +407,15 @@ GEM
resque (>= 1.26)
rufus-scheduler (~> 3.2)
retriable (3.1.2)
rubocop (0.71.0)
rubocop (0.74.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-performance (1.1.0)
rubocop (>= 0.67.0)
rubocop-performance (1.3.0)
rubocop (>= 0.68.0)
rubocop-rails (2.0.0)
rack (>= 2.0)
rubocop (>= 0.70.0)
Expand Down

0 comments on commit 1c66e04

Please sign in to comment.