1 files changed, 13 insertions, 20 deletions
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index c2355ff2c8..ca7bb0719a 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -1,28 +1,21 @@
 # frozen_string_literal: false
 
-# Ruby 1.9.3 and old RubyGems don't play nice with frozen version strings
-# rubocop:disable MutableConstant
-
 module Bundler
-  # 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 = "1.16.0" unless defined?(::Bundler::VERSION)
+  VERSION = "4.1.0.dev".freeze
 
-  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
+  def self.bundler_major_version
+    @bundler_major_version ||= gem_version.segments.first
   end
-  private_class_method :overwrite_loaded_gem_version
-  overwrite_loaded_gem_version
 
-  def self.bundler_major_version
-    @bundler_major_version ||= VERSION.split(".").first.to_i
+  def self.gem_version
+    @gem_version ||= Gem::Version.create(VERSION)
+  end
+
+  def self.verbose_version
+    @verbose_version ||= "#{VERSION}#{simulated_version ? " (simulating Bundler #{simulated_version})" : ""}"
+  end
+
+  def self.simulated_version
+    @simulated_version ||= Bundler.settings[:simulate_version]
   end
 end