diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 9a6e71f59c9..21eeeb0fd4f 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -1,29 +1,7 @@ # frozen_string_literal: false -require_relative "rubygems_integration" - module Bundler - if Bundler.rubygems.has_bundler_version_finder? - VERSION = "2.1.0.pre.1".freeze - else - # 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. - VERSION = "2.1.0.pre.1".freeze unless defined?(::Bundler::VERSION) - - 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 + VERSION = "2.1.0.pre.1".freeze def self.bundler_major_version @bundler_major_version ||= VERSION.split(".").first.to_i