From 2c119398f2572080ccd933dd01314d04144a080e Mon Sep 17 00:00:00 2001
From: Ufuk Kayserilioglu <ufuk.kayserilioglu@shopify.com>
Date: Tue, 13 Jan 2026 01:37:51 +0200
Subject: [PATCH 1/2] Bump gem to use Ruby 4.0

---
 .github/workflows/ruby.yml | 2 +-
 .ruby-version              | 2 +-
 Gemfile.lock               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index b7892686..e4b04b60 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ruby: ["3.2", "3.3", "3.4"]
+        ruby: ["3.2", "3.3", "3.4", "4.0"]
     name: ${{ matrix.os }} ${{ matrix.ruby }}
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/.ruby-version b/.ruby-version
index e3cc07ac..fcdb2e10 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-3.4.4
+4.0.0
diff --git a/Gemfile.lock b/Gemfile.lock
index 1fe672c8..cb4834e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,7 +114,7 @@ GEM
     tsort (0.2.0)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
-    unicode-emoji (4.1.0)
+    unicode-emoji (4.2.0)
     yard (0.9.38)
     yard-sorbet (0.9.0)
       sorbet-runtime
@@ -140,4 +140,4 @@ DEPENDENCIES
   tapioca
 
 BUNDLED WITH
-   2.5.6
+  4.0.3

From dfc4eb00eb29e6d16b56b6235edfd12a2b98b5c8 Mon Sep 17 00:00:00 2001
From: Ufuk Kayserilioglu <ufuk.kayserilioglu@shopify.com>
Date: Tue, 13 Jan 2026 20:36:22 +0200
Subject: [PATCH 2/2] Fix change in Bundler behaviour in test

Since Bundler 4, when no Gemfile is found in the currect directory,
Bundler prints the usage to STDOUT, followed by the `Could not locate
Gemfile` message to STDERR.

Previously our test was expecting an empty STDOUT for this case, which
is no longer true.
---
 test/spoom/context/bundle_test.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/spoom/context/bundle_test.rb b/test/spoom/context/bundle_test.rb
index 71becd41..99fb4d02 100644
--- a/test/spoom/context/bundle_test.rb
+++ b/test/spoom/context/bundle_test.rb
@@ -37,8 +37,7 @@ def test_context_bundle_install!
         context = Context.mktmp!
 
         res = context.bundle_install!
-        assert_empty(res.out)
-        assert_equal("Could not locate Gemfile\n", res.err)
+        assert_includes(res.err, "Could not locate Gemfile")
         refute(res.status)
 
         context.write_gemfile!(<<~GEMFILE)