Skip to content

Commit b6d82b2

Browse files
authored
Merge pull request #2219 from mroderick/upgrade-ruby
chore: Upgrade ruby to 3.4.4
2 parents 59bb832 + e3aeaee commit b6d82b2

File tree

5 files changed

+48
-10
lines changed

5 files changed

+48
-10
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.2
1+
3.4.4

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.2.2
1+
FROM ruby:3.4.4
22

33
# Default node version on apt is old. This makes sure a recent version is installed
44
# This step also runs apt-get update

Gemfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
2-
ruby '3.2.2'
2+
ruby '3.4.4'
33

44
gem 'rails', '7.0.8.1'
55
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
@@ -8,20 +8,26 @@ gem 'sprockets-rails'
88
gem 'bootsnap', require: false
99

1010
gem 'acts-as-taggable-on'
11+
gem 'benchmark' # LOCKED: Added because of activesupport 7.0
12+
gem 'bigdecimal' # LOCKED: Added because of activesupport 7.0
1113
gem 'carrierwave'
1214
gem 'cocoon'
15+
gem "csv" # LOCKED: csv was loaded from the standard library, but is not part of the default gems starting from Ruby 3.4.0. Due to config/application.rb
1316
gem 'delayed_job'
1417
gem 'delayed_job_active_record'
18+
gem 'drb' # LOCKED: Added because of pry-remote
1519
gem 'font_awesome5_rails'
1620
gem 'bootstrap', '~> 5'
1721
gem 'friendly_id'
1822
gem 'haml'
1923
gem 'high_voltage'
24+
gem 'irb' # LOCKED: Added because of byebug
2025
gem 'jquery-rails'
2126
gem 'jquery-ui-rails'
2227

2328
# Use Active Storage variant
2429
gem 'image_processing', '~> 1.2'
30+
gem 'mutex_m' # LOCKED: Added because of activesupport 7.0
2531
gem 'nokogiri'
2632
gem 'omniauth'
2733
gem 'omniauth-github'
@@ -32,6 +38,7 @@ gem 'premailer-rails'
3238

3339
gem 'pundit'
3440
gem 'rails4-autocomplete'
41+
gem 'reline' # LOCKED: Added because of readline is not part of Ruby 3.5.0
3542
gem 'rolify'
3643
# Use Sass to process CSS
3744
gem 'sassc-rails'

Gemfile.lock

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,12 @@ GEM
9292
aws-sigv4 (1.12.1)
9393
aws-eventstream (~> 1, >= 1.0.2)
9494
base64 (0.2.0)
95+
benchmark (0.4.1)
9596
better_errors (2.10.1)
9697
erubi (>= 1.0.0)
9798
rack (>= 0.9.0)
9899
rouge (>= 1.0.0)
100+
bigdecimal (3.2.2)
99101
bindex (0.8.1)
100102
binding_of_caller (1.0.1)
101103
debug_inspector (>= 1.2.0)
@@ -148,6 +150,7 @@ GEM
148150
crass (1.0.6)
149151
css_parser (1.14.0)
150152
addressable
153+
csv (3.3.5)
151154
database_cleaner (2.0.2)
152155
database_cleaner-active_record (>= 2, < 3)
153156
database_cleaner-active_record (2.1.0)
@@ -167,6 +170,9 @@ GEM
167170
dotenv-rails (3.1.0)
168171
dotenv (= 3.1.0)
169172
railties (>= 6.1)
173+
double-bag-ftps (0.1.4)
174+
drb (2.2.3)
175+
erb (5.0.2)
170176
erubi (1.13.1)
171177
execjs (2.10.0)
172178
fabrication (2.31.0)
@@ -205,6 +211,11 @@ GEM
205211
actionpack (>= 6.0.0)
206212
activesupport (>= 6.0.0)
207213
railties (>= 6.0.0)
214+
io-console (0.8.1)
215+
irb (1.15.2)
216+
pp (>= 0.6.0)
217+
rdoc (>= 4.0.0)
218+
reline (>= 0.4.2)
208219
jbuilder (2.12.0)
209220
actionview (>= 5.0.0)
210221
activesupport (>= 5.0.0)
@@ -246,6 +257,7 @@ GEM
246257
minitest (5.25.5)
247258
msgpack (1.7.5)
248259
multi_xml (0.6.0)
260+
mutex_m (0.3.0)
249261
net-http (0.4.1)
250262
uri
251263
net-imap (0.4.20)
@@ -291,6 +303,8 @@ GEM
291303
pickadate-rails (3.5.6.0)
292304
railties (>= 3.1.0)
293305
popper_js (2.11.8)
306+
pp (0.6.2)
307+
prettyprint
294308
premailer (1.21.0)
295309
addressable
296310
css_parser (>= 1.12.0)
@@ -299,6 +313,7 @@ GEM
299313
actionmailer (>= 3)
300314
net-smtp
301315
premailer (~> 1.7, >= 1.7.9)
316+
prettyprint (0.2.0)
302317
pry (0.14.2)
303318
coderay (~> 1.1)
304319
method_source (~> 1.0)
@@ -310,6 +325,9 @@ GEM
310325
pry-remote (0.1.8)
311326
pry (~> 0.9)
312327
slop (~> 3.0)
328+
psych (5.2.6)
329+
date
330+
stringio
313331
public_activity (3.0.1)
314332
actionpack (>= 6.1.0)
315333
activerecord (>= 6.1)
@@ -369,7 +387,12 @@ GEM
369387
rb-fsevent (0.11.2)
370388
rb-inotify (0.10.1)
371389
ffi (~> 1.0)
390+
rdoc (6.14.2)
391+
erb
392+
psych (>= 4.0.0)
372393
regexp_parser (2.10.0)
394+
reline (0.6.2)
395+
io-console (~> 0.5)
373396
rexml (3.4.1)
374397
rolify (6.0.1)
375398
rollbar (3.6.0)
@@ -464,6 +487,7 @@ GEM
464487
ssrf_filter (1.1.2)
465488
stimulus-rails (1.3.4)
466489
railties (>= 6.0.0)
490+
stringio (3.1.7)
467491
stripe (9.0.0)
468492
temple (0.10.3)
469493
terser (1.2.4)
@@ -504,7 +528,9 @@ PLATFORMS
504528

