From 02d5faa4adfaf649bf43bb65621afaa2d22f1272 Mon Sep 17 00:00:00 2001
From: Andrew Watts <ahwatts@gmail.com>
Date: Tue, 2 Feb 2021 15:33:03 -0500
Subject: [PATCH] Rubocop changes.

---
 .rubocop.yml      | 11 +++++++----
 .rubocop_todo.yml |  4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index d41d8d923..daa174333 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.0
+  TargetRubyVersion: 2.7
 
   DisplayCopNames: true
   Exclude:
@@ -12,16 +12,19 @@ AllCops:
 Layout/CaseIndentation:
   EnforcedStyle: end
 
-Layout/IndentHash:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
-Lint/EndAlignment:
+Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
 
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: consistent_comma
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma
 
 Style/TrivialAccessors:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4117fa862..71a486d39 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -10,7 +10,7 @@
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Exclude:
     - 'support/ruby_enc_to_mysql.rb'
     - 'tasks/compile.rake'
@@ -41,7 +41,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 313
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
+Layout/LineLength:
   Max: 232
 
 # Offense count: 6