From 6ff0d38b63e9942e7090565e887f325b5a895726 Mon Sep 17 00:00:00 2001
From: Daniel Wright <dan.wright@gmail.com>
Date: Tue, 24 Nov 2020 11:19:07 -0800
Subject: [PATCH] Support for Rubocop 1.4.1

In order to support the 1.x versions of Rubocop, three additional dependencies also require upgrades:

- rubocop-sequel, the update to which is already complete and released;
- rubocop-i18n, the update to which is in-flight (see puppetlabs/rubocop-i18n#46)
- rubocop-migrations, the update to which is in-flight (see redbooth/rubocop-migrations#3)

The commit here will pass CI, but the in-flight PRs should be merged and released to RubyGems before merging this PR.
---
 Gemfile      | 10 ++++++----
 Gemfile.lock | 46 +++++++++++++++++++++++++++++-----------------
 2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9f2ee8db..0a7be8d3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,15 +6,17 @@ gem "activesupport", require: false
 gem "mry", require: false
 gem "parser"
 gem "pry", require: false
-gem "rubocop", "0.92.0", require: false
-gem "rubocop-i18n", require: false
-gem "rubocop-migrations", require: false
+gem "rubocop", "1.4.1", require: false
+gem "rubocop-i18n", require: false,
+  github: "mvz/rubocop-i18n", ref: "5e824a47a88732830a8b60e46697bbb0a2795c19"
+gem "rubocop-migrations", require: false,
+  github: "DanielWright/rubocop-migrations", branch: "dw/nov24/rubocop-1.x-support"
 gem "rubocop-minitest", require: false
 gem "rubocop-performance", require: false
 gem "rubocop-rails", require: false
 gem "rubocop-rake", require: false
 gem "rubocop-rspec", require: false
-gem "rubocop-sequel", require: false
+gem "rubocop-sequel", "0.1.0", require: false
 gem 'rubocop-sorbet', require: false
 gem "rubocop-thread_safety", require: false
 gem "safe_yaml"
diff --git a/Gemfile.lock b/Gemfile.lock
index e5e11d78..f8f71945 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,19 @@
+GIT
+  remote: https://github.com/DanielWright/rubocop-migrations.git
+  revision: a4cb61a86a272b57e7fb3dcda238519c39f2ac70
+  branch: dw/nov24/rubocop-1.x-support
+  specs:
+    rubocop-migrations (0.1.2)
+      rubocop (~> 1.0)
+
+GIT
+  remote: https://github.com/mvz/rubocop-i18n.git
+  revision: 5e824a47a88732830a8b60e46697bbb0a2795c19
+  ref: 5e824a47a88732830a8b60e46697bbb0a2795c19
+  specs:
+    rubocop-i18n (2.0.2)
+      rubocop (~> 1.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -17,8 +33,8 @@ GEM
     minitest (5.14.1)
     mry (0.78.0.0)
       rubocop (>= 0.41.0)
-    parallel (1.19.2)
-    parser (2.7.1.5)
+    parallel (1.20.1)
+    parser (2.7.2.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -26,7 +42,7 @@ GEM
     rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.8.1)
+    regexp_parser (1.8.2)
     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -41,21 +57,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.92.0)
+    rubocop (1.4.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.5.0)
+      rubocop-ast (>= 1.1.1)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.7.1)
+    rubocop-ast (1.1.1)
       parser (>= 2.7.1.5)
-    rubocop-i18n (2.0.2)
-      rubocop (~> 0.51)
-    rubocop-migrations (0.1.2)
-      rubocop (~> 0.41)
     rubocop-minitest (0.9.0)
       rubocop (>= 0.74)
     rubocop-performance (1.7.0)
@@ -68,8 +80,8 @@ GEM
       rubocop
     rubocop-rspec (1.41.0)
       rubocop (>= 0.68.1)
-    rubocop-sequel (0.0.6)
-      rubocop (~> 0.55, >= 0.55)
+    rubocop-sequel (0.1.0)
+      rubocop (~> 1.0)
     rubocop-sorbet (0.5.1)
       rubocop
     rubocop-thread_safety (0.4.1)
@@ -93,15 +105,15 @@ DEPENDENCIES
   pry
   rake
   rspec
-  rubocop (= 0.92.0)
-  rubocop-i18n
-  rubocop-migrations
+  rubocop (= 1.4.1)
+  rubocop-i18n!
+  rubocop-migrations!
   rubocop-minitest
   rubocop-performance
   rubocop-rails
   rubocop-rake
   rubocop-rspec
-  rubocop-sequel
+  rubocop-sequel (= 0.1.0)
   rubocop-sorbet
   rubocop-thread_safety
   safe_yaml