Skip to content

Commit

Permalink
Prepare for Rails 7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@tagliala
tagliala committed Jul 14, 2024
1 parent 2e25f12 commit 23d5113
Show file tree
Hide file tree
Showing 6 changed files with 551 additions and 80 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
os:
- ubuntu-latest
rails:
- rails_72
- rails_71
- rails_70
- rails_61
Expand All @@ -37,11 +38,11 @@ jobs:
- name: Configure bundler (default)
run: |
echo "BUNDLE_GEMFILE=Gemfile" >> "$GITHUB_ENV"
if: matrix.rails == 'rails_71'
if: matrix.rails == 'rails_72'
- name: Configure bundler (alternative)
run: |
echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.rails }}/Gemfile" >> "$GITHUB_ENV"
if: matrix.rails != 'rails_71'
if: matrix.rails != 'rails_72'
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
Expand Down
5 changes: 2 additions & 3 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ group :development, :test do
gem "draper"
gem "devise"

gem "rails", "~> 7.1.0"
gem "rails", "~> 7.2.0.beta3"

gem "sprockets-rails"
gem "ransack", ">= 4.1.0"
gem "formtastic", ">= 5.0.0"

gem "cssbundling-rails"
Expand All @@ -33,7 +32,7 @@ group :test do
gem "launchy"
gem "parallel_tests"
gem "rspec-rails"
gem "sqlite3", "~> 1.7", platform: :mri # FIXME: relax this dependency when rails/rails#51636 will be released
gem "sqlite3", platform: :mri

