Merge branch 'main' into fix_branch_name_in_readme

bixby.gemspec

@@ -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.5'
 
-  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'

bixby_default.yml

@@ -1,7 +1,7 @@
 require: rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   DisabledByDefault: true
   DisplayCopNames: true
   Exclude:
@@ -162,9 +162,6 @@ Style/MethodCallWithoutArgsParentheses:
 Style/MethodDefParentheses:
   Enabled: true
 
-Style/MethodMissingSuper:
-  Enabled: true
-
 Style/MissingRespondToMissing:
   Enabled: true
 
@@ -606,12 +603,13 @@ Naming/VariableName:
 
 Naming/VariableNumber:
   Enabled: true
+  CheckSymbols: false
 
 #################### Metrics ###############################
 
 Metrics/AbcSize:
   Enabled: true
-  Max: 28
+  Max: 32
 
 Metrics/BlockNesting:
   Enabled: true
@@ -626,6 +624,7 @@ Metrics/ModuleLength:
 
 Metrics/CyclomaticComplexity:
   Enabled: true
+  Max: 10
 
 Metrics/MethodLength:
   Enabled: true
@@ -643,6 +642,7 @@ Metrics/ParameterLists:
 
 Metrics/PerceivedComplexity:
   Enabled: true
+  Max: 11
 
 #################### Lint ##################################
 ### Warnings
@@ -726,6 +726,9 @@ Lint/LiteralInInterpolation:
 Lint/Loop:
   Enabled: true
 
+Lint/MissingSuper:
+  Enabled: true
+
 Lint/MultipleComparison:
   Enabled: true
 
@@ -795,7 +798,7 @@ Lint/UselessAccessModifier:
 Lint/UselessAssignment:
   Enabled: true
 
-Lint/UselessComparison:
+Lint/BinaryOperatorWithIdenticalOperands:
   Enabled: true
 
 Lint/UselessElseWithoutRescue:

bixby_rspec_enabled.yml

@@ -1,11 +1,10 @@
 ---
 require: rubocop-rspec
 
-AllCops:
-  RSpec:
-    Patterns:
-      - _spec.rb
-      - "(?:^|/)spec/"
+RSpec:
+  Include:
+    - _spec.rb
+    - "(?:^|/)spec/"
 
 RSpec/AnyInstance:
   Enabled: true
@@ -25,7 +24,6 @@ RSpec/DescribeMethod:
 
 RSpec/EmptyExampleGroup:
   Enabled: true
-  CustomIncludeMethods: []
 
 RSpec/ExampleLength:
   Enabled: true