From 6982593afc254e528e8f7f8499afd546a8708114 Mon Sep 17 00:00:00 2001
From: jrgriffiniii <jrg5@princeton.edu>
Date: Thu, 24 Feb 2022 15:42:23 -0500
Subject: [PATCH] Reverts the changes introduced with
 https://github.com/samvera-labs/bixby/pull/57

---
 bixby.gemspec           |  9 ++++++---
 bixby_default.yml       | 10 +++++-----
 bixby_rspec_enabled.yml | 10 ++++++----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/bixby.gemspec b/bixby.gemspec
index ed92a70..62d86c0 100644
--- a/bixby.gemspec
+++ b/bixby.gemspec
@@ -15,10 +15,13 @@ Gem::Specification.new do |spec|
   spec.version       = '3.0.2'
   spec.license       = 'Apache-2.0'
 
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 2.4'
 
-  spec.add_dependency 'rubocop', '>= 1', '< 2'
-  spec.add_dependency 'rubocop-ast'
+  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-performance'
   spec.add_dependency 'rubocop-rails'
   spec.add_dependency 'rubocop-rspec'
diff --git a/bixby_default.yml b/bixby_default.yml
index 80a2a06..4c8c54b 100644
--- a/bixby_default.yml
+++ b/bixby_default.yml
@@ -1,7 +1,7 @@
 require: rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.4
   DisabledByDefault: true
   DisplayCopNames: true
   Exclude:
@@ -162,6 +162,9 @@ Style/MethodCallWithoutArgsParentheses:
 Style/MethodDefParentheses:
   Enabled: true
 
+Style/MethodMissingSuper:
+  Enabled: true
+
 Style/MissingRespondToMissing:
   Enabled: true
 
@@ -723,9 +726,6 @@ Lint/LiteralInInterpolation:
 Lint/Loop:
   Enabled: true
 
-Lint/MissingSuper:
-  Enabled: true
-
 Lint/MultipleComparison:
   Enabled: true
 
@@ -795,7 +795,7 @@ Lint/UselessAccessModifier:
 Lint/UselessAssignment:
   Enabled: true
 
-Lint/BinaryOperatorWithIdenticalOperands:
+Lint/UselessComparison:
   Enabled: true
 
 Lint/UselessElseWithoutRescue:
diff --git a/bixby_rspec_enabled.yml b/bixby_rspec_enabled.yml
index e82d851..1ec4237 100644
--- a/bixby_rspec_enabled.yml
+++ b/bixby_rspec_enabled.yml
@@ -1,10 +1,11 @@
 ---
 require: rubocop-rspec
 
-RSpec:
-  Include:
-    - _spec.rb
-    - "(?:^|/)spec/"
+AllCops:
+  RSpec:
+    Patterns:
+      - _spec.rb
+      - "(?:^|/)spec/"
 
 RSpec/AnyInstance:
   Enabled: true
@@ -24,6 +25,7 @@ RSpec/DescribeMethod:
 
 RSpec/EmptyExampleGroup:
   Enabled: true
+  CustomIncludeMethods: []
 
 RSpec/ExampleLength:
   Enabled: true