505529
DEPENDENCIES
506530
acts-as-taggable-on
531+
benchmark
507532
better_errors
533+
bigdecimal
508534
binding_of_caller
509535
bootsnap
510536
bootstrap (~> 5)
@@ -515,10 +541,12 @@ DEPENDENCIES
515541
chosen-rails
516542
cocoon
517543
commonmarker
544+
csv
518545
database_cleaner
519546
delayed_job
520547
delayed_job_active_record
521548
dotenv-rails
549+
drb
522550
fabrication
523551
faker
524552
faraday
@@ -530,12 +558,14 @@ DEPENDENCIES
530558
icalendar
531559
image_processing (~> 1.2)
532560
importmap-rails
561+
irb
533562
jbuilder
534563
jquery-rails
535564
jquery-ui-rails
536565
launchy
537566
letter_opener
538567
listen (~> 3.9)
568+
mutex_m
539569
nokogiri
540570
omniauth
541571
omniauth-github
@@ -555,6 +585,7 @@ DEPENDENCIES
555585
rails-html-sanitizer (~> 1.6.1)
556586
rails4-autocomplete
557587
rails_12factor
588+
reline
558589
rolify
559590
rollbar
560591
rspec-collection_matchers
@@ -580,7 +611,7 @@ DEPENDENCIES
580611
web-console (>= 4.1.0)
581612

582613
RUBY VERSION
583-
ruby 3.2.2p137
614+
ruby 3.4.4
584615

585616
BUNDLED WITH
586-
2.4.17
617+
2.6.7

native-installation-instructions.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ These are the original instructions for natively installing the app to your mach
1616

1717
## Set up a Ruby Environment
1818

19-
You will need to install Ruby 3.2.2 using RVM or rbenv.
19+
You will need to install Ruby 3.4.4 using RVM or rbenv.
2020

2121
### Option 1: Using [rvm](https://rvm.io/rvm/install)
2222

2323
```bash
24-
CPPFLAGS=-DUSE_FFI_CLOSURE_ALLOC rvm install 3.2.2
24+
CPPFLAGS=-DUSE_FFI_CLOSURE_ALLOC rvm install 3.4.4
2525
```
26-
We need to set the CPPFLAGS env variable to be able to install Ruby 3.2.2 on M1 Mac machines. See more: [https://github.com/ffi/ffi/issues/869#issuecomment-1233000037](https://github.com/ffi/ffi/issues/869#issuecomment-1233000037)
26+
We need to set the CPPFLAGS env variable to be able to install Ruby 3.4.4 on M1 Mac machines. See more: [https://github.com/ffi/ffi/issues/869#issuecomment-1233000037](https://github.com/ffi/ffi/issues/869#issuecomment-1233000037)
2727

2828
### Option 2: Using [rbenv](https://github.com/sstephenson/rbenv) and [ruby-build](https://github.com/sstephenson/ruby-build)
2929

3030
```bash
31-
rbenv install 3.2.2
32-
rbenv global 3.2.2
31+
rbenv install 3.4.4
32+
rbenv global 3.4.4
3333
```
3434

3535
## Install and run PostgreSQL

0 commit comments

Comments
 (0)