Skip to content

Commit 2f16119

Browse files
rishijainrishijain
authored
Ruby upgrade to 3.1.0 (#269)
* upgraded ruby to 3.1.0 * added matrix gem for ruby 3.1 and updated gemfile.lock and gemfile.next.lock * used rails 7-0-stable instead of main to live with a bug with ruby 3.1 and rails 7
1 parent 62db6d9 commit 2f16119

5 files changed

Lines changed: 96 additions & 65 deletions

File tree

‎.github/workflows/tests-next.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Setup Ruby
3636
uses: ruby/setup-ruby@v1
3737
with:
38-
ruby-version: "3.0.2"
38+
ruby-version: "3.1.0"
3939

4040
- name: Build App
4141
run: |

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Setup Ruby
3636
uses: ruby/setup-ruby@v1
3737
with:
38-
ruby-version: "3.0.2"
38+
ruby-version: "3.1.0"
3939
bundler-cache: true
4040

4141
- name: Build App

‎Gemfile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,19 @@ def next?
44
File.basename(__FILE__) == "Gemfile.next"
55
end
66

7-
ruby "3.0.2"
7+
ruby "3.1.0"
88

99
git_source(:github) do |repo_name|
1010
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
1111
"https://github.com/#{repo_name}.git"
1212
end
1313

1414
if next?
15-
gem "rails", github: "rails/rails", branch: "main"
15+
# using the 7-0-stable branch for the time being until the fix is merged into main
16+
# to make it work with ruby 3.1
17+
# read more about it here: https://github.com/rails/rails/issues/43998,
18+
# and here: https://gist.github.com/claudiug/bdc2fb70b10d19513208c816588aed92
19+
gem "rails", github: "rails/rails", branch: "7-0-stable"
1620
gem "devise", github: "heartcombo/devise", branch: "main"
1721
else
1822
gem "rails", "~> 7.0.2"
@@ -32,6 +36,7 @@ gem "sass-rails", "~> 5.0"
3236
gem "uglifier", ">= 1.3.0"
3337

3438
gem "bourbon"
39+
gem "matrix"
3540

3641
# See https://github.com/rails/execjs#readme for more supported runtimes
3742
# gem 'therubyracer', platforms: :ruby

‎Gemfile.lock‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@ DEPENDENCIES
403403
jquery-rails
404404
jquery-ui-rails (~> 5.0, >= 5.0.5)
405405
listen (~> 3.7)
406+
matrix
406407
mimemagic (~> 0.3.8)
407408
newrelic_rpm
408409
next_rails
@@ -429,7 +430,7 @@ DEPENDENCIES
429430
webdrivers
430431

431432
RUBY VERSION
432-
ruby 3.0.2p107
433+
ruby 3.1.0p0
433434

434435
BUNDLED WITH
435436
2.2.26

‎Gemfile.next.lock‎

Lines changed: 85 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -12,85 +12,91 @@ GIT
1212

1313
GIT
1414
remote: https://github.com/rails/rails.git
15-
revision: 2a32c4b679a7fdc370d2f635c5285e4a4f161390
16-
branch: main
15+
revision: 4987ca0f553c763a2ad00b0554999f847edf7c4e
16+
branch: 7-0-stable
1717
specs:
18-
actioncable (7.0.0.alpha2)
19-
actionpack (= 7.0.0.alpha2)
20-
activesupport (= 7.0.0.alpha2)
18+
actioncable (7.0.3.1)
19+
actionpack (= 7.0.3.1)
20+
activesupport (= 7.0.3.1)
2121
nio4r (~> 2.0)
2222
websocket-driver (>= 0.6.1)
23-
actionmailbox (7.0.0.alpha2)
24-
actionpack (= 7.0.0.alpha2)
25-
activejob (= 7.0.0.alpha2)
26-
activerecord (= 7.0.0.alpha2)
27-
activestorage (= 7.0.0.alpha2)
28-
activesupport (= 7.0.0.alpha2)
23+
actionmailbox (7.0.3.1)
24+
actionpack (= 7.0.3.1)
25+
activejob (= 7.0.3.1)
26+
activerecord (= 7.0.3.1)
27+
activestorage (= 7.0.3.1)
28+
activesupport (= 7.0.3.1)
2929
mail (>= 2.7.1)
30-
actionmailer (7.0.0.alpha2)
31-
actionpack (= 7.0.0.alpha2)
32-
actionview (= 7.0.0.alpha2)
33-
activejob (= 7.0.0.alpha2)
34-
activesupport (= 7.0.0.alpha2)
30+
net-imap
31+
net-pop
32+
net-smtp
33+
actionmailer (7.0.3.1)
34+
actionpack (= 7.0.3.1)
35+
actionview (= 7.0.3.1)
36+
activejob (= 7.0.3.1)
37+
activesupport (= 7.0.3.1)
3538
mail (~> 2.5, >= 2.5.4)
39+
net-imap
40+
net-pop
41+
net-smtp
3642
rails-dom-testing (~> 2.0)
37-
actionpack (7.0.0.alpha2)
38-
actionview (= 7.0.0.alpha2)
39-
activesupport (= 7.0.0.alpha2)
43+
actionpack (7.0.3.1)
44+
actionview (= 7.0.3.1)
45+
activesupport (= 7.0.3.1)
4046
rack (~> 2.0, >= 2.2.0)
4147
rack-test (>= 0.6.3)
4248
rails-dom-testing (~> 2.0)
4349
rails-html-sanitizer (~> 1.0, >= 1.2.0)
44-
actiontext (7.0.0.alpha2)
45-
actionpack (= 7.0.0.alpha2)
46-
activerecord (= 7.0.0.alpha2)
47-
activestorage (= 7.0.0.alpha2)
48-
activesupport (= 7.0.0.alpha2)
50+
actiontext (7.0.3.1)
51+
actionpack (= 7.0.3.1)
52+
activerecord (= 7.0.3.1)
53+
activestorage (= 7.0.3.1)
54+
activesupport (= 7.0.3.1)
4955
globalid (>= 0.6.0)
5056
nokogiri (>= 1.8.5)
51-
actionview (7.0.0.alpha2)
52-
activesupport (= 7.0.0.alpha2)
57+
actionview (7.0.3.1)
58+
activesupport (= 7.0.3.1)
5359
builder (~> 3.1)
5460
erubi (~> 1.4)
5561
rails-dom-testing (~> 2.0)
5662
rails-html-sanitizer (~> 1.1, >= 1.2.0)
57-
activejob (7.0.0.alpha2)
58-
activesupport (= 7.0.0.alpha2)
63+
activejob (7.0.3.1)
64+
activesupport (= 7.0.3.1)
5965
globalid (>= 0.3.6)
60-
activemodel (7.0.0.alpha2)
61-
activesupport (= 7.0.0.alpha2)
62-
activerecord (7.0.0.alpha2)
63-
activemodel (= 7.0.0.alpha2)
64-
activesupport (= 7.0.0.alpha2)
65-
activestorage (7.0.0.alpha2)
66-
actionpack (= 7.0.0.alpha2)
67-
activejob (= 7.0.0.alpha2)
68-
activerecord (= 7.0.0.alpha2)
69-
activesupport (= 7.0.0.alpha2)
66+
activemodel (7.0.3.1)
67+
activesupport (= 7.0.3.1)
68+
activerecord (7.0.3.1)
69+
activemodel (= 7.0.3.1)
70+
activesupport (= 7.0.3.1)
71+
activestorage (7.0.3.1)
72+
actionpack (= 7.0.3.1)
73+
activejob (= 7.0.3.1)
74+
activerecord (= 7.0.3.1)
75+
activesupport (= 7.0.3.1)
7076
marcel (~> 1.0)
7177
mini_mime (>= 1.1.0)
72-
activesupport (7.0.0.alpha2)
78+
activesupport (7.0.3.1)
7379
concurrent-ruby (~> 1.0, >= 1.0.2)
7480
i18n (>= 1.6, < 2)
7581
minitest (>= 5.1)
7682
tzinfo (~> 2.0)
77-
rails (7.0.0.alpha2)
78-
actioncable (= 7.0.0.alpha2)
79-
actionmailbox (= 7.0.0.alpha2)
80-
actionmailer (= 7.0.0.alpha2)
81-
actionpack (= 7.0.0.alpha2)
82-
actiontext (= 7.0.0.alpha2)
83-
actionview (= 7.0.0.alpha2)
84-
activejob (= 7.0.0.alpha2)
85-
activemodel (= 7.0.0.alpha2)
86-
activerecord (= 7.0.0.alpha2)
87-
activestorage (= 7.0.0.alpha2)
88-
activesupport (= 7.0.0.alpha2)
83+
rails (7.0.3.1)
84+
actioncable (= 7.0.3.1)
85+
actionmailbox (= 7.0.3.1)
86+
actionmailer (= 7.0.3.1)
87+
actionpack (= 7.0.3.1)
88+
actiontext (= 7.0.3.1)
89+
actionview (= 7.0.3.1)
90+
activejob (= 7.0.3.1)
91+
activemodel (= 7.0.3.1)
92+
activerecord (= 7.0.3.1)
93+
activestorage (= 7.0.3.1)
94+
activesupport (= 7.0.3.1)
8995
bundler (>= 1.15.0)
90-
railties (= 7.0.0.alpha2)
91-
railties (7.0.0.alpha2)
92-
actionpack (= 7.0.0.alpha2)
93-
activesupport (= 7.0.0.alpha2)
96+
railties (= 7.0.3.1)
97+
railties (7.0.3.1)
98+
actionpack (= 7.0.3.1)
99+
activesupport (= 7.0.3.1)
94100
method_source
95101
rake (>= 12.2)
96102
thor (~> 1.0)
@@ -150,6 +156,7 @@ GEM
150156
database_cleaner-core (~> 2.0.0)
151157
database_cleaner-core (2.0.1)
152158
diff-lcs (1.4.4)
159+
digest (3.1.0)
153160
docile (1.4.0)
154161
dotenv (2.7.6)
155162
dotenv-rails (2.7.6)
@@ -203,22 +210,37 @@ GEM
203210
listen (3.7.0)
204211
rb-fsevent (~> 0.10, >= 0.10.3)
205212
rb-inotify (~> 0.9, >= 0.9.10)
206-
loofah (2.12.0)
213+
loofah (2.18.0)
207214
crass (~> 1.0.2)
208215
nokogiri (>= 1.5.9)
209216
mail (2.7.1)
210217
mini_mime (>= 0.1.1)
211218
marcel (1.0.2)
219+
matrix (0.4.2)
212220
method_source (1.0.0)
213221
mimemagic (0.3.10)
214222
nokogiri (~> 1)
215223
rake
216224
mini_mime (1.1.2)
217225
mini_portile2 (2.6.1)
218-
minitest (5.14.4)
226+
minitest (5.16.2)
219227
multi_json (1.15.0)
220228
multi_xml (0.6.0)
221229
multipart-post (2.1.1)
230+
net-imap (0.2.3)
231+
digest
232+
net-protocol
233+
strscan
234+
net-pop (0.1.1)
235+
digest
236+
net-protocol
237+
timeout
238+
net-protocol (0.1.3)
239+
timeout
240+
net-smtp (0.3.1)
241+
digest
242+
net-protocol
243+
timeout
222244
newrelic_rpm (8.8.0)
223245
next_rails (1.0.4)
224246
colorize (>= 0.8.1)
@@ -270,7 +292,7 @@ GEM
270292
rails-dom-testing (2.0.3)
271293
activesupport (>= 4.2.0)
272294
nokogiri (>= 1.6)
273-
rails-html-sanitizer (1.4.2)
295+
rails-html-sanitizer (1.4.3)
274296
loofah (~> 2.3)
275297
rainbow (3.0.0)
276298
rake (13.0.6)
@@ -355,8 +377,10 @@ GEM
355377
rubocop-performance (= 1.11.5)
356378
standardrb (1.0.0)
357379
standard
380+
strscan (3.0.3)
358381
thor (1.1.0)
359382
tilt (2.0.10)
383+
timeout (0.3.0)
360384
turbolinks (5.2.1)
361385
turbolinks-source (~> 5.2)
362386
turbolinks-source (5.2.0)
@@ -381,7 +405,7 @@ GEM
381405
websocket-extensions (0.1.5)
382406
xpath (3.2.0)
383407
nokogiri (~> 1.8)
384-
zeitwerk (2.5.1)
408+
zeitwerk (2.6.0)
385409

386410
PLATFORMS
387411
ruby
@@ -404,6 +428,7 @@ DEPENDENCIES
404428
jquery-rails
405429
jquery-ui-rails (~> 5.0, >= 5.0.5)
406430
listen (~> 3.7)
431+
matrix
407432
mimemagic (~> 0.3.8)
408433
newrelic_rpm
409434
next_rails
@@ -430,7 +455,7 @@ DEPENDENCIES
430455
webdrivers
431456

432457
RUBY VERSION
433-
ruby 3.0.2p107
458+
ruby 3.1.0p0
434459

435460
BUNDLED WITH
436461
2.2.22

0 commit comments

Comments
 (0)