diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-12-23 08:45:19 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-12-23 10:17:41 +0900 |
commit | 339227363ce0cf967fa17efa4489d823932ddabd (patch) | |
tree | 576482ce00d03439f2dbf4714a6f309293884c2f /lib/bundler.rb | |
parent | 733ed1e18498f97250b788f169c37b170e0cf2b6 (diff) |
Merge RubyGems 3.2.3 and Bundler 2.2.3
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3982
Diffstat (limited to 'lib/bundler.rb')
-rw-r--r-- | lib/bundler.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index 7a01de5ddb..c72ad27c40 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -212,13 +212,10 @@ module Bundler end end - def locked_bundler_version - return nil unless defined?(@definition) && @definition + def most_specific_locked_platform?(platform) + return false unless defined?(@definition) && @definition - locked_gems = definition.locked_gems - return nil unless locked_gems - - locked_gems.bundler_version + definition.most_specific_locked_platform == platform end def ruby_scope |