Fix Travis CI build

Ref: rubocop/rubocop#9648
DavyJonesLocker · Apr 25, 2021 · 7e1f350 · 7e1f350
1 parent e3a4514
commit 7e1f350
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,10 +4,10 @@ language: ruby
 
 rvm:
   - 2.4.10
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-  - 3.0.0
+  - 2.5.9
+  - 2.6.7
+  - 2.7.3
+  - 3.0.1
   - ruby-head
 
 addons:
@@ -39,15 +39,20 @@ jobs:
   allow_failures:
     - rvm: ruby-head
     - gemfile: gemfiles/csv_edge.gemfile
+  include:
+    - rvm: 2.4.10
+      gemfile: Gemfile
+      script: bundle exec rake rubocop
+      name: RuboCop
   exclude:
-    - rvm: 3.0.0
+    - rvm: 3.0.1
       gemfile: gemfiles/csv_15.0.gemfile
-    - rvm: 3.0.0
+    - rvm: 3.0.1
       gemfile: gemfiles/csv_16.0.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/csv_15.0.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/csv_16.0.gemfile
   fast_finish: true
 
-script: bundle exec rake test:all
+script: bundle exec rake test:ruby test:js
diff --git a/Gemfile b/Gemfile
@@ -3,3 +3,9 @@
 source 'https://rubygems.org'
 
 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-simple_form.gemspec b/client_side_validations-simple_form.gemspec
@@ -35,11 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.14'
   spec.add_development_dependency 'mocha', '~> 1.11'
   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'
 
   # For QUnit testing

diff --git a/gemfiles/csv_15.0.gemfile b/gemfiles/csv_15.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 "client_side_validations", "~> 15.0"
 
 gemspec path: "../"
diff --git a/gemfiles/csv_16.0.gemfile b/gemfiles/csv_16.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 "client_side_validations", "~> 16.0"
 
 gemspec path: "../"
diff --git a/gemfiles/csv_17.0.gemfile b/gemfiles/csv_17.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 "client_side_validations", "~> 17.0"
 
 gemspec path: "../"
diff --git a/gemfiles/csv_18.0.gemfile b/gemfiles/csv_18.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 "client_side_validations", "~> 18.0"
 
 gemspec path: "../"
diff --git a/gemfiles/csv_edge.gemfile b/gemfiles/csv_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 "client_side_validations", git: "https://github.com/DavyJonesLocker/client_side_validations.git", branch: "main"
 
 gemspec path: "../"