Skip to content

Commit 74b9c68

Browse files
carlosantoniodasilvacarlosantoniodasilva
authored
Merge pull request #1845 from heartcombo/drop-old-rubies
Update Ruby/Rails support * Add support for Ruby 3.4 and Rails 7.2/8.0/8.1. (no changes required) * Drop support for Rails < 7 and Ruby < 2.7.
2 parents 006cf5d + fee331e commit 74b9c68

File tree

16 files changed

+152
-169
lines changed

16 files changed

+152
-169
lines changed

‎.github/workflows/test.yml‎

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,50 +8,39 @@ 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

‎CHANGELOG.md‎

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

3+
* Add support for Ruby 3.4 and Rails 7.2/8.0/8.1. (no changes required)
4+
* Drop support for Rails < 7 and Ruby < 2.7.
35
* Remove redundant `aria-required` attribute for required fields. [@aduth](https://github.com/aduth)
46
* Add `weekday` input. [@nashby](https://github.com/nashby)
57

‎Gemfile‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
source 'https://rubygems.org'
1+
source "https://rubygems.org"
22

33
gemspec
44

5-
gem 'country_select'
6-
gem 'activemodel', '~> 7.1.0'
7-
gem 'actionpack', '~> 7.1.0'
8-
gem 'railties', '~> 7.1.0'
9-
gem 'rake'
5+
gem "activemodel", "~> 8.1.0.beta1"
6+
gem "actionpack", "~> 8.1.0.beta1"
7+
gem "railties", "~> 8.1.0.beta1"

‎Gemfile.lock‎

Lines changed: 73 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,114 +2,130 @@ PATH
22
remote: .
33
specs:
44
simple_form (5.3.1)
5-
actionpack (>= 5.2)
6-
activemodel (>= 5.2)
5+
actionpack (>= 7.0)
6+
activemodel (>= 7.0)
77

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)
44-
countries (5.7.2)
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)
48+
countries (8.0.4)
4549
unaccent (~> 0.3)
46-
country_select (8.0.3)
47-
countries (~> 5.0)
50+
country_select (11.0.0)
51+
countries (> 6.0, < 9.0)
4852
crass (1.0.6)
49-
drb (2.2.1)
50-
erubi (1.12.0)
51-
i18n (1.14.4)
53+
date (3.4.1)
54+
drb (2.2.3)
55+
erb (5.0.2)
56+
erubi (1.13.1)
57+
i18n (1.14.7)
5258
concurrent-ruby (~> 1.0)
53-
io-console (0.7.2)
54-
irb (1.12.0)
55-
rdoc
59+
io-console (0.8.1)
60+
irb (1.15.2)
61+
pp (>= 0.6.0)
62+
rdoc (>= 4.0.0)
5663
reline (>= 0.4.2)
57-
loofah (2.22.0)
64+
logger (1.7.0)
65+
loofah (2.24.1)
5866
crass (~> 1.0.2)
5967
nokogiri (>= 1.12.0)
60-
mini_portile2 (2.8.5)
61-
minitest (5.22.3)
62-
mutex_m (0.2.0)
63-
nokogiri (1.15.6)
68+
mini_portile2 (2.8.9)
69+
minitest (5.25.5)
70+
nokogiri (1.18.10)
6471
mini_portile2 (~> 2.8.2)
6572
racc (~> 1.4)
66-
psych (5.1.2)
73+
pp (0.6.2)
74+
prettyprint
75+
prettyprint (0.2.0)
76+
psych (5.2.6)
77+
date
6778
stringio
68-
racc (1.7.3)
69-
rack (3.0.10)
70-
rack-session (2.0.0)
79+
racc (1.8.1)
80+
rack (3.2.1)
81+
rack-session (2.1.1)
82+
base64 (>= 0.1.0)
7183
rack (>= 3.0.0)
72-
rack-test (2.1.0)
84+
rack-test (2.2.0)
7385
rack (>= 1.3)
74-
rackup (2.1.0)
86+
rackup (2.2.1)
7587
rack (>= 3)
76-
webrick (~> 1.8)
77-
rails-dom-testing (2.2.0)
88+
rails-dom-testing (2.3.0)
7889
activesupport (>= 5.0.0)
7990
minitest
8091
nokogiri (>= 1.6)
81-
rails-html-sanitizer (1.6.0)
92+
rails-html-sanitizer (1.6.2)
8293
loofah (~> 2.21)
83-
nokogiri (~> 1.14)
84-
railties (7.1.3.2)
85-
actionpack (= 7.1.3.2)
86-
activesupport (= 7.1.3.2)
87-
irb
94+
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)
95+
railties (8.1.0.beta1)
96+
actionpack (= 8.1.0.beta1)
97+
activesupport (= 8.1.0.beta1)
98+
irb (~> 1.13)
8899
rackup (>= 1.0.0)
89100
rake (>= 12.2)
90101
thor (~> 1.0, >= 1.2.2)
102+
tsort (>= 0.2)
91103
zeitwerk (~> 2.6)
92-
rake (13.2.1)
93-
rdoc (6.6.3.1)
104+
rake (13.3.0)
105+
rdoc (6.14.2)
106+
erb
94107
psych (>= 4.0.0)
95-
reline (0.5.1)
108+
reline (0.6.2)
96109
io-console (~> 0.5)
97-
stringio (3.1.0)
98-
thor (1.3.1)
110+
securerandom (0.4.1)
111+
stringio (3.1.7)
112+
thor (1.4.0)
113+
tsort (0.2.0)
99114
tzinfo (2.0.6)
100115
concurrent-ruby (~> 1.0)
101116
unaccent (0.4.0)
102-
webrick (1.8.1)
103-
zeitwerk (2.6.13)
117+
uri (1.0.3)
118+
useragent (0.16.11)
119+
zeitwerk (2.7.3)
104120

105121
PLATFORMS
106122
ruby
107123

108124
DEPENDENCIES
109-
actionpack (~> 7.1.0)
110-
activemodel (~> 7.1.0)
125+
actionpack (~> 8.1.0.beta1)
126+
activemodel (~> 8.1.0.beta1)
111127
country_select
112-
railties (~> 7.1.0)
128+
railties (~> 8.1.0.beta1)
113129
rake
114130
simple_form!
115131

‎gemfiles/Gemfile-rails-5-2‎

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

‎gemfiles/Gemfile-rails-6-0‎

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

‎gemfiles/Gemfile-rails-6-1‎

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

‎gemfiles/Gemfile-rails-7-0‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
source 'https://rubygems.org'
1+
source "https://rubygems.org"
22

3-
gemspec path: '..'
3+
gemspec path: ".."
44

5-
gem 'country_select'
6-
gem 'activemodel', '~> 7.0.0'
7-
gem 'actionpack', '~> 7.0.0'
8-
gem 'railties', '~> 7.0.0'
9-
gem 'rake'
5+
gem "activemodel", "~> 7.0.0", github: "rails/rails", branch: "7-0-stable"
6+
gem "actionpack", "~> 7.0.0", github: "rails/rails", branch: "7-0-stable"
7+
gem "railties", "~> 7.0.0", github: "rails/rails", branch: "7-0-stable"

‎gemfiles/Gemfile-rails-7-1‎

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

‎gemfiles/Gemfile-rails-7-2‎

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

0 commit comments

Comments
 (0)