Skip to content

Commit 4484a75

Browse files
carlosantoniodasilvacarlosantoniodasilva
committed
Update Ruby/Rails support
Add support for Ruby 3.3/3.4 and Rails 7.2/8.0/8.1. (no changes required) Drop support for Rails < 7 and Ruby < 2.7.
1 parent dad924b commit 4484a75

File tree

13 files changed

+127
-120
lines changed

13 files changed

+127
-120
lines changed

‎.github/workflows/test.yml‎

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,56 +8,45 @@ jobs:
88
gemfile:
99
- Gemfile
1010
- gemfiles/Gemfile-rails-main
11+
- gemfiles/Gemfile-rails-8-0
12+
- gemfiles/Gemfile-rails-7-2
13+
- gemfiles/Gemfile-rails-7-1
1114
- gemfiles/Gemfile-rails-7-0
12-
- gemfiles/Gemfile-rails-6-1
13-
- gemfiles/Gemfile-rails-6-0
14-
- gemfiles/Gemfile-rails-5-2
1515
ruby:
16+
- '3.4'
1617
- '3.3'
1718
- '3.2'
1819
- '3.1'
1920
- '3.0'
2021
- '2.7'
21-
- '2.6'
22-
- '2.5'
2322
exclude:
2423
- gemfile: Gemfile
25-
ruby: '2.6'
24+
ruby: '3.1'
2625
- gemfile: Gemfile
27-
ruby: '2.5'
28-
- gemfile: gemfiles/Gemfile-rails-main
2926
ruby: '3.0'
30-
- gemfile: gemfiles/Gemfile-rails-main
27+
- gemfile: Gemfile
3128
ruby: '2.7'
3229
- gemfile: gemfiles/Gemfile-rails-main
33-
ruby: '2.6'
34-
- gemfile: gemfiles/Gemfile-rails-main
35-
ruby: '2.5'
36-
- gemfile: gemfiles/Gemfile-rails-7-0
37-
ruby: '2.6'
38-
- gemfile: gemfiles/Gemfile-rails-7-0
39-
ruby: '2.5'
40-
- gemfile: gemfiles/Gemfile-rails-6-0
41-
ruby: '3.3'
42-
- gemfile: gemfiles/Gemfile-rails-6-0
43-
ruby: '3.2'
44-
- gemfile: gemfiles/Gemfile-rails-6-0
4530
ruby: '3.1'
46-
- gemfile: gemfiles/Gemfile-rails-5-2
47-
ruby: '3.3'
48-
- gemfile: gemfiles/Gemfile-rails-5-2
49-
ruby: '3.2'
50-
- gemfile: gemfiles/Gemfile-rails-5-2
31+
- gemfile: gemfiles/Gemfile-rails-main
32+
ruby: '3.0'
33+
- gemfile: gemfiles/Gemfile-rails-main
34+
ruby: '2.7'
35+
- gemfile: gemfiles/Gemfile-rails-8-0
5136
ruby: '3.1'
52-
- gemfile: gemfiles/Gemfile-rails-5-2
37+
- gemfile: gemfiles/Gemfile-rails-8-0
38+
ruby: '3.0'
39+
- gemfile: gemfiles/Gemfile-rails-8-0
40+
ruby: '2.7'
41+
- gemfile: gemfiles/Gemfile-rails-7-2
5342
ruby: '3.0'
54-
- gemfile: gemfiles/Gemfile-rails-5-2
43+
- gemfile: gemfiles/Gemfile-rails-7-2
5544
ruby: '2.7'
5645
runs-on: ubuntu-latest
5746
env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
5847
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
5948
steps:
60-
- uses: actions/checkout@v3
49+
- uses: actions/checkout@v4
6150
- uses: ruby/setup-ruby@v1
6251
with:
6352
ruby-version: ${{ matrix.ruby }}

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## Unreleased
22

3-
* Add support for Ruby 3.3. (no changes required)
3+
* Add support for Ruby 3.3/3.4 and Rails 7.2/8.0/8.1. (no changes required)
4+
* Drop support for Rails < 7 and Ruby < 2.7.
45

56
## 0.8.1
67

‎Gemfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ gemspec
44

