From 93d71eef0b93b13d8efc16fa9b7efb38183c3083 Mon Sep 17 00:00:00 2001
From: Peter Solnica <peter@solnica.online>
Date: Wed, 20 Aug 2025 11:39:36 +0000
Subject: [PATCH 1/2] Update Gemfile.dev

---
 Gemfile.dev          | 22 ++++++++++++++++++++--
 sentry-rails/Gemfile |  1 +
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Gemfile.dev b/Gemfile.dev
index 80f2b8920..b111282fb 100644
--- a/Gemfile.dev
+++ b/Gemfile.dev
@@ -20,12 +20,30 @@ if RUBY_VERSION >= "3.5"
   gem "cgi"
 end
 
+if RUBY_VERSION >= "3.4"
+  gem "drb"
+  gem "mutex_m"
+  gem "benchmark"
+  gem "base64"
+  gem "ostruct"
+end
+
 # For RSpec
 gem "rspec", "~> 3.0"
 gem "rspec-retry"
+
+# Coverage
 gem "simplecov"
-gem "simplecov-cobertura", "~> 1.4"
-gem "rexml"
+
+# Do not change it without checking that `CI=true COVERAGE=true bundle exec rake` passes
+# in all projects
+if RUBY_VERSION >= "2.5.0"
+  gem "rexml", "3.4.1"
+  gem "simplecov-cobertura", "~> 3.0"
+else
+  gem "rexml", "3.2.5"
+  gem "simplecov-cobertura", "~> 1.4.0"
+end
 
 if ruby_version >= Gem::Version.new("3.4")
   gem "ostruct"
diff --git a/sentry-rails/Gemfile b/sentry-rails/Gemfile
index 6008cdf49..0bdcf787f 100644
--- a/sentry-rails/Gemfile
+++ b/sentry-rails/Gemfile
@@ -47,6 +47,7 @@ elsif rails_version >= Gem::Version.new("6.1.0")
     gem "sqlite3", "~> 1.6.9", platform: :ruby
   end
 else
+  gem "psych", "~> 3.0.0"
   gem "rspec-rails", "~> 4.0"
   gem "psych", "~> 3.0.0"
 

From e779cdb24963e59fc5cf69a508cf233703a73b7f Mon Sep 17 00:00:00 2001
From: Peter Solnica <peter@solnica.online>
Date: Tue, 26 Aug 2025 11:35:15 +0000
Subject: [PATCH 2/2] Clean up Gemfile.dev

---
 Gemfile.dev | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/Gemfile.dev b/Gemfile.dev
index b111282fb..4280e09b7 100644
--- a/Gemfile.dev
+++ b/Gemfile.dev
@@ -13,14 +13,13 @@ ruby_version = Gem::Version.new(RUBY_VERSION)
 if ruby_version >= Gem::Version.new("2.7.0")
   gem "debug", github: "ruby/debug", platform: :ruby
   gem "irb"
-  gem "ruby-lsp-rspec" if ruby_version >= Gem::Version.new("3.0.0") && RUBY_PLATFORM != "java"
 end
 
-if RUBY_VERSION >= "3.5"
+if ruby_version >= Gem::Version.new("2.5")
   gem "cgi"
 end
 
-if RUBY_VERSION >= "3.4"
+if ruby_version >= Gem::Version.new("3.4")
   gem "drb"
   gem "mutex_m"
   gem "benchmark"
@@ -28,16 +27,20 @@ if RUBY_VERSION >= "3.4"
   gem "ostruct"
 end
 
-# For RSpec
-gem "rspec", "~> 3.0"
+# RSpec
+gem "rspec"
 gem "rspec-retry"
 
+if ruby_version >= Gem::Version.new("3.0") && RUBY_PLATFORM != "java"
+  gem "ruby-lsp-rspec"
+end
+
 # Coverage
 gem "simplecov"
 
-# Do not change it without checking that `CI=true COVERAGE=true bundle exec rake` passes
-# in all projects
-if RUBY_VERSION >= "2.5.0"
+# Do not change it without checking that `CI=true COVERAGE=true bundle exec rake`
+# passes in all projects
+if ruby_version >= Gem::Version.new("2.5")
   gem "rexml", "3.4.1"
   gem "simplecov-cobertura", "~> 3.0"
 else
@@ -45,10 +48,6 @@ else
   gem "simplecov-cobertura", "~> 1.4.0"
 end
 
-if ruby_version >= Gem::Version.new("3.4")
-  gem "ostruct"
-end
-
 group :rubocop do
   gem "rubocop-rails-omakase"
   gem "rubocop-packaging"