Merge pull request #574 from kg8m/ruby3_4

Support Ruby 3.4

.github/workflows/checks.yml

@@ -16,6 +16,7 @@ jobs:
         ruby-version:
           - "3.2"
           - "3.3"
+          - "3.4"
         rails-version:
           - "~> 7.0.0"
           - "~> 7.1.0"
@@ -68,7 +69,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.3"
+          ruby-version: "3.4"
           bundler-cache: true
 
       - name: RuboCop
@@ -86,7 +87,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.3"
+          ruby-version: "3.4"
           bundler-cache: true
 
       - name: Prepare for typecheck
@@ -108,7 +109,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.3"
+          ruby-version: "3.4"
           bundler-cache: true
 
       - name: Check YARD docs

.github/workflows/dependabot-autolabeling.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.3"
+          ruby-version: "3.4"
           bundler-cache: true
 
       - name: Generate token

.github/workflows/update-rbs-collection.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.3"
+          ruby-version: "3.4"
           bundler-cache: true
 
       - name: Generate token

Gemfile

@@ -16,6 +16,17 @@ else
   gem "rails", ENV.fetch("RAILS_VERSION")
 end
 
+# For Ruby 3.4+
+#
+#   warning: ... was loaded from the standard library, but is not part of the default gems starting from Ruby 3.4.0.
+#
+#   'Kernel.require': cannot load such file -- ... (LoadError)
+gem "base64"
+gem "benchmark"
+gem "bigdecimal"
+gem "drb"
+gem "mutex_m"
+
 group :development, :test do
   gem "sprockets-rails"
 

Gemfile.lock

@@ -96,9 +96,6 @@ GEM
     drb (2.2.1)
     erubi (1.13.1)
     ffi (1.17.0)
-    ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86_64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
     fileutils (1.7.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
@@ -126,6 +123,7 @@ GEM
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
     minitest (5.25.4)
+    mutex_m (0.3.0)
     net-imap (0.5.4)
       date
       net-protocol
@@ -315,7 +313,12 @@ PLATFORMS
 
 DEPENDENCIES
   addressable
+  base64
+  benchmark
+  bigdecimal
   bump
+  drb
+  mutex_m
   paint
   puma
   rails
@@ -337,4 +340,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.4.10
+   2.6.2

rbs_collection.lock.yaml

@@ -125,10 +125,6 @@ gems:
   version: '0'
   source:
     type: stdlib
-- name: dbm
-  version: '0'
-  source:
-    type: stdlib
 - name: delegate
   version: '0'
   source:
@@ -210,9 +206,9 @@ gems:
   source:
     type: stdlib
 - name: mutex_m
-  version: '0'
+  version: 0.3.0
   source:
-    type: stdlib
+    type: rubygems
 - name: net-protocol
   version: '0'
   source:
@@ -237,14 +233,6 @@ gems:
   version: '0'
   source:
     type: stdlib
-- name: pstore
-  version: '0'
-  source:
-    type: stdlib
-- name: psych
-  version: '0'
-  source:
-    type: stdlib
 - name: rack
   version: '2.2'
   source:
@@ -309,6 +297,10 @@ gems:
     revision: ccbd2bbc6be5c195df1d90aa68d64916a9e7d0ab
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
+- name: stringio
+  version: '0'
+  source:
+    type: stdlib
 - name: tempfile
   version: '0'
   source:

spec/models/tanshuku/url_spec.rb

@@ -1142,17 +1142,21 @@
 
       context "and url_options isn’t given" do
         it "raises NoMethodError due to `nil.merge`" do
-          expect { tanshuku_url.shortened_url }.to raise_error(NoMethodError, /\bundefined method `merge' for nil\b/)
+          # Error message with Ruby 3.3 or older: undefined method `merge' for nil
+          # Error message with Ruby 3.4 or newer: undefined method 'merge' for nil
+          expect { tanshuku_url.shortened_url }.to raise_error(NoMethodError, /\bundefined method [`']merge' for nil\b/)
         end
       end
 
       context "and url_options is given" do
         let(:url_options) { { host: "example.com", protocol: :https } }
 
         it "raises NoMethodError due to `nil.merge`" do
+          # Error message with Ruby 3.3 or older: undefined method `merge' for nil
+          # Error message with Ruby 3.4 or newer: undefined method 'merge' for nil
           expect { tanshuku_url.shortened_url(url_options) }.to raise_error(
             NoMethodError,
-            /\bundefined method `merge' for nil\b/
+            /\bundefined method [`']merge' for nil\b/
           )
         end
       end