diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2021-02-01 16:17:16 +0100 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-03-08 13:47:35 +0900 |
| commit | 53468cc11147b0d285fc376fc546b677dad600ca (patch) | |
| tree | eb9c97f544d089be2d324126b025b11f41a22c90 /lib/bundler.rb | |
| parent | 2ab6b7a7516e1b2c48a66ce513afabb62d101461 (diff) | |
Sync latest development version of bundler & rubygems
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4143
Diffstat (limited to 'lib/bundler.rb')
| -rw-r--r-- | lib/bundler.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index c72ad27c40..d370d8a53a 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -63,7 +63,6 @@ module Bundler autoload :Resolver, File.expand_path("bundler/resolver", __dir__) autoload :Retry, File.expand_path("bundler/retry", __dir__) autoload :RubyDsl, File.expand_path("bundler/ruby_dsl", __dir__) - autoload :RubyGemsGemInstaller, File.expand_path("bundler/rubygems_gem_installer", __dir__) autoload :RubyVersion, File.expand_path("bundler/ruby_version", __dir__) autoload :Runtime, File.expand_path("bundler/runtime", __dir__) autoload :Settings, File.expand_path("bundler/settings", __dir__) @@ -441,7 +440,7 @@ EOF end def local_platform - return Gem::Platform::RUBY if settings[:force_ruby_platform] + return Gem::Platform::RUBY if settings[:force_ruby_platform] || Gem.platforms == [Gem::Platform::RUBY] Gem::Platform.local end |