From a9525cc507bbf2f0980caa655bfd438253e62782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Thu, 10 Aug 2023 10:25:40 +0200
Subject: [PATCH 1/2] Remove unnecessary checks

Gem activation already does this.
---
 bundler/helpers/v1/run.rb | 14 --------------
 bundler/helpers/v2/run.rb | 14 --------------
 2 files changed, 28 deletions(-)

diff --git a/bundler/helpers/v1/run.rb b/bundler/helpers/v1/run.rb
index 47852fef82a..05cc44e81ce 100644
--- a/bundler/helpers/v1/run.rb
+++ b/bundler/helpers/v1/run.rb
@@ -21,25 +21,11 @@
 
 require "functions"
 
-MAX_BUNDLER_VERSION = "2.0.0"
-
-def validate_bundler_version!
-  return true if correct_bundler_version?
-
-  raise StandardError, "Called with Bundler '#{Bundler::VERSION}', expected < '#{MAX_BUNDLER_VERSION}'"
-end
-
-def correct_bundler_version?
-  Gem::Version.new(Bundler::VERSION) < Gem::Version.new(MAX_BUNDLER_VERSION)
-end
-
 def output(obj)
   print JSON.dump(obj)
 end
 
 begin
-  validate_bundler_version!
-
   request = JSON.parse($stdin.read)
 
   function = request["function"]
diff --git a/bundler/helpers/v2/run.rb b/bundler/helpers/v2/run.rb
index a77cb839e67..2d79ee90ae5 100644
--- a/bundler/helpers/v2/run.rb
+++ b/bundler/helpers/v2/run.rb
@@ -19,25 +19,11 @@
 
 require "functions"
 
-MIN_BUNDLER_VERSION = "2.1.0"
-
-def validate_bundler_version!
-  return true if correct_bundler_version?
-
-  raise StandardError, "Called with Bundler '#{Bundler::VERSION}', expected >= '#{MIN_BUNDLER_VERSION}'"
-end
-
-def correct_bundler_version?
-  Gem::Version.new(Bundler::VERSION) >= Gem::Version.new(MIN_BUNDLER_VERSION)
-end
-
 def output(obj)
   print JSON.dump(obj)
 end
 
 begin
-  validate_bundler_version!
-
   request = JSON.parse($stdin.read)
 
   function = request["function"]

From fbdb114620108a99e52702fdd70bc5fc12d4ac52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Thu, 10 Aug 2023 10:25:59 +0200
Subject: [PATCH 2/2] Enforce Bundler 2.4

---
 bundler/helpers/v2/run.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundler/helpers/v2/run.rb b/bundler/helpers/v2/run.rb
index 2d79ee90ae5..090e6600a58 100644
--- a/bundler/helpers/v2/run.rb
+++ b/bundler/helpers/v2/run.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-gem "bundler", "~> 2.3"
+gem "bundler", "~> 2.4"
 require "bundler"
 require "json"