Skip to content

Commit

Permalink
Merge pull request #919 from DavyJonesLocker/feature/rails-71-compati…
Browse files Browse the repository at this point in the history
…bility

Add Rails 7.1 compatibility
  • Loading branch information
tagliala authored Oct 5, 2023
2 parents 609f76c + 0b1214e commit 91752fc
Show file tree
Hide file tree
Showing 11 changed files with 100 additions and 64 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/javascript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v3
with:
node-version: '16'
node-version: '18'
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
ruby-version: ['2.7', '3.0', '3.1', '3.2']
gemfile: [rails_6.1, rails_7.0]
gemfile: [rails_6.1, rails_7.0, rails_7.1]
channel: ['stable']

include:
Expand All @@ -38,6 +38,9 @@ jobs:
- ruby-version: 'head'
gemfile: rails_7.0
channel: 'experimental'
- ruby-version: 'head'
gemfile: rails_7.1
channel: 'experimental'
- ruby-version: 'head'
gemfile: rails_edge
channel: 'experimental'
Expand Down
4 changes: 4 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ appraise 'rails-7.0' do
gem 'rails', '~> 7.0.0'
end

appraise 'rails-7.1' do
gem 'rails', '~> 7.1.0'
end

appraise 'rails-edge' do
gem 'rails', git: 'https://github.com/rails/rails.git', branch: 'main'
end
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 22.1.0 / 2023-10-05

* [FEATURE] Rails 7.1 compatibility

## 22.0.0 / 2023-09-02

* [FEATURE] Drop Rails 5.2 and 6.0 support
Expand Down
2 changes: 1 addition & 1 deletion client_side_validations.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
spec.required_ruby_version = '>= 2.7'

spec.add_dependency 'js_regex', '~> 3.7'
spec.add_dependency 'rails', '>= 6.1', '< 7.1'
spec.add_dependency 'rails', '>= 6.1', '< 7.2'
end
36 changes: 18 additions & 18 deletions gemfiles/rails_6.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

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 "sqlite3", "~> 1.6"
gem "webrick", "~> 1.7"
gem "appraisal"
gem "byebug"
gem "m"
gem "minitest"
gem "mocha"
gem "rake"
gem "rubocop"
gem "rubocop-minitest"
gem "rubocop-packaging"
gem "rubocop-performance"
gem "rubocop-rails"
gem "rubocop-rake"
gem "shotgun"
gem "simplecov"
gem "simplecov-lcov"
gem "sinatra"
gem "sqlite3"
gem "webrick"
gem "rails", "~> 6.1.0"

gemspec path: "../"
36 changes: 18 additions & 18 deletions gemfiles/rails_7.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

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 "sqlite3", "~> 1.6"
gem "webrick", "~> 1.7"
gem "appraisal"
gem "byebug"
gem "m"
gem "minitest"
gem "mocha"
gem "rake"
gem "rubocop"
gem "rubocop-minitest"
gem "rubocop-packaging"
gem "rubocop-performance"
gem "rubocop-rails"
gem "rubocop-rake"
gem "shotgun"
gem "simplecov"
gem "simplecov-lcov"
gem "sinatra"
gem "sqlite3"
gem "webrick"
gem "rails", "~> 7.0.0"

gemspec path: "../"
25 changes: 25 additions & 0 deletions gemfiles/rails_7.1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "appraisal"
gem "byebug"
gem "m"
gem "minitest"
gem "mocha"
gem "rake"
gem "rubocop"
gem "rubocop-minitest"
gem "rubocop-packaging"
gem "rubocop-performance"
gem "rubocop-rails"
gem "rubocop-rake"
gem "shotgun"
gem "simplecov"
gem "simplecov-lcov"
gem "sinatra"
gem "sqlite3"
gem "webrick"
gem "rails", "~> 7.1.0"

gemspec path: "../"
36 changes: 18 additions & 18 deletions gemfiles/rails_edge.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

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 "sqlite3", "~> 1.6"
gem "webrick", "~> 1.7"
gem "appraisal"
gem "byebug"
gem "m"
gem "minitest"
gem "mocha"
gem "rake"
gem "rubocop"
gem "rubocop-minitest"
gem "rubocop-packaging"
gem "rubocop-performance"
gem "rubocop-rails"
gem "rubocop-rake"
gem "shotgun"
gem "simplecov"
gem "simplecov-lcov"
gem "sinatra"
gem "sqlite3"
gem "webrick"
gem "rails", git: "https://github.com/rails/rails.git", branch: "main"

gemspec path: "../"
2 changes: 1 addition & 1 deletion lib/client_side_validations/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module ClientSideValidations
VERSION = '22.0.0'
VERSION = '22.1.0'
end
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
"test": "test/javascript/run-qunit.mjs"
},
"devDependencies": {
"@babel/core": "^7.22.20",
"@babel/core": "^7.23.0",
"@babel/preset-env": "^7.22.20",
"@rollup/plugin-babel": "^6.0.3",
"@rollup/plugin-node-resolve": "^15.2.1",
"chrome-launcher": "^1.0.0",
"puppeteer-core": "^21.3.3",
"rollup": "^3.29.2",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-node-resolve": "^15.2.2",
"chrome-launcher": "^1.1.0",
"puppeteer-core": "^21.3.7",
"rollup": "^4.0.0",
"rollup-plugin-copy": "^3.5.0",
"standard": "^17.1.0"
},
Expand Down

0 comments on commit 91752fc

Please sign in to comment.