From 8ebcf040075c40c77cb250f4e51bcc3bfe9fd232 Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Sat, 24 Apr 2021 19:36:51 +0200 Subject: [PATCH] Move RuboCop dependencies to Gemfile Speed up CI specs by moving RuboCop to an independent build. This will also prevent issues when RuboCop will drop EOL rubies. For the moment, this change is enough to keep supporting Ruby 2.4 Ref: rubocop/rubocop#9648 --- .travis.yml | 7 ++++++- Gemfile | 6 ++++++ client_side_validations.gemspec | 5 ----- gemfiles/rails_5.0.gemfile | 5 +++++ gemfiles/rails_5.1.gemfile | 5 +++++ gemfiles/rails_5.2.gemfile | 5 +++++ gemfiles/rails_6.0.gemfile | 5 +++++ gemfiles/rails_6.1.gemfile | 5 +++++ gemfiles/rails_edge.gemfile | 5 +++++ 9 files changed, 42 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b0c60311..662952baa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,11 @@ jobs: # TODO: Remove when 6.0 stable will ship rails/rails#39697 - rvm: 3.0.1 gemfile: gemfiles/rails_6.0.gemfile + include: + - rvm: 2.4.10 + gemfile: Gemfile + script: bundle exec rake rubocop + name: RuboCop exclude: - rvm: 2.4.10 gemfile: gemfiles/rails_6.1.gemfile @@ -74,4 +79,4 @@ jobs: gemfile: gemfiles/rails_5.2.gemfile fast_finish: true -script: bundle exec rake test:all +script: bundle exec rake test:ruby test:js diff --git a/Gemfile b/Gemfile index aa3d23e41..3ebf22dc3 100644 --- a/Gemfile +++ b/Gemfile @@ -4,3 +4,9 @@ source 'https://rubygems.org' # Specify your gem's dependencies in client_side_validations.gemspec gemspec + +gem 'rubocop', '~> 1.12.1' +gem 'rubocop-minitest', '~> 0.11.1' +gem 'rubocop-performance', '~> 1.10.2' +gem 'rubocop-rails', '~> 2.9' +gem 'rubocop-rake', '~> 0.5.1' diff --git a/client_side_validations.gemspec b/client_side_validations.gemspec index 298ffd127..91b304934 100644 --- a/client_side_validations.gemspec +++ b/client_side_validations.gemspec @@ -36,11 +36,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest', '~> 5.14' spec.add_development_dependency 'mocha', '~> 1.12' spec.add_development_dependency 'rake', '~> 13.0' - spec.add_development_dependency 'rubocop', '~> 1.12' - spec.add_development_dependency 'rubocop-minitest', '~> 0.11.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.10' - spec.add_development_dependency 'rubocop-rails', '~> 2.9' - spec.add_development_dependency 'rubocop-rake', '~> 0.5.1' spec.add_development_dependency 'simplecov', '>= 0.18.5', '< 0.22' spec.add_development_dependency 'sqlite3', '~> 1.4' diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile index 9a09015dd..ea56652b5 100644 --- a/gemfiles/rails_5.0.gemfile +++ b/gemfiles/rails_5.0.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "rubocop", "~> 1.12.1" +gem "rubocop-minitest", "~> 0.11.1" +gem "rubocop-performance", "~> 1.10.2" +gem "rubocop-rails", "~> 2.9" +gem "rubocop-rake", "~> 0.5.1" gem "rails", "~> 5.0.0" gem "sqlite3", "~> 1.3.6" diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index 1edc9a139..40a38f3bd 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "rubocop", "~> 1.12.1" +gem "rubocop-minitest", "~> 0.11.1" +gem "rubocop-performance", "~> 1.10.2" +gem "rubocop-rails", "~> 2.9" +gem "rubocop-rake", "~> 0.5.1" gem "rails", "~> 5.1.0" gem "sqlite3", "~> 1.3.6" diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index 5a706dcb6..de8caedaa 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "rubocop", "~> 1.12.1" +gem "rubocop-minitest", "~> 0.11.1" +gem "rubocop-performance", "~> 1.10.2" +gem "rubocop-rails", "~> 2.9" +gem "rubocop-rake", "~> 0.5.1" gem "rails", "~> 5.2.0" gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index 15b9b275d..50ac511ef 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "rubocop", "~> 1.12.1" +gem "rubocop-minitest", "~> 0.11.1" +gem "rubocop-performance", "~> 1.10.2" +gem "rubocop-rails", "~> 2.9" +gem "rubocop-rake", "~> 0.5.1" gem "rails", "~> 6.0.0" gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 7e95520a3..8b638dd61 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "rubocop", "~> 1.12.1" +gem "rubocop-minitest", "~> 0.11.1" +gem "rubocop-performance", "~> 1.10.2" +gem "rubocop-rails", "~> 2.9" +gem "rubocop-rake", "~> 0.5.1" gem "rails", "~> 6.1.0.rc1" gemspec path: "../" diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile index 5d00b316a..bdfe55599 100644 --- a/gemfiles/rails_edge.gemfile +++ b/gemfiles/rails_edge.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "rubocop", "~> 1.12.1" +gem "rubocop-minitest", "~> 0.11.1" +gem "rubocop-performance", "~> 1.10.2" +gem "rubocop-rails", "~> 2.9" +gem "rubocop-rake", "~> 0.5.1" gem "rails", git: "https://github.com/rails/rails.git", branch: "main" gemspec path: "../"