Update dependencies

DavyJonesLocker · May 21, 2023 · b9edf57 · b9edf57
1 parent 16d7154
commit b9edf57
Show file tree

Hide file tree

Showing 12 changed files with 100 additions and 43 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -6,6 +6,7 @@ require:
 
 AllCops:
   TargetRailsVersion: 5.2
+  TargetRubyVersion: 2.6
   NewCops: enable
   DisplayStyleGuide: true
   ExtraDetails: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## main / unreleased
 
 * [ENHANCEMENT] Test against Ruby 3.2
-* [ENHANCEMENT] Test against jQuery 3.6.4 by default
+* [ENHANCEMENT] Test against jQuery 3.7.0 by default
 * [ENHANCEMENT] Update QUnit to 2.19.4
 
 ## 21.0.0 / 2022-09-18

diff --git a/Gemfile b/Gemfile
@@ -5,8 +5,20 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in client_side_validations.gemspec
 gemspec
 
+gem 'appraisal', '~> 2.4'
+gem 'byebug', '~> 11.1'
+gem 'm', '~> 1.6'
+gem 'minitest', '~> 5.18'
+gem 'mocha', '~> 2.0'
+gem 'rake', '~> 13.0'
 gem 'rubocop', '~> 1.50'
-gem 'rubocop-minitest', '~> 0.30.0'
+gem 'rubocop-minitest', '< 0.32'
 gem 'rubocop-performance', '~> 1.17'
 gem 'rubocop-rails', '~> 2.19'
 gem 'rubocop-rake', '~> 0.6.0'
+gem 'shotgun', '~> 0.9.2'
+gem 'simplecov', '~> 0.22.0'
+gem 'simplecov-lcov', '~> 0.8.0'
+gem 'sinatra', '~> 3.0'
+gem 'sqlite3', '~> 1.6'
+gem 'webrick', '~> 1.7'
diff --git a/client_side_validations.gemspec b/client_side_validations.gemspec
@@ -27,22 +27,6 @@ Gem::Specification.new do |spec|
   spec.platform              = Gem::Platform::RUBY
   spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'rails', '>= 5.2', '< 7.1'
-
   spec.add_dependency 'js_regex', '~> 3.7'
-
-  spec.add_development_dependency 'appraisal', '~> 2.4'
-  spec.add_development_dependency 'byebug', '~> 11.1'
-  spec.add_development_dependency 'm', '~> 1.6'
-  spec.add_development_dependency 'minitest', '~> 5.18'
-  spec.add_development_dependency 'mocha', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'simplecov', '~> 0.22.0'
-  spec.add_development_dependency 'simplecov-lcov', '~> 0.8.0'
-  spec.add_development_dependency 'sqlite3', '~> 1.6'
-
-  # For QUnit testing
-  spec.add_development_dependency 'shotgun', '~> 0.9.2'
-  spec.add_development_dependency 'sinatra', '~> 3.0'
-  spec.add_development_dependency 'webrick', '~> 1.7'
+  spec.add_dependency 'rails', '>= 5.2', '< 7.1'
 end
diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
@@ -2,11 +2,23 @@
 
 source "https://rubygems.org"
 
-gem "rubocop", "~> 1.48"
-gem "rubocop-minitest", "~> 0.29.0"
-gem "rubocop-performance", "~> 1.16"
-gem "rubocop-rails", "~> 2.18"
+gem "appraisal", "~> 2.4"
+gem "byebug", "~> 11.1"
+gem "m", "~> 1.6"
+gem "minitest", "~> 5.18"
+gem "mocha", "~> 2.0"
+gem "rake", "~> 13.0"
+gem "rubocop", "~> 1.50"
+gem "rubocop-minitest", "< 0.32"
+gem "rubocop-performance", "~> 1.17"
+gem "rubocop-rails", "~> 2.19"
 gem "rubocop-rake", "~> 0.6.0"
+gem "shotgun", "~> 0.9.2"
+gem "simplecov", "~> 0.22.0"
+gem "simplecov-lcov", "~> 0.8.0"
+gem "sinatra", "~> 3.0"
+gem "sqlite3", "~> 1.6"
+gem "webrick", "~> 1.7"
 gem "rails", "~> 5.2.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
@@ -2,11 +2,23 @@
 
 source "https://rubygems.org"
 
-gem "rubocop", "~> 1.48"
-gem "rubocop-minitest", "~> 0.29.0"
-gem "rubocop-performance", "~> 1.16"
-gem "rubocop-rails", "~> 2.18"
+gem "appraisal", "~> 2.4"
+gem "byebug", "~> 11.1"
+gem "m", "~> 1.6"
+gem "minitest", "~> 5.18"
+gem "mocha", "~> 2.0"
+gem "rake", "~> 13.0"
+gem "rubocop", "~> 1.50"
+gem "rubocop-minitest", "< 0.32"
+gem "rubocop-performance", "~> 1.17"
+gem "rubocop-rails", "~> 2.19"
 gem "rubocop-rake", "~> 0.6.0"
+gem "shotgun", "~> 0.9.2"
+gem "simplecov", "~> 0.22.0"
+gem "simplecov-lcov", "~> 0.8.0"
+gem "sinatra", "~> 3.0"
+gem "sqlite3", "~> 1.6"
+gem "webrick", "~> 1.7"
 gem "rails", "~> 6.0.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
@@ -2,11 +2,23 @@
 
 source "https://rubygems.org"
 
