Skip to content

Commit

Permalink
Update rubocop to 0.93.1 (#2754)
Browse files Browse the repository at this point in the history
Fixes version to avoid sudden CI failures.

Removed Style/BracesAroundHashParameters cop. See:
rubocop/rubocop#7641
  • Loading branch information
aried3r committed Oct 13, 2020
1 parent f8d3a19 commit d2cb1f4
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 26 deletions.
25 changes: 10 additions & 15 deletions .rubocop.yml
Expand Up @@ -5,19 +5,14 @@ AllCops:
# to ignore them, so only the ones explicitly set in this file are enabled.
DisabledByDefault: true
Exclude:
- 'lib/install/templates/**'
- 'vendor/**/*'
- 'node_modules/**/*'
- "lib/install/templates/**"
- "vendor/**/*"
- "node_modules/**/*"

# Prefer &&/|| over and/or.
Style/AndOr:
Enabled: true

# Do not use braces for hash literals when they are the last argument of a
# method call.
Style/BracesAroundHashParameters:
Enabled: true

# Align `when` with `case`.
Layout/CaseIndentation:
Enabled: true
Expand Down Expand Up @@ -50,7 +45,11 @@ Style/HashSyntax:
# extra level of indentation.
Layout/IndentationConsistency:
Enabled: true
EnforcedStyle: rails
EnforcedStyle: indented_internal_methods

# Detect hard tabs, no hard tabs.
Layout/IndentationStyle:
Enabled: true

# Two spaces, no tabs (for indentation).
Layout/IndentationWidth:
Expand Down Expand Up @@ -98,20 +97,16 @@ Style/StringLiterals:
Enabled: true
EnforcedStyle: double_quotes

# Detect hard tabs, no hard tabs.
Layout/Tab:
Enabled: true

# Blank lines should not have any spaces.
Layout/TrailingBlankLines:
Layout/TrailingEmptyLines:
Enabled: true

# No trailing whitespace.
Layout/TrailingWhitespace:
Enabled: true

# Use quotes for string literals when they are enough.
Style/UnneededPercentQ:
Style/RedundantPercentQ:
Enabled: true

# Align `end` with the matching keyword or starting expression except for
Expand Down
26 changes: 16 additions & 10 deletions Gemfile.lock
Expand Up @@ -75,7 +75,6 @@ GEM
activesupport (>= 4.2.0)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
loofah (2.6.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
Expand All @@ -92,7 +91,7 @@ GEM
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
parallel (1.19.2)
parser (2.7.1.4)
parser (2.7.2.0)
ast (~> 2.4.1)
rack (2.2.3)
rack-proxy (0.6.5)
Expand Down Expand Up @@ -127,15 +126,22 @@ GEM
thor (>= 0.20.3, < 2.0)
rainbow (3.0.0)
rake (13.0.1)
rubocop (0.68.1)
jaro_winkler (~> 1.5.1)
regexp_parser (1.8.2)
rexml (3.2.4)
rubocop (0.93.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8)
rexml
rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.6)
rubocop-performance (1.3.0)
rubocop (>= 0.68.0)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.8.0)
parser (>= 2.7.1.5)
rubocop-performance (1.8.1)
rubocop (>= 0.87.0)
rubocop-ast (>= 0.4.0)
ruby-progressbar (1.10.1)
semantic_range (2.3.0)
sprockets (4.0.2)
Expand All @@ -149,7 +155,7 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.7)
thread_safe (~> 0.1)
unicode-display_width (1.5.0)
unicode-display_width (1.7.0)
websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand All @@ -165,7 +171,7 @@ DEPENDENCIES
rack-proxy
rails
rake (>= 11.1)
rubocop (< 0.69)
rubocop (= 0.93.1)
rubocop-performance
semantic_range
webpacker!
Expand Down
2 changes: 1 addition & 1 deletion webpacker.gemspec
Expand Up @@ -23,7 +23,7 @@ Gem::Specification.new do |s|
s.add_dependency "semantic_range", ">= 2.3.0"

s.add_development_dependency "bundler", ">= 1.3.0"
s.add_development_dependency "rubocop", "< 0.69"
s.add_development_dependency "rubocop", "0.93.1"
s.add_development_dependency "rubocop-performance"

s.files = `git ls-files`.split("\n")
Expand Down

0 comments on commit d2cb1f4

Please sign in to comment.