From 6bc577e3d3a94ce8b54f2c01c1fec353a4419439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Wed, 3 Apr 2019 17:42:00 +0200 Subject: [PATCH] Revert "Partially restore hack" This reverts commit 303fad86c0aee91932ab26d17375bffb9801ef01. --- lib/bundler/version.rb | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index deedf9106ac..21eeeb0fd4f 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -3,24 +3,6 @@ module Bundler VERSION = "2.1.0.pre.1".freeze - if ENV["BUNDLE_SPEC_RUN"] - # We're doing this because we might write tests that deal - # with other versions of bundler and we are unsure how to - # handle this better. - def self.overwrite_loaded_gem_version - begin - require "rubygems" - rescue LoadError - return - end - return unless bundler_spec = Gem.loaded_specs["bundler"] - return if bundler_spec.version == VERSION - bundler_spec.version = Bundler::VERSION - end - private_class_method :overwrite_loaded_gem_version - overwrite_loaded_gem_version - end - def self.bundler_major_version @bundler_major_version ||= VERSION.split(".").first.to_i end