-gem "rubocop", "~> 1.48"
-gem "rubocop-minitest", "~> 0.29.0"
-gem "rubocop-performance", "~> 1.16"
-gem "rubocop-rails", "~> 2.18"
+gem "appraisal", "~> 2.4"
+gem "byebug", "~> 11.1"
+gem "m", "~> 1.6"
+gem "minitest", "~> 5.18"
+gem "mocha", "~> 2.0"
+gem "rake", "~> 13.0"
+gem "rubocop", "~> 1.50"
+gem "rubocop-minitest", "< 0.32"
+gem "rubocop-performance", "~> 1.17"
+gem "rubocop-rails", "~> 2.19"
 gem "rubocop-rake", "~> 0.6.0"
+gem "shotgun", "~> 0.9.2"
+gem "simplecov", "~> 0.22.0"
+gem "simplecov-lcov", "~> 0.8.0"
+gem "sinatra", "~> 3.0"
+gem "sqlite3", "~> 1.6"
+gem "webrick", "~> 1.7"
 gem "rails", "~> 6.1.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
@@ -2,11 +2,23 @@
 
 source "https://rubygems.org"
 
-gem "rubocop", "~> 1.48"
-gem "rubocop-minitest", "~> 0.29.0"
-gem "rubocop-performance", "~> 1.16"
-gem "rubocop-rails", "~> 2.18"
+gem "appraisal", "~> 2.4"
+gem "byebug", "~> 11.1"
+gem "m", "~> 1.6"
+gem "minitest", "~> 5.18"
+gem "mocha", "~> 2.0"
+gem "rake", "~> 13.0"
+gem "rubocop", "~> 1.50"
+gem "rubocop-minitest", "< 0.32"
+gem "rubocop-performance", "~> 1.17"
+gem "rubocop-rails", "~> 2.19"
 gem "rubocop-rake", "~> 0.6.0"
+gem "shotgun", "~> 0.9.2"
+gem "simplecov", "~> 0.22.0"
+gem "simplecov-lcov", "~> 0.8.0"
+gem "sinatra", "~> 3.0"
+gem "sqlite3", "~> 1.6"
+gem "webrick", "~> 1.7"
 gem "rails", "~> 7.0.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile
@@ -2,11 +2,23 @@
 
 source "https://rubygems.org"
 
-gem "rubocop", "~> 1.48"
-gem "rubocop-minitest", "~> 0.29.0"
-gem "rubocop-performance", "~> 1.16"
-gem "rubocop-rails", "~> 2.18"
+gem "appraisal", "~> 2.4"
+gem "byebug", "~> 11.1"
+gem "m", "~> 1.6"
+gem "minitest", "~> 5.18"
+gem "mocha", "~> 2.0"
+gem "rake", "~> 13.0"
+gem "rubocop", "~> 1.50"
+gem "rubocop-minitest", "< 0.32"
+gem "rubocop-performance", "~> 1.17"
+gem "rubocop-rails", "~> 2.19"
 gem "rubocop-rake", "~> 0.6.0"
+gem "shotgun", "~> 0.9.2"
+gem "simplecov", "~> 0.22.0"
+gem "simplecov-lcov", "~> 0.8.0"
+gem "sinatra", "~> 3.0"
+gem "sqlite3", "~> 1.6"
+gem "webrick", "~> 1.7"
 gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
 
 gemspec path: "../"
diff --git a/package.json b/package.json
@@ -27,8 +27,8 @@
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-node-resolve": "^15.0.2",
     "chrome-launcher": "^0.15.2",
-    "puppeteer-core": "^20.0.0",
-    "rollup": "^3.21.3",
+    "puppeteer-core": "^20.2.1",
+    "rollup": "^3.22.0",
     "rollup-plugin-copy": "^3.4.0",
     "standard": "^17.0.0"
   },

diff --git a/test/javascript/public/test/settings.js b/test/javascript/public/test/settings.js
@@ -3,7 +3,7 @@ QUnit.config.autostart = window.location.search.search('autostart=false') < 0
 QUnit.config.urlConfig.push({
   id: 'jquery',
   label: 'jQuery version',
-  value: ['3.6.4', '3.6.4.slim', '3.5.1', '3.5.1.slim', '3.4.1', '3.4.1.slim', '3.3.1', '3.3.1.slim', '3.2.1', '3.2.1.slim', '3.1.1', '3.1.1.slim', '3.0.0', '3.0.0.slim', '2.2.4', '2.1.4', '2.0.3', '1.12.4', '1.11.3'],
+  value: ['3.7.0', '3.7.0.slim', '3.6.4', '3.6.4.slim', '3.5.1', '3.5.1.slim', '3.4.1', '3.4.1.slim', '3.3.1', '3.3.1.slim', '3.2.1', '3.2.1.slim', '3.1.1', '3.1.1.slim', '3.0.0', '3.0.0.slim', '2.2.4', '2.1.4', '2.0.3', '1.12.4', '1.11.3'],
   tooltip: 'What jQuery Core version to test against'
 })
 

diff --git a/test/javascript/server.rb b/test/javascript/server.rb
@@ -29,7 +29,7 @@ def call(env)
 use AssetPath, urls: ['/vendor/assets/javascripts'], root: File.expand_path('../..', settings.root)
 use AssetPath, urls: ['/vendor/assets/javascripts'], root: File.expand_path('../', $LOAD_PATH.find { |p| p.include?('jquery-rails') })
 
-DEFAULT_JQUERY_VERSION = '3.6.4'
+DEFAULT_JQUERY_VERSION = '3.7.0'
 QUNIT_VERSION          = '2.19.4'
 
 helpers do