Fully remove compatibility guard

rubygems · Jul 9, 2019 · 2a7a5da · 2a7a5da
1 parent c17f247
commit 2a7a5da
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 43 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -134,7 +134,7 @@
 
       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 @@
 
       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
@@ -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
diff --git 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