diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-08-22 11:52:51 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-08-23 10:45:57 +0900 |
| commit | f69244cee8c01d82e94d38032c82be684f37808a (patch) | |
| tree | 40dc0819f3a987867788fe1f752f8088ff209004 /lib/bundler/lazy_specification.rb | |
| parent | 4790d0accdb745f9d8e605fd42eab712e4ebf834 (diff) | |
Merge rubygems/bundler HEAD
Pick from https://github.com/rubygems/rubygems/commit/6b3a5a9ab0453463381a8164efb6298ea9eb776f
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6268
Diffstat (limited to 'lib/bundler/lazy_specification.rb')
| -rw-r--r-- | lib/bundler/lazy_specification.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/lazy_specification.rb b/lib/bundler/lazy_specification.rb index 78d2c22f81..ec141cfa27 100644 --- a/lib/bundler/lazy_specification.rb +++ b/lib/bundler/lazy_specification.rb @@ -95,8 +95,8 @@ module Bundler @specification = begin search = candidates.reverse.find do |spec| spec.is_a?(StubSpecification) || - (spec.required_ruby_version.satisfied_by?(Gem.ruby_version) && - spec.required_rubygems_version.satisfied_by?(Gem.rubygems_version)) + (spec.matches_current_ruby? && + spec.matches_current_rubygems?) end if search.nil? && Bundler.frozen_bundle? search = candidates.last |