Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates #168

Merged
merged 1 commit into from
Sep 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
6 changes: 3 additions & 3 deletions client_side_validations-simple_form.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
23 changes: 0 additions & 23 deletions gemfiles/csv_21.0.gemfile

This file was deleted.

24 changes: 24 additions & 0 deletions gemfiles/csv_22.0.gemfile
Original file line number Diff line number Diff line change
@@ -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: "../"
19 changes: 10 additions & 9 deletions gemfiles/csv_edge.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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: "../"
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down