55
gem 'rake'
66
gem 'rdoc'
7-
gem 'railties', '~> 7.1.0'
8-
gem 'activemodel', '~> 7.1.0'
9-
gem 'actionpack', '~> 7.1.0'
7+
gem 'railties', '~> 8.1.0.beta1'
8+
gem 'activemodel', '~> 8.1.0.beta1'
9+
gem 'actionpack', '~> 8.1.0.beta1'

‎Gemfile.lock‎

Lines changed: 69 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -8,105 +8,121 @@ PATH
88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
actionpack (7.1.3.2)
12-
actionview (= 7.1.3.2)
13-
activesupport (= 7.1.3.2)
11+
actionpack (8.1.0.beta1)
12+
actionview (= 8.1.0.beta1)
13+
activesupport (= 8.1.0.beta1)
1414
nokogiri (>= 1.8.5)
15-
racc
1615
rack (>= 2.2.4)
1716
rack-session (>= 1.0.1)
1817
rack-test (>= 0.6.3)
1918
rails-dom-testing (~> 2.2)
2019
rails-html-sanitizer (~> 1.6)
21-
actionview (7.1.3.2)
22-
activesupport (= 7.1.3.2)
20+
useragent (~> 0.16)
21+
actionview (8.1.0.beta1)
22+
activesupport (= 8.1.0.beta1)
2323
builder (~> 3.1)
2424
erubi (~> 1.11)
2525
rails-dom-testing (~> 2.2)
2626
rails-html-sanitizer (~> 1.6)
27-
activemodel (7.1.3.2)
28-
activesupport (= 7.1.3.2)
29-
activesupport (7.1.3.2)
27+
activemodel (8.1.0.beta1)
28+
activesupport (= 8.1.0.beta1)
29+
activesupport (8.1.0.beta1)
3030
base64
31+
benchmark (>= 0.3)
3132
bigdecimal
32-
concurrent-ruby (~> 1.0, >= 1.0.2)
33+
concurrent-ruby (~> 1.0, >= 1.3.1)
3334
connection_pool (>= 2.2.5)
3435
drb
3536
i18n (>= 1.6, < 2)
37+
logger (>= 1.4.2)
3638
minitest (>= 5.1)
37-
mutex_m
38-
tzinfo (~> 2.0)
39-
base64 (0.2.0)
40-
bigdecimal (3.1.7)
41-
builder (3.2.4)
42-
concurrent-ruby (1.2.3)
43-
connection_pool (2.4.1)
39+
securerandom (>= 0.3)
40+
tzinfo (~> 2.0, >= 2.0.5)
41+
uri (>= 0.13.1)
42+
base64 (0.3.0)
43+
benchmark (0.4.1)
44+
bigdecimal (3.2.3)
45+
builder (3.3.0)
46+
concurrent-ruby (1.3.5)
47+
connection_pool (2.5.4)
4448
crass (1.0.6)
45-
drb (2.2.1)
46-
erubi (1.12.0)
47-
i18n (1.14.4)
49+
date (3.4.1)
50+
drb (2.2.3)
51+
erb (5.0.2)
52+
erubi (1.13.1)
53+
i18n (1.14.7)
4854
concurrent-ruby (~> 1.0)
49-
io-console (0.7.2)
50-
irb (1.12.0)
51-
rdoc
55+
io-console (0.8.1)
56+
irb (1.15.2)
57+
pp (>= 0.6.0)
58+
rdoc (>= 4.0.0)
5259
reline (>= 0.4.2)
53-
loofah (2.22.0)
60+
logger (1.7.0)
61+
loofah (2.24.1)
5462
crass (~> 1.0.2)
5563
nokogiri (>= 1.12.0)
56-
mini_portile2 (2.8.5)
57-
minitest (5.22.3)
58-
mutex_m (0.2.0)
59-
nokogiri (1.15.6)
64+
mini_portile2 (2.8.9)
65+
minitest (5.25.5)
66+
nokogiri (1.18.9)
6067
mini_portile2 (~> 2.8.2)
6168
racc (~> 1.4)
62-
psych (5.1.2)
69+
pp (0.6.2)
70+
prettyprint
71+
prettyprint (0.2.0)
72+
psych (5.2.6)
73+
date
6374
stringio
64-
racc (1.7.3)
65-
rack (3.0.10)
66-
rack-session (2.0.0)
75+
racc (1.8.1)
76+
rack (3.2.1)
77+
rack-session (2.1.1)
78+
base64 (>= 0.1.0)
6779
rack (>= 3.0.0)
68-
rack-test (2.1.0)
80+
rack-test (2.2.0)
6981
rack (>= 1.3)
70-
rackup (2.1.0)
82+
rackup (2.2.1)
7183
rack (>= 3)
72-
webrick (~> 1.8)
73-
rails-dom-testing (2.2.0)
84+
rails-dom-testing (2.3.0)
7485
activesupport (>= 5.0.0)
7586
minitest
7687
nokogiri (>= 1.6)
77-
rails-html-sanitizer (1.6.0)
88+
rails-html-sanitizer (1.6.2)
7889
loofah (~> 2.21)
79-
nokogiri (~> 1.14)
80-
railties (7.1.3.2)
81-
actionpack (= 7.1.3.2)
82-
activesupport (= 7.1.3.2)
83-
irb
90+
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
91+
railties (8.1.0.beta1)
92+
actionpack (= 8.1.0.beta1)
93+
activesupport (= 8.1.0.beta1)
94+
irb (~> 1.13)
8495
rackup (>= 1.0.0)
8596
rake (>= 12.2)
8697
thor (~> 1.0, >= 1.2.2)
98+
tsort (>= 0.2)
8799
zeitwerk (~> 2.6)
88-
rake (13.2.1)
89-
rdoc (6.6.3.1)
100+
rake (13.3.0)
101+
rdoc (6.14.2)
102+
erb
90103
psych (>= 4.0.0)
91-
reline (0.5.1)
104+
reline (0.6.2)
92105
io-console (~> 0.5)
93-
stringio (3.1.0)
94-
thor (1.3.1)
106+
securerandom (0.4.1)
107+
stringio (3.1.7)
108+
thor (1.4.0)
109+
tsort (0.2.0)
95110
tzinfo (2.0.6)
96111
concurrent-ruby (~> 1.0)
97-
webrick (1.8.1)
98-
zeitwerk (2.6.13)
112+
uri (1.0.3)
113+
useragent (0.16.11)
114+
zeitwerk (2.7.3)
99115

