From 17b47ecba95ff693466ec0f7a3f3ed225449a758 Mon Sep 17 00:00:00 2001
From: lindsey <lindsey@makers.tech>
Date: Tue, 18 Jun 2019 11:21:25 +0100
Subject: [PATCH] Upgrade ruby and rubocop

---
 .rubocop.yml  |  6 +++---
 .ruby-version |  2 +-
 Gemfile       |  2 +-
 Gemfile.lock  | 22 ++++++++++------------
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 1e461d2ebf..2eb2defc80 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -286,7 +286,7 @@ FirstMethodArgumentLineBreak:
   Enabled: false
 FirstMethodParameterLineBreak:
   Enabled: false
-FirstParameterIndentation:
+IndentFirstArgument:
   Enabled: false
 FlipFlop:
   Enabled: false
@@ -310,11 +310,11 @@ IfWithSemicolon:
   Enabled: false
 ImplicitRuntimeError:
   Enabled: false
-IndentArray:
+IndentFirstArrayElement:
   Enabled: false
 IndentAssignment:
   Enabled: false
-IndentHash:
+IndentFirstHashElement:
   Enabled: false
 IndentHeredoc:
   Enabled: false
diff --git a/.ruby-version b/.ruby-version
index 437459cd94..e70b4523ae 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.5.0
+2.6.0
diff --git a/Gemfile b/Gemfile
index 83b8f6d807..08c9584916 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'rake'
-gem 'rubocop', '0.60.0'
+gem 'rubocop', '0.71.0'
 
 group :test do
   gem 'rspec'
diff --git a/Gemfile.lock b/Gemfile.lock
index 626e1906b7..b34b0a0429 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,12 +6,11 @@ GEM
     diff-lcs (1.3)
     docile (1.1.5)
     hirb (0.7.3)
-    jaro_winkler (1.5.1)
+    jaro_winkler (1.5.3)
     json (2.1.0)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
-    powerpack (0.1.2)
     rainbow (3.0.0)
     rake (12.3.0)
     rspec (3.7.0)
@@ -27,15 +26,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
-    rubocop (0.60.0)
+    rubocop (0.71.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    ruby-progressbar (1.10.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -45,7 +43,7 @@ GEM
       hirb
       simplecov
     simplecov-html (0.10.2)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
@@ -53,9 +51,9 @@ PLATFORMS
 DEPENDENCIES
   rake
   rspec
-  rubocop (= 0.56.0)
+  rubocop (= 0.71.0)
   simplecov
   simplecov-console
 
 BUNDLED WITH
-   1.16.3
+   1.17.2