From 339227363ce0cf967fa17efa4489d823932ddabd Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 23 Dec 2020 08:45:19 +0900 Subject: Merge RubyGems 3.2.3 and Bundler 2.2.3 --- lib/rubygems/resolver.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/rubygems/resolver.rb') diff --git a/lib/rubygems/resolver.rb b/lib/rubygems/resolver.rb index e1c0d2dd0a..71c35ea3d3 100644 --- a/lib/rubygems/resolver.rb +++ b/lib/rubygems/resolver.rb @@ -261,7 +261,12 @@ class Gem::Resolver end def requirement_satisfied_by?(requirement, activated, spec) - requirement.matches_spec? spec + matches_spec = requirement.matches_spec? spec + return matches_spec if @soft_missing + + matches_spec && + spec.spec.required_ruby_version.satisfied_by?(Gem.ruby_version) && + spec.spec.required_rubygems_version.satisfied_by?(Gem.rubygems_version) end def name_for(dependency) -- cgit v1.2.3