diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-12-15 08:32:54 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-12-15 10:54:09 +0900 |
| commit | 2fa9f3c0322570dfb1672b49bc1f3306ef595131 (patch) | |
| tree | bdb2889c822e634f931d27f2ca81c6192e6e5b0e /lib/bundler/dependency.rb | |
| parent | 7898f4243f5df9ead0bf91cc8c40907c559d18c0 (diff) | |
Prepare to release rubygems-3.2.1 and bundler-2.2.1
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3901
Diffstat (limited to 'lib/bundler/dependency.rb')
| -rw-r--r-- | lib/bundler/dependency.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb index 26e5f3d1a5..af07e8bc36 100644 --- a/lib/bundler/dependency.rb +++ b/lib/bundler/dependency.rb @@ -96,9 +96,11 @@ module Bundler def gem_platforms(valid_platforms) return valid_platforms if @platforms.empty? + valid_generic_platforms = valid_platforms.map {|p| [p, GemHelpers.generic(p)] }.to_h @gem_platforms ||= expanded_platforms.compact.uniq - valid_platforms & @gem_platforms + filtered_generic_platforms = valid_generic_platforms.values & @gem_platforms + valid_generic_platforms.select {|_, v| filtered_generic_platforms.include?(v) }.keys end def expanded_platforms |