summaryrefslogtreecommitdiff
path: root/lib/bundler/index.rb
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2020-12-08 16:36:29 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-12-08 17:30:02 +0900
commit473f9d2df0ddd7fdb5cc73fa3ad49b2f19f22b06 (patch)
tree6b39312502d32474da0157f5d55620fabd6454ea /lib/bundler/index.rb
parent4aca77edde91f826aa243e268bf1ef5214530583 (diff)
Merge prepare version of Bundler 2.2.0
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3864
Diffstat (limited to 'lib/bundler/index.rb')
-rw-r--r--lib/bundler/index.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/bundler/index.rb b/lib/bundler/index.rb
index fa48df738c..f26f542fde 100644
--- a/lib/bundler/index.rb
+++ b/lib/bundler/index.rb
@@ -195,7 +195,11 @@ module Bundler
if base # allow all platforms when searching from a lockfile
dependency.matches_spec?(spec)
else
- dependency.matches_spec?(spec) && Gem::Platform.match(spec.platform)
+ if Gem::Platform.respond_to? :match_spec?
+ dependency.matches_spec?(spec) && Gem::Platform.match_spec?(spec)
+ else
+ dependency.matches_spec?(spec) && Gem::Platform.match(spec.platform)
+ end
end
end