From cd8c7c0d63986f51a7213491c75cd49a62c52afa Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Sat, 2 Sep 2023 10:07:42 +0200 Subject: [PATCH] Updates --- .github/workflows/ruby.yml | 9 +++----- .rubocop.yml | 4 ++-- Appraisals | 4 ++-- CHANGELOG.md | 4 +++- Gemfile | 10 ++++----- client_side_validations-simple_form.gemspec | 6 +++--- gemfiles/csv_21.0.gemfile | 23 -------------------- gemfiles/csv_22.0.gemfile | 24 +++++++++++++++++++++ gemfiles/csv_edge.gemfile | 19 ++++++++-------- package.json | 2 +- 10 files changed, 53 insertions(+), 52 deletions(-) delete mode 100644 gemfiles/csv_21.0.gemfile create mode 100644 gemfiles/csv_22.0.gemfile diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 8dc4f75..39df6b5 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -15,16 +15,13 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2'] - gemfile: [ csv_21.0 ] + ruby-version: ['2.7', '3.0', '3.1', '3.2'] + gemfile: [ csv_22.0 ] channel: ['stable'] include: - ruby-version: 'head' - gemfile: csv_21.0 - channel: 'experimental' - - ruby-version: '2.6' - gemfile: csv_edge + gemfile: csv_22.0 channel: 'experimental' - ruby-version: '2.7' gemfile: csv_edge diff --git a/.rubocop.yml b/.rubocop.yml index 9069f71..b442a0b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -6,8 +6,8 @@ require: - rubocop-rake AllCops: - TargetRailsVersion: 5.2 - TargetRubyVersion: 2.6 + TargetRailsVersion: 6.1 + TargetRubyVersion: 2.7 NewCops: enable DisplayStyleGuide: true ExtraDetails: true diff --git a/Appraisals b/Appraisals index 3d7f060..3b27c7d 100644 --- a/Appraisals +++ b/Appraisals @@ -1,7 +1,7 @@ # frozen_string_literal: true -appraise 'csv-21.0' do - gem 'client_side_validations', '~> 21.0' +appraise 'csv-22.0' do + gem 'client_side_validations', '~> 22.0' end appraise 'csv-edge' do diff --git a/CHANGELOG.md b/CHANGELOG.md index ea384a4..0f229ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,12 @@ # Changelog -## main / unreleased +## 16.0.0 / 2023-09-02 * [FEATURE] Do not require jQuery * [ENHANCEMENT] Test against Ruby 3.2 * [ENHANCEMENT] Update QUnit to 2.19.4 +* [FEATURE] Drop support to Ruby 2.6 +* [FEATURE] Drop support to CSV < 22.0 ## 15.0.0 / 2022-09-18 diff --git a/Gemfile b/Gemfile index 826fbff..5ed22d4 100644 --- a/Gemfile +++ b/Gemfile @@ -10,14 +10,14 @@ gem 'm', '~> 1.6' gem 'minitest', '~> 5.19' gem 'mocha', '~> 2.1' gem 'rake', '~> 13.0' -gem 'rubocop', '~> 1.50' -gem 'rubocop-minitest', '< 0.32' +gem 'rubocop', '~> 1.56' +gem 'rubocop-minitest', '~> 0.31.0' gem 'rubocop-packaging', '~> 0.5.2' -gem 'rubocop-performance', '~> 1.17' -gem 'rubocop-rails', '~> 2.19' +gem 'rubocop-performance', '~> 1.19' +gem 'rubocop-rails', '~> 2.20' 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.1' -gem 'webrick', '~> 1.8' +gem 'webrick', '~> 1.7' diff --git a/client_side_validations-simple_form.gemspec b/client_side_validations-simple_form.gemspec index be028c4..8a56f6d 100644 --- a/client_side_validations-simple_form.gemspec +++ b/client_side_validations-simple_form.gemspec @@ -25,8 +25,8 @@ Gem::Specification.new do |spec| spec.require_paths = ['lib'] spec.platform = Gem::Platform::RUBY - spec.required_ruby_version = '>= 2.6' + spec.required_ruby_version = '>= 2.7' - spec.add_dependency 'client_side_validations', '~> 21.0' - spec.add_dependency 'simple_form', '~> 5.0' + spec.add_dependency 'client_side_validations', '~> 22.0' + spec.add_dependency 'simple_form', '~> 5.2' end diff --git a/gemfiles/csv_21.0.gemfile b/gemfiles/csv_21.0.gemfile deleted file mode 100644 index 33ce410..0000000 --- a/gemfiles/csv_21.0.gemfile +++ /dev/null @@ -1,23 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -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.2" -gem "rubocop-minitest", "~> 0.30.0" -gem "rubocop-performance", "~> 1.17.1" -gem "rubocop-rails", "~> 2.19.1" -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 "webrick", "~> 1.8" -gem "client_side_validations", "~> 21.0" - -gemspec path: "../" diff --git a/gemfiles/csv_22.0.gemfile b/gemfiles/csv_22.0.gemfile new file mode 100644 index 0000000..58f1933 --- /dev/null +++ b/gemfiles/csv_22.0.gemfile @@ -0,0 +1,24 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "appraisal", "~> 2.5" +gem "byebug", "~> 11.1" +gem "m", "~> 1.6" +gem "minitest", "~> 5.19" +gem "mocha", "~> 2.1" +gem "rake", "~> 13.0" +gem "rubocop", "~> 1.56" +gem "rubocop-minitest", "~> 0.31.0" +gem "rubocop-packaging", "~> 0.5.2" +gem "rubocop-performance", "~> 1.19" +gem "rubocop-rails", "~> 2.20" +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.1" +gem "webrick", "~> 1.7" +gem "client_side_validations", "~> 22.0" + +gemspec path: "../" diff --git a/gemfiles/csv_edge.gemfile b/gemfiles/csv_edge.gemfile index 4b2fb76..13cb0f7 100644 --- a/gemfiles/csv_edge.gemfile +++ b/gemfiles/csv_edge.gemfile @@ -2,22 +2,23 @@ source "https://rubygems.org" -gem "appraisal", "~> 2.4" +gem "appraisal", "~> 2.5" gem "byebug", "~> 11.1" gem "m", "~> 1.6" -gem "minitest", "~> 5.18" -gem "mocha", "~> 2.0" +gem "minitest", "~> 5.19" +gem "mocha", "~> 2.1" gem "rake", "~> 13.0" -gem "rubocop", "~> 1.50.2" -gem "rubocop-minitest", "~> 0.30.0" -gem "rubocop-performance", "~> 1.17.1" -gem "rubocop-rails", "~> 2.19.1" +gem "rubocop", "~> 1.56" +gem "rubocop-minitest", "~> 0.31.0" +gem "rubocop-packaging", "~> 0.5.2" +gem "rubocop-performance", "~> 1.19" +gem "rubocop-rails", "~> 2.20" 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 "webrick", "~> 1.8" +gem "sinatra", "~> 3.1" +gem "webrick", "~> 1.7" gem "client_side_validations", git: "https://github.com/DavyJonesLocker/client_side_validations.git", branch: "main" gemspec path: "../" diff --git a/package.json b/package.json index 1467e6a..3847181 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "standard": "^17.1.0" }, "peerDependencies": { - "@client-side-validations/client-side-validations": ">= 0.2.0 < 0.4.0" + "@client-side-validations/client-side-validations": "^0.4.0" }, "main": "dist/simple-form.js", "module": "dist/simple-form.esm.js",