From 2de1f901e66f9dd313ac642d601865e329a23897 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Wed, 16 Sep 2020 14:13:54 +0200 Subject: [PATCH] Fix rubocop at hound supported version --- .hound.yml | 2 +- .rubocop.yml | 1 + Gemfile | 2 +- Gemfile.lock | 22 +++++++++++----------- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.hound.yml b/.hound.yml index 38500c3c7..655c2729f 100644 --- a/.hound.yml +++ b/.hound.yml @@ -1,6 +1,6 @@ ruby: config_file: .rubocop.yml - version: 0.75.0 + version: 0.83.0 eslint: enabled: true diff --git a/.rubocop.yml b/.rubocop.yml index 629a3d4aa..4d61db2bb 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -6,6 +6,7 @@ AllCops: Exclude: - "vendor/**/*" - "db/schema.rb" + NewCops: enable UseCache: false TargetRubyVersion: 2.6 diff --git a/Gemfile b/Gemfile index d3a99ea73..445748651 100644 --- a/Gemfile +++ b/Gemfile @@ -124,7 +124,7 @@ group :development, :test do gem 'pry-rails' gem 'rails-controller-testing' gem 'rspec-rails', '>= 4.0.0.beta2' - gem 'rubocop', '>= 0.75.0', require: false + gem 'rubocop', '= 0.83.0', require: false gem 'rubocop-performance' gem 'rubocop-rails' gem 'timecop' diff --git a/Gemfile.lock b/Gemfile.lock index faf79f603..46b0401f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -110,7 +110,7 @@ GEM ajax-datatables-rails (0.3.1) railties (>= 3.1) aspector (0.14.0) - ast (2.4.0) + ast (2.4.1) auto_strip_attributes (2.5.0) activerecord (>= 4.0) autoprefixer-rails (9.7.0) @@ -288,7 +288,6 @@ GEM mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.13, < 3) iniparse (1.4.4) - jaro_winkler (1.5.4) jbuilder (2.9.1) activesupport (>= 4.2.0) jmespath (1.4.0) @@ -388,9 +387,9 @@ GEM overcommit (0.49.1) childprocess (>= 0.6.3, < 2.0) iniparse (~> 1.4) - parallel (1.19.1) - parser (2.6.5.0) - ast (~> 2.4.0) + parallel (1.19.2) + parser (2.7.1.4) + ast (~> 2.4.1) pg (1.1.4) pg_search (2.3.0) activerecord (>= 4.2) @@ -464,6 +463,7 @@ GEM responders (3.0.0) actionpack (>= 5.0) railties (>= 5.0) + rexml (3.2.4) rgl (0.5.6) lazy_priority_queue (~> 0.1.0) stream (~> 0.5.2) @@ -493,13 +493,13 @@ GEM rspec-mocks (~> 3.8) rspec-support (~> 3.8) rspec-support (3.8.2) - rubocop (0.78.0) - jaro_winkler (~> 1.5.1) + rubocop (0.83.0) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + rexml ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) + unicode-display_width (>= 1.4.0, < 2.0) rubocop-performance (1.5.1) rubocop (>= 0.71.0) rubocop-rails (2.4.0) @@ -570,7 +570,7 @@ GEM uglifier (4.2.0) execjs (>= 0.3.0, < 3) underscore-rails (1.8.3) - unicode-display_width (1.6.0) + unicode-display_width (1.7.0) uniform_notifier (1.12.1) warden (1.2.8) rack (>= 2.0.6) @@ -678,7 +678,7 @@ DEPENDENCIES rotp rqrcode rspec-rails (>= 4.0.0.beta2) - rubocop (>= 0.75.0) + rubocop (= 0.83.0) rubocop-performance rubocop-rails ruby-graphviz (~> 1.2)