Fully remove compatibility guardremove_compatibility_guard

8 files changed, 2 insertions, 43 deletions

diff --git a/lib/bundler.rb b/lib/bundler.rb
index 735750f59d..10dd4f65f9 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "bundler/compatibility_guard"
-
 require_relative "bundler/vendored_fileutils"
 require "pathname"
 require "rbconfig"
diff --git a/lib/bundler/compatibility_guard.rb b/lib/bundler/compatibility_guard.rb
deleted file mode 100644
index eaff1a10d4..0000000000
--- a/lib/bundler/compatibility_guard.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-
-require_relative "version"
-
-if Bundler::VERSION.split(".").first.to_i >= 2
-  if Gem::Version.new(Object::RUBY_VERSION.dup) < Gem::Version.new("2.3")
-    abort "Bundler 2 requires Ruby 2.3 or later. Either install bundler 1 or update to a supported Ruby version."
-  end
-end
diff --git a/lib/bundler/inline.rb b/lib/bundler/inline.rb
index 317bf892ab..dbf737c7ee 100644
--- a/lib/bundler/inline.rb
+++ b/lib/bundler/inline.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "compatibility_guard"
-
 # Allows for declaring a Gemfile inline in a ruby script, optionally installing
 # any gems that aren't already installed on the user's system.
 #
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
index 614e09f746..5eed3151b3 100644
--- a/lib/bundler/shared_helpers.rb
+++ b/lib/bundler/shared_helpers.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "compatibility_guard"
-
 require "pathname"
 require "rbconfig"
 require "rubygems"
diff --git a/spec/install/bundler_spec.rb b/spec/install/bundler_spec.rb
index 85b1fdcfbb..8741a5e771 100644
--- a/spec/install/bundler_spec.rb
+++ b/spec/install/bundler_spec.rb
@@ -134,7 +134,7 @@ RSpec.describe "bundle install" do
 
       simulate_bundler_version "99999999.99.1"
 
-      bundle! "check", :env => { "BUNDLER_SPEC_IGNORE_COMPATIBILITY_GUARD" => "1" }
+      bundle! "check"
       expect(out).to include("The Gemfile's dependencies are satisfied")
     end
 
@@ -147,7 +147,7 @@ RSpec.describe "bundle install" do
 
       simulate_bundler_version "99999999.99.1"
 
-      bundle! "check", :env => { "BUNDLER_SPEC_IGNORE_COMPATIBILITY_GUARD" => "1" }
+      bundle! "check"
       expect(out).to include("The Gemfile's dependencies are satisfied")
     end
 
diff --git a/spec/lock/lockfile_spec.rb b/spec/lock/lockfile_spec.rb
index ae858f51cd..e32bb83b3d 100644
--- a/spec/lock/lockfile_spec.rb
+++ b/spec/lock/lockfile_spec.rb
@@ -3,8 +3,6 @@
 RSpec.describe "the lockfile format" do
   include Bundler::GemHelpers
 
-  before { ENV["BUNDLER_SPEC_IGNORE_COMPATIBILITY_GUARD"] = "TRUE" }
-
   it "generates a simple lockfile for a single source, gem" do
     install_gemfile <<-G
       source "#{file_uri_for(gem_repo1)}"
diff --git a/spec/other/compatibility_guard_spec.rb b/spec/other/compatibility_guard_spec.rb
deleted file mode 100644
index c72842eab5..0000000000
--- a/spec/other/compatibility_guard_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "bundler compatibility guard" do
-  context "when the bundler version is 2+" do
-    before { simulate_bundler_version "2.0.a" }
-
-    context "when running on Ruby < 2.3", :ruby => "< 2.3" do
-      before { simulate_rubygems_version "2.6.11" }
-
-      it "raises a friendly error" do
-        bundle :version
-        expect(err).to eq("Bundler 2 requires Ruby 2.3 or later. Either install bundler 1 or update to a supported Ruby version.")
-      end
-    end
-  end
-end
diff --git a/spec/support/hax.rb b/spec/support/hax.rb
index 826fbbcc0f..74daccc9db 100644
--- a/spec/support/hax.rb
+++ b/spec/support/hax.rb
@@ -59,11 +59,3 @@ class Object
     end
   end
 end
-
-if ENV["BUNDLER_SPEC_IGNORE_COMPATIBILITY_GUARD"]
-  $LOADED_FEATURES << File.expand_path("../../../bundler/compatibility_guard.rb", __FILE__)
-  $LOADED_FEATURES << File.expand_path("../../../bundler/compatibility_guard", __FILE__)
-  $LOADED_FEATURES << "bundler/compatibility_guard.rb"
-  $LOADED_FEATURES << "bundler/compatibility_guard"
-  require "bundler/compatibility_guard"
-end