# Translations
gem "i18n-tasks"
Expand Down
143 changes: 69 additions & 74 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,84 +14,79 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actioncable (7.1.3.4)
actionpack (= 7.1.3.4)
activesupport (= 7.1.3.4)
actioncable (7.2.0.beta3)
actionpack (= 7.2.0.beta3)
activesupport (= 7.2.0.beta3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.3.4)
actionpack (= 7.1.3.4)
activejob (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.3.4)
actionpack (= 7.1.3.4)
actionview (= 7.1.3.4)
activejob (= 7.1.3.4)
activesupport (= 7.1.3.4)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
actionmailbox (7.2.0.beta3)
actionpack (= 7.2.0.beta3)
activejob (= 7.2.0.beta3)
activerecord (= 7.2.0.beta3)
activestorage (= 7.2.0.beta3)
activesupport (= 7.2.0.beta3)
mail (>= 2.8.0)
actionmailer (7.2.0.beta3)
actionpack (= 7.2.0.beta3)
actionview (= 7.2.0.beta3)
activejob (= 7.2.0.beta3)
activesupport (= 7.2.0.beta3)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.1.3.4)
actionview (= 7.1.3.4)
activesupport (= 7.1.3.4)
actionpack (7.2.0.beta3)
actionview (= 7.2.0.beta3)
activesupport (= 7.2.0.beta3)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.3.4)
actionpack (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
useragent (~> 0.16)
actiontext (7.2.0.beta3)
actionpack (= 7.2.0.beta3)
activerecord (= 7.2.0.beta3)
activestorage (= 7.2.0.beta3)
activesupport (= 7.2.0.beta3)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.3.4)
activesupport (= 7.1.3.4)
actionview (7.2.0.beta3)
activesupport (= 7.2.0.beta3)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.3.4)
activesupport (= 7.1.3.4)
activejob (7.2.0.beta3)
activesupport (= 7.2.0.beta3)
globalid (>= 0.3.6)
activemodel (7.1.3.4)
activesupport (= 7.1.3.4)
activemodel (7.2.0.beta3)
activesupport (= 7.2.0.beta3)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (7.1.3.4)
activemodel (= 7.1.3.4)
activesupport (= 7.1.3.4)
activerecord (7.2.0.beta3)
activemodel (= 7.2.0.beta3)
activesupport (= 7.2.0.beta3)
timeout (>= 0.4.0)
activestorage (7.1.3.4)
actionpack (= 7.1.3.4)
activejob (= 7.1.3.4)
activerecord (= 7.1.3.4)
activesupport (= 7.1.3.4)
activestorage (7.2.0.beta3)
actionpack (= 7.2.0.beta3)
activejob (= 7.2.0.beta3)
activerecord (= 7.2.0.beta3)
activesupport (= 7.2.0.beta3)
marcel (~> 1.0)
activesupport (7.1.3.4)
activesupport (7.2.0.beta3)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
arbre (2.0.0)
Expand Down Expand Up @@ -239,6 +234,7 @@ GEM
launchy (3.0.1)
addressable (~> 2.8)
childprocess (~> 5.0)
logger (1.6.0)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -252,7 +248,6 @@ GEM
mini_mime (1.1.5)
minitest (5.24.1)
multi_test (1.1.0)
mutex_m (0.2.0)
net-imap (0.4.14)
date
net-protocol
Expand Down Expand Up @@ -292,20 +287,20 @@ GEM
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rails (7.1.3.4)
actioncable (= 7.1.3.4)
actionmailbox (= 7.1.3.4)
actionmailer (= 7.1.3.4)
actionpack (= 7.1.3.4)
actiontext (= 7.1.3.4)
actionview (= 7.1.3.4)
activejob (= 7.1.3.4)
activemodel (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
rails (7.2.0.beta3)
actioncable (= 7.2.0.beta3)
actionmailbox (= 7.2.0.beta3)
actionmailer (= 7.2.0.beta3)
actionpack (= 7.2.0.beta3)
actiontext (= 7.2.0.beta3)
actionview (= 7.2.0.beta3)
activejob (= 7.2.0.beta3)
activemodel (= 7.2.0.beta3)
activerecord (= 7.2.0.beta3)
activestorage (= 7.2.0.beta3)
activesupport (= 7.2.0.beta3)
bundler (>= 1.15.0)
railties (= 7.1.3.4)
railties (= 7.2.0.beta3)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
Expand All @@ -316,10 +311,10 @@ GEM
rails-i18n (7.0.9)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
railties (7.1.3.4)
actionpack (= 7.1.3.4)
activesupport (= 7.1.3.4)
irb
railties (7.2.0.beta3)
actionpack (= 7.2.0.beta3)
activesupport (= 7.2.0.beta3)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
Expand Down Expand Up @@ -384,7 +379,7 @@ GEM
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rspec (3.0.2)
rubocop-rspec (3.0.3)
rubocop (~> 1.61)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
Expand All @@ -404,10 +399,10 @@ GEM
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
sqlite3 (1.7.3-aarch64-linux)
sqlite3 (1.7.3-arm64-darwin)
sqlite3 (1.7.3-x86_64-darwin)
sqlite3 (1.7.3-x86_64-linux)
sqlite3 (2.0.2-aarch64-linux-gnu)
sqlite3 (2.0.2-arm64-darwin)
sqlite3 (2.0.2-x86_64-darwin)
sqlite3 (2.0.2-x86_64-linux-gnu)
stringio (3.1.1)
strscan (3.1.0)
sys-uname (1.3.0)
Expand All @@ -419,6 +414,7 @@ GEM
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
useragent (0.16.10)
warden (1.2.9)
rack (>= 2.0.9)
webrick (1.8.1)
Expand Down Expand Up @@ -455,10 +451,9 @@ DEPENDENCIES
launchy
parallel_tests
pundit
rails (~> 7.1.0)
rails (~> 7.2.0.beta3)
rails-i18n
rake
ransack (>= 4.1.0)
rspec-rails
rubocop
rubocop-capybara
Expand All @@ -469,7 +464,7 @@ DEPENDENCIES
simplecov
simplecov-cobertura
sprockets-rails
sqlite3 (~> 1.7)
sqlite3
webrick
yard

Expand Down
42 changes: 42 additions & 0 deletions gemfiles/rails_71/Gemfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# frozen_string_literal: true
source "https://rubygems.org"

group :development, :test do
gem "rake"

gem "cancancan"
gem "pundit"

gem "draper"
gem "devise"

gem "rails", "~> 7.1.0"

gem "sprockets-rails"

gem "cssbundling-rails"
gem "importmap-rails"
end

group :test do
gem "cuprite"
gem "capybara"
gem "webrick"

gem "simplecov", require: false # Test coverage generator. Go to /coverage/ after running tests
gem "simplecov-cobertura", require: false
gem "cucumber-rails", require: false
gem "cucumber"
gem "database_cleaner"
gem "launchy"
gem "parallel_tests"
gem "rspec-rails"
gem "sqlite3", "~> 1.7", platform: :mri

# Translations
gem "i18n-tasks"
gem "i18n-spec"
gem "rails-i18n" # Provides default i18n for many languages
end

gemspec path: "../.."
Loading

0 comments on commit 23d5113

Please sign in to comment.