Skip to content

Commit 3e2a595

Browse files
authored
Merge pull request #11344 from neinteractiveliterature/renovate/ruby-4.x
Update dependency ruby to v4
2 parents 8992dda + 6e9b115 commit 3e2a595

5 files changed

Lines changed: 21 additions & 8 deletions

File tree

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ inherit_gem:
1313

1414
AllCops:
1515
NewCops: enable
16-
TargetRubyVersion: 3.3
16+
TargetRubyVersion: 4.0
1717
ParserEngine: parser_prism
1818
Exclude:
1919
- bin/bundle

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.4.9
1+
4.0.3

Gemfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ source "https://rubygems.org"
33
ruby File.read(File.expand_path(".ruby-version", __dir__)).strip
44
gem "rails", "8.1.3"
55

6+
# benchmark was removed from Ruby's default gems in Ruby 4.0; required by mini_magick
7+
gem "benchmark"
8+
69
gem "pg"
710
gem "puma"
811

@@ -137,7 +140,7 @@ group :development do
137140
gem "debug"
138141

139142
# Linting
140-
gem "rubocop", "1.86.1"
143+
gem "rubocop"
141144
gem "rubocop-performance"
142145
gem "rubocop-rails"
143146
gem "rubocop-sequel"
@@ -191,3 +194,5 @@ gem "sentry-ruby", "~> 6.0"
191194
gem "sentry-rails", "~> 6.0"
192195

193196
gem "openssl", "~> 4.0"
197+
198+
gem "readline", "~> 0.0.4"

Gemfile.lock

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ GEM
170170
aws-eventstream (~> 1, >= 1.0.2)
171171
base64 (0.3.0)
172172
bcrypt (3.1.22)
173+
benchmark (0.5.0)
173174
benchmark-ips (2.14.0)
174175
bigdecimal (4.1.2)
175176
bootsnap (1.24.3)
@@ -530,6 +531,8 @@ GEM
530531
erb
531532
psych (>= 4.0.0)
532533
tsort
534+
readline (0.0.4)
535+
reline
533536
recaptcha (5.21.2)
534537
redcarpet (3.6.1)
535538
regexp_parser (2.12.0)
@@ -603,7 +606,6 @@ GEM
603606
logger
604607
sequel (5.104.0)
605608
bigdecimal
606-
set (1.0.3)
607609
shoryuken (6.2.1)
608610
aws-sdk-core (>= 2)
609611
concurrent-ruby
@@ -621,9 +623,8 @@ GEM
621623
skylight (7.1.1)
622624
activesupport (>= 7.2.0)
623625
slop (3.6.0)
624-
sorted_set (1.0.3)
626+
sorted_set (1.1.0)
625627
rbtree
626-
set (~> 1.0)
627628
sprockets (4.2.1)
628629
concurrent-ruby (~> 1.0)
629630
rack (>= 2.2.4, < 4)
@@ -689,6 +690,7 @@ GEM
689690
zeitwerk (2.7.5)
690691

691692
PLATFORMS
693+
arm64-darwin-23
692694
arm64-darwin-24
693695
arm64-darwin-25
694696
x86_64-linux
@@ -705,6 +707,7 @@ DEPENDENCIES
705707
aws-sdk-ses
706708
aws-sdk-sns
707709
aws-sdk-sqs
710+
benchmark
708711
bootsnap (>= 1.1.0)
709712
browser
710713
business_time
@@ -768,11 +771,12 @@ DEPENDENCIES
768771
rails (= 8.1.3)
769772
rails-controller-testing
770773
rbtrace
774+
readline (~> 0.0.4)
771775
recaptcha
772776
redcarpet
773777
reverse_markdown
774778
rollbar
775-
rubocop (= 1.86.1)
779+
rubocop
776780
rubocop-capybara
777781
rubocop-factory_bot
778782
rubocop-graphql
@@ -805,7 +809,7 @@ DEPENDENCIES
805809
yard
806810

807811
RUBY VERSION
808-
ruby 3.4.9p82
812+
ruby 4.0.3p0
809813

810814
BUNDLED WITH
811815
2.6.2

config/application.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010

1111
module Intercode
1212
class Application < Rails::Application
13+
# Ruby 4.0 + Zeitwerk reentrant loading bug causes active_storage engine to initialize
14+
# incompletely, leaving queues as nil. Initialize it before load_defaults runs.
15+
config.active_storage.queues = ActiveSupport::InheritableOptions.new if config.active_storage.queues.nil?
16+
1317
config.load_defaults 7.1
1418

1519
# Please, add to the `ignore` list any other `lib` subdirectories that do

0 commit comments

Comments
 (0)