Skip to content

Commit

Permalink
Revert "Reverts the changes introduced with #57"
Browse files Browse the repository at this point in the history
  • Loading branch information
cjcolvar authored Mar 2, 2022
1 parent 71cad97 commit a071f61
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 17 deletions.
9 changes: 3 additions & 6 deletions bixby.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,10 @@ Gem::Specification.new do |spec|
spec.version = '3.0.2'
spec.license = 'Apache-2.0'

spec.required_ruby_version = '>= 2.4'
spec.required_ruby_version = '>= 2.6'

spec.add_dependency 'rubocop', '0.85.1'
# Added to prevent downstream breakage; When we update the above
# Rubocop version, we will want to revisit this dependency. Either
# changing the version range OR removing it.
spec.add_dependency 'rubocop-ast', '~> 0.3.0'
spec.add_dependency 'rubocop', '>= 1', '< 2'
spec.add_dependency 'rubocop-ast'
spec.add_dependency 'rubocop-performance'
spec.add_dependency 'rubocop-rails'
spec.add_dependency 'rubocop-rspec'
Expand Down
10 changes: 5 additions & 5 deletions bixby_default.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require: rubocop-performance

AllCops:
TargetRubyVersion: 2.4
TargetRubyVersion: 2.6
DisabledByDefault: true
DisplayCopNames: true
Exclude:
Expand Down Expand Up @@ -162,9 +162,6 @@ Style/MethodCallWithoutArgsParentheses:
Style/MethodDefParentheses:
Enabled: true

Style/MethodMissingSuper:
Enabled: true

Style/MissingRespondToMissing:
Enabled: true

Expand Down Expand Up @@ -726,6 +723,9 @@ Lint/LiteralInInterpolation:
Lint/Loop:
Enabled: true

Lint/MissingSuper:
Enabled: true

Lint/MultipleComparison:
Enabled: true

Expand Down Expand Up @@ -795,7 +795,7 @@ Lint/UselessAccessModifier:
Lint/UselessAssignment:
Enabled: true

Lint/UselessComparison:
Lint/BinaryOperatorWithIdenticalOperands:
Enabled: true

Lint/UselessElseWithoutRescue:
Expand Down
10 changes: 4 additions & 6 deletions bixby_rspec_enabled.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
---
require: rubocop-rspec

AllCops:
RSpec:
Patterns:
- _spec.rb
- "(?:^|/)spec/"
RSpec:
Include:
- _spec.rb
- "(?:^|/)spec/"

RSpec/AnyInstance:
Enabled: true
Expand All @@ -25,7 +24,6 @@ RSpec/DescribeMethod:

RSpec/EmptyExampleGroup:
Enabled: true
CustomIncludeMethods: []

RSpec/ExampleLength:
Enabled: true
Expand Down

0 comments on commit a071f61

Please sign in to comment.