Skip to content

Commit 32e2fbe

Browse files
authored
Merge pull request #17 from fastruby/update-ruby-rails-patch
Use latest Ruby 3.1 and Rails 7.x patch versions
2 parents cb33fd1 + f9c6a27 commit 32e2fbe

File tree

4 files changed

+122
-114
lines changed

4 files changed

+122
-114
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Setup Ruby
3030
uses: ruby/setup-ruby@v1
3131
with:
32-
ruby-version: "3.1.3"
32+
ruby-version: "3.1.7"
3333
- uses: actions/setup-node@v3
3434
with:
3535
node-version: 14
@@ -73,7 +73,7 @@ jobs:
7373
- name: Setup Ruby
7474
uses: ruby/setup-ruby@v1
7575
with:
76-
ruby-version: "3.1.3"
76+
ruby-version: "3.1.7"
7777
- uses: actions/setup-node@v3
7878
with:
7979
node-version: 14

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ end
55
source 'https://rubygems.org'
66
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
77

8-
ruby '3.1.3'
8+
ruby '3.1.7'
99

1010
if next?
1111
gem 'rails', '~> 7.2.0'

Gemfile.lock

Lines changed: 59 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,73 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (7.1.5.2)
5-
actionpack (= 7.1.5.2)
6-
activesupport (= 7.1.5.2)
4+
actioncable (7.1.6)
5+
actionpack (= 7.1.6)
6+
activesupport (= 7.1.6)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
99
zeitwerk (~> 2.6)
10-
actionmailbox (7.1.5.2)
11-
actionpack (= 7.1.5.2)
12-
activejob (= 7.1.5.2)
13-
activerecord (= 7.1.5.2)
14-
activestorage (= 7.1.5.2)
15-
activesupport (= 7.1.5.2)
10+
actionmailbox (7.1.6)
11+
actionpack (= 7.1.6)
12+
activejob (= 7.1.6)
13+
activerecord (= 7.1.6)
14+
activestorage (= 7.1.6)
15+
activesupport (= 7.1.6)
1616
mail (>= 2.7.1)
1717
net-imap
1818
net-pop
1919
net-smtp
20-
actionmailer (7.1.5.2)
21-
actionpack (= 7.1.5.2)
22-
actionview (= 7.1.5.2)
23-
activejob (= 7.1.5.2)
24-
activesupport (= 7.1.5.2)
20+
actionmailer (7.1.6)
21+
actionpack (= 7.1.6)
22+
actionview (= 7.1.6)
23+
activejob (= 7.1.6)
24+
activesupport (= 7.1.6)
2525
mail (~> 2.5, >= 2.5.4)
2626
net-imap
2727
net-pop
2828
net-smtp
2929
rails-dom-testing (~> 2.2)
30-
actionpack (7.1.5.2)
31-
actionview (= 7.1.5.2)
32-
activesupport (= 7.1.5.2)
30+
actionpack (7.1.6)
31+
actionview (= 7.1.6)
32+
activesupport (= 7.1.6)
33+
cgi
3334
nokogiri (>= 1.8.5)
3435
racc
3536
rack (>= 2.2.4)
3637
rack-session (>= 1.0.1)
3738
rack-test (>= 0.6.3)
3839
rails-dom-testing (~> 2.2)
3940
rails-html-sanitizer (~> 1.6)
40-
actiontext (7.1.5.2)
41-
actionpack (= 7.1.5.2)
42-
activerecord (= 7.1.5.2)
43-
activestorage (= 7.1.5.2)
44-
activesupport (= 7.1.5.2)
41+
actiontext (7.1.6)
42+
actionpack (= 7.1.6)
43+
activerecord (= 7.1.6)
44+
activestorage (= 7.1.6)
45+
activesupport (= 7.1.6)
4546
globalid (>= 0.6.0)
4647
nokogiri (>= 1.8.5)
47-
actionview (7.1.5.2)
48-
activesupport (= 7.1.5.2)
48+
actionview (7.1.6)
49+
activesupport (= 7.1.6)
4950
builder (~> 3.1)
51+
cgi
5052
erubi (~> 1.11)
5153
rails-dom-testing (~> 2.2)
5254
rails-html-sanitizer (~> 1.6)
53-
activejob (7.1.5.2)
54-
activesupport (= 7.1.5.2)
55+
activejob (7.1.6)
56+
activesupport (= 7.1.6)
5557
globalid (>= 0.3.6)
56-
activemodel (7.1.5.2)
57-
activesupport (= 7.1.5.2)
58-
activerecord (7.1.5.2)
59-
activemodel (= 7.1.5.2)
60-
activesupport (= 7.1.5.2)
58+
activemodel (7.1.6)
59+
activesupport (= 7.1.6)
60+
activerecord (7.1.6)
61+
activemodel (= 7.1.6)
62+
activesupport (= 7.1.6)
6163
timeout (>= 0.4.0)
62-
activestorage (7.1.5.2)
63-
actionpack (= 7.1.5.2)
64-
activejob (= 7.1.5.2)
65-
activerecord (= 7.1.5.2)
66-
activesupport (= 7.1.5.2)
64+
activestorage (7.1.6)
65+
actionpack (= 7.1.6)
66+
activejob (= 7.1.6)
67+
activerecord (= 7.1.6)
68+
activesupport (= 7.1.6)
6769
marcel (~> 1.0)
68-
activesupport (7.1.5.2)
70+
activesupport (7.1.6)
6971
base64
7072
benchmark (>= 0.3)
7173
bigdecimal
@@ -172,20 +174,20 @@ GEM
172174
rackup (1.0.1)
173175
rack (< 3)
174176
webrick
175-
rails (7.1.5.2)
176-
actioncable (= 7.1.5.2)
177-
actionmailbox (= 7.1.5.2)
178-
actionmailer (= 7.1.5.2)
179-
actionpack (= 7.1.5.2)
180-
actiontext (= 7.1.5.2)
181-
actionview (= 7.1.5.2)
182-
activejob (= 7.1.5.2)
183-
activemodel (= 7.1.5.2)
184-
activerecord (= 7.1.5.2)
185-
activestorage (= 7.1.5.2)
186-
activesupport (= 7.1.5.2)
177+
rails (7.1.6)
178+
actioncable (= 7.1.6)
179+
actionmailbox (= 7.1.6)
180+
actionmailer (= 7.1.6)
181+
actionpack (= 7.1.6)
182+
actiontext (= 7.1.6)
183+
actionview (= 7.1.6)
184+
activejob (= 7.1.6)
185+
activemodel (= 7.1.6)
186+
activerecord (= 7.1.6)
187+
activestorage (= 7.1.6)
188+
activesupport (= 7.1.6)
187189
bundler (>= 1.15.0)
188-
railties (= 7.1.5.2)
190+
railties (= 7.1.6)
189191
rails-dom-testing (2.3.0)
190192
activesupport (>= 5.0.0)
191193
minitest
@@ -201,13 +203,15 @@ GEM
201203
json
202204
require_all (~> 3.0)
203205
ruby-progressbar
204-
railties (7.1.5.2)
205-
actionpack (= 7.1.5.2)
206-
activesupport (= 7.1.5.2)
206+
railties (7.1.6)
207+
actionpack (= 7.1.6)
208+
activesupport (= 7.1.6)
209+
cgi
207210
irb
208211
rackup (>= 1.0.0)
209212
rake (>= 12.2)
210213
thor (~> 1.0, >= 1.2.2)
214+
tsort (>= 0.2)
211215
zeitwerk (~> 2.6)
212216
rake (13.3.0)
213217
rb-fsevent (0.11.0)
@@ -297,7 +301,7 @@ DEPENDENCIES
297301
webpacker (~> 5.0)
298302

