From 11b814e8da3716cda2fe8fdd143db1d1843d4c18 Mon Sep 17 00:00:00 2001
From: Brian Hawley <brian.hawley@deluxe.com>
Date: Tue, 6 Jul 2021 13:15:54 -0700
Subject: [PATCH] Make channel 1-12-1 (mostly) Ruby 2.4 compatible

- Update plugins to the last Ruby 2.4 compatible versions.
- Be specific about the versions in Gemfile, so bundle update works.
- Do the bundle update.
- Don't downgrade ruby-i18n and ruby-graphql; the listed versions are
  not compatible with Ruby 2.4, so don't use them if using Ruby 2.4.

[Fixes #272, #291, #293]
---
 Gemfile      | 10 +++----
 Gemfile.lock | 83 ++++++++++++++++++++++++++--------------------------
 2 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/Gemfile b/Gemfile
index 621c12af..c23c9f61 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,11 +9,11 @@ gem "pry", require: false
 gem "rubocop", "1.12.1", require: false
 gem "rubocop-i18n", require: false
 gem "rubocop-graphql", require: false
-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-minitest", "0.11.1", require: false
+gem "rubocop-performance", "1.10.2", require: false
+gem "rubocop-rails", "2.9.1", require: false
+gem "rubocop-rake", "0.5.1", require: false
+gem "rubocop-rspec", "2.2.0", require: false
 gem "rubocop-sequel", require: false
 gem "rubocop-sorbet", require: false
 gem "rubocop-thread_safety", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 6edb9f16..d980cd9f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,46 +1,46 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.2)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    i18n (1.8.3)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    minitest (5.14.1)
+    minitest (5.14.4)
     mry (0.78.0.0)
       rubocop (>= 0.41.0)
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rack (2.2.3)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.4)
     regexp_parser (2.1.1)
     rexml (3.2.5)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     rubocop (1.12.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
@@ -56,32 +56,33 @@ GEM
       rubocop (>= 0.87, < 2)
     rubocop-i18n (3.0.0)
       rubocop (~> 1.0)
-    rubocop-minitest (0.9.0)
-      rubocop (>= 0.74)
-    rubocop-performance (1.7.0)
-      rubocop (>= 0.82.0)
+    rubocop-minitest (0.11.1)
+      rubocop (>= 0.90, < 2.0)
+    rubocop-performance (1.10.2)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
     rubocop-rails (2.9.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 0.90.0, < 2.0)
     rubocop-rake (0.5.1)
       rubocop
-    rubocop-rspec (1.41.0)
-      rubocop (>= 0.68.1)
-    rubocop-sequel (0.1.0)
+    rubocop-rspec (2.2.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    rubocop-sequel (0.2.0)
       rubocop (~> 1.0)
-    rubocop-sorbet (0.5.1)
+    rubocop-sorbet (0.6.2)
       rubocop
-    rubocop-thread_safety (0.4.1)
-      rubocop (>= 0.51.0)
+    rubocop-thread_safety (0.4.2)
+      rubocop (>= 0.53.0)
     ruby-progressbar (1.11.0)
     safe_yaml (1.0.5)
-    test-prof (0.11.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    test-prof (1.0.6)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.0.0)
-    zeitwerk (2.3.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -96,11 +97,11 @@ DEPENDENCIES
   rubocop (= 1.12.1)
   rubocop-graphql
   rubocop-i18n
-  rubocop-minitest
-  rubocop-performance
-  rubocop-rails
-  rubocop-rake
-  rubocop-rspec
+  rubocop-minitest (= 0.11.1)
+  rubocop-performance (= 1.10.2)
+  rubocop-rails (= 2.9.1)
+  rubocop-rake (= 0.5.1)
+  rubocop-rspec (= 2.2.0)
   rubocop-sequel
   rubocop-sorbet
   rubocop-thread_safety