100116
PLATFORMS
101117
ruby
102118

103119
DEPENDENCIES
104-
actionpack (~> 7.1.0)
105-
activemodel (~> 7.1.0)
106-
railties (~> 7.1.0)
120+
actionpack (~> 8.1.0.beta1)
121+
activemodel (~> 8.1.0.beta1)
122+
railties (~> 8.1.0.beta1)
107123
rake
108124
rdoc
109125
show_for!
110126

111127
BUNDLED WITH
112-
2.4.22
128+
2.6.9

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Run the generator:
3838

3939
And you are ready to go.
4040

41-
Note: This branch aims Rails 5 and 6 support, so if you want to use it with
41+
Note: This branch aims Rails 7 and 8 support, so if you want to use it with
4242
older versions of Rails, check out the available branches.
4343

4444
## Usage

‎gemfiles/Gemfile-rails-5-2‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎gemfiles/Gemfile-rails-6-0‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎gemfiles/Gemfile-rails-6-1‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎gemfiles/Gemfile-rails-7-0‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ gemspec path: '..'
44

55
gem 'rake'
66
gem 'rdoc'
7-
gem 'railties', '~> 7.0.0'
8-
gem 'activemodel', '~> 7.0.0'
9-
gem 'actionpack', '~> 7.0.0'
7+
# Use the branch which contains some fixes to work with the Ruby logger gem.
8+
gem 'railties', '~> 7.0.0', github: 'rails/rails', branch: '7-0-stable'
9+
gem 'activemodel', '~> 7.0.0', github: 'rails/rails', branch: '7-0-stable'
10+
gem 'actionpack', '~> 7.0.0', github: 'rails/rails', branch: '7-0-stable'

‎gemfiles/Gemfile-rails-7-1‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
source 'https://rubygems.org'
2+
3+
gemspec path: '..'
4+
5+
gem 'rake'
6+
gem 'rdoc'
7+
gem 'railties', '~> 7.1.0'
8+
gem 'activemodel', '~> 7.1.0'
9+
gem 'actionpack', '~> 7.1.0'

0 commit comments

Comments
 (0)