299303
RUBY VERSION
300-
ruby 3.1.3p185
304+
ruby 3.1.7p261
301305

302306
BUNDLED WITH
303-
2.2.22
307+
2.6.9

Gemfile.next.lock

Lines changed: 60 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,68 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (7.2.2.2)
5-
actionpack (= 7.2.2.2)
6-
activesupport (= 7.2.2.2)
4+
actioncable (7.2.3)
5+
actionpack (= 7.2.3)
6+
activesupport (= 7.2.3)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
99
zeitwerk (~> 2.6)
10-
actionmailbox (7.2.2.2)
11-
actionpack (= 7.2.2.2)
12-
activejob (= 7.2.2.2)
13-
activerecord (= 7.2.2.2)
14-
activestorage (= 7.2.2.2)
15-
activesupport (= 7.2.2.2)
10+
actionmailbox (7.2.3)
11+
actionpack (= 7.2.3)
12+
activejob (= 7.2.3)
13+
activerecord (= 7.2.3)
14+
activestorage (= 7.2.3)
15+
activesupport (= 7.2.3)
1616
mail (>= 2.8.0)
17-
actionmailer (7.2.2.2)
18-
actionpack (= 7.2.2.2)
19-
actionview (= 7.2.2.2)
20-
activejob (= 7.2.2.2)
21-
activesupport (= 7.2.2.2)
17+
actionmailer (7.2.3)
18+
actionpack (= 7.2.3)
19+
actionview (= 7.2.3)
20+
activejob (= 7.2.3)
21+
activesupport (= 7.2.3)
2222
mail (>= 2.8.0)
2323
rails-dom-testing (~> 2.2)
24-
actionpack (7.2.2.2)
25-
actionview (= 7.2.2.2)
26-
activesupport (= 7.2.2.2)
24+
actionpack (7.2.3)
25+
actionview (= 7.2.3)
26+
activesupport (= 7.2.3)
27+
cgi
2728
nokogiri (>= 1.8.5)
2829
racc
29-
rack (>= 2.2.4, < 3.2)
30+
rack (>= 2.2.4, < 3.3)
3031
rack-session (>= 1.0.1)
3132
rack-test (>= 0.6.3)
3233
rails-dom-testing (~> 2.2)
3334
rails-html-sanitizer (~> 1.6)
3435
useragent (~> 0.16)
35-
actiontext (7.2.2.2)
36-
actionpack (= 7.2.2.2)
37-
activerecord (= 7.2.2.2)
38-
activestorage (= 7.2.2.2)
39-
activesupport (= 7.2.2.2)
36+
actiontext (7.2.3)
37+
actionpack (= 7.2.3)
38+
activerecord (= 7.2.3)
39+
activestorage (= 7.2.3)
40+
activesupport (= 7.2.3)
4041
globalid (>= 0.6.0)
4142
nokogiri (>= 1.8.5)
42-
actionview (7.2.2.2)
43-
activesupport (= 7.2.2.2)
43+
actionview (7.2.3)
44+
activesupport (= 7.2.3)
4445
builder (~> 3.1)
46+
cgi
4547
erubi (~> 1.11)
4648
rails-dom-testing (~> 2.2)
4749
rails-html-sanitizer (~> 1.6)
48-
activejob (7.2.2.2)
49-
activesupport (= 7.2.2.2)
50+
activejob (7.2.3)
51+
activesupport (= 7.2.3)
5052
globalid (>= 0.3.6)
51-
activemodel (7.2.2.2)
52-
activesupport (= 7.2.2.2)
53-
activerecord (7.2.2.2)
54-
activemodel (= 7.2.2.2)
55-
activesupport (= 7.2.2.2)
53+
activemodel (7.2.3)
54+
activesupport (= 7.2.3)
55+
activerecord (7.2.3)
56+
activemodel (= 7.2.3)
57+
activesupport (= 7.2.3)
5658
timeout (>= 0.4.0)
57-
activestorage (7.2.2.2)
58-
actionpack (= 7.2.2.2)
59-
activejob (= 7.2.2.2)
60-
activerecord (= 7.2.2.2)
61-
activesupport (= 7.2.2.2)
59+
activestorage (7.2.3)
60+
actionpack (= 7.2.3)
61+
activejob (= 7.2.3)
62+
activerecord (= 7.2.3)
63+
activesupport (= 7.2.3)
6264
marcel (~> 1.0)
63-
activesupport (7.2.2.2)
65+
activesupport (7.2.3)
6466
base64
6567
benchmark (>= 0.3)
6668
bigdecimal
@@ -165,20 +167,20 @@ GEM
165167
rackup (1.0.1)
166168
rack (< 3)
167169
webrick
168-
rails (7.2.2.2)
169-
actioncable (= 7.2.2.2)
170-
actionmailbox (= 7.2.2.2)
171-
actionmailer (= 7.2.2.2)
172-
actionpack (= 7.2.2.2)
173-
actiontext (= 7.2.2.2)
174-
actionview (= 7.2.2.2)
175-
activejob (= 7.2.2.2)
176-
activemodel (= 7.2.2.2)
177-
activerecord (= 7.2.2.2)
178-
activestorage (= 7.2.2.2)
179-
activesupport (= 7.2.2.2)
170+
rails (7.2.3)
171+
actioncable (= 7.2.3)
172+
actionmailbox (= 7.2.3)
173+
actionmailer (= 7.2.3)
174+
actionpack (= 7.2.3)
175+
actiontext (= 7.2.3)
176+
actionview (= 7.2.3)
177+
activejob (= 7.2.3)
178+
activemodel (= 7.2.3)
179+
activerecord (= 7.2.3)
180+
activestorage (= 7.2.3)
181+
activesupport (= 7.2.3)
180182
bundler (>= 1.15.0)
181-
railties (= 7.2.2.2)
183+
railties (= 7.2.3)
182184
rails-dom-testing (2.3.0)
183185
activesupport (>= 5.0.0)
184186
minitest
@@ -194,13 +196,15 @@ GEM
194196
json
195197
require_all (~> 3.0)
196198
ruby-progressbar
197-
railties (7.2.2.2)
198-
actionpack (= 7.2.2.2)
199-
activesupport (= 7.2.2.2)
199+
railties (7.2.3)
200+
actionpack (= 7.2.3)
201+
activesupport (= 7.2.3)
202+
cgi
200203
irb (~> 1.13)
201204
rackup (>= 1.0.0)
202205
rake (>= 12.2)
203206
thor (~> 1.0, >= 1.2.2)
207+
tsort (>= 0.2)
204208
zeitwerk (~> 2.6)
205209
rake (13.3.0)
206210
rb-fsevent (0.11.0)
@@ -291,7 +295,7 @@ DEPENDENCIES
291295
webpacker (~> 5.0)
292296

293297
RUBY VERSION
294-
ruby 3.1.3p185
298+
ruby 3.1.7p261
295299

296300
BUNDLED WITH
297-
2.2.22
301+
2.6.9

0 commit comments

Comments
 (0)