mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Merge bundler master from upstream.
Pick from 8dd59e3ba97eb80a599f8149f31bf40773b69dc0
This commit is contained in:
parent
6650899248
commit
8f37629519
155 changed files with 1366 additions and 1648 deletions
|
@ -1,23 +1,7 @@
|
|||
# frozen_string_literal: false
|
||||
|
||||
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 = "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
|
||||
VERSION = "2.1.0.pre.1".freeze
|
||||
|
||||
def self.bundler_major_version
|
||||
@bundler_major_version ||= VERSION.split(".").first.to_i
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue