diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-04-28 17:15:43 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-04-28 19:08:49 +0900 |
commit | 1056489ea3e1c3f201936666b2725bfc142bb0f2 (patch) | |
tree | cc993148b660f7cc2d92823ccfafcf10d3009c0a /lib/bundler/definition.rb | |
parent | cd2410f9d8c99fd0fbb232eb5f195188fbfc122f (diff) |
Merge https://github.com/rubygems/rubygems/commit/3f7d0352e84b29d4a2d4cd93b31e5ebdb5f79cc6
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/5669
Diffstat (limited to 'lib/bundler/definition.rb')
-rw-r--r-- | lib/bundler/definition.rb | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 09be2db68c..c1d865d049 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -736,30 +736,13 @@ module Bundler def metadata_dependencies @metadata_dependencies ||= begin - ruby_versions = ruby_version_requirements(@ruby_version) [ - Dependency.new("Ruby\0", ruby_versions), + Dependency.new("Ruby\0", RubyVersion.system.gem_version), Dependency.new("RubyGems\0", Gem::VERSION), ] end end - def ruby_version_requirements(ruby_version) - return [] unless ruby_version - if ruby_version.patchlevel - [ruby_version.to_gem_version_with_patchlevel] - else - ruby_version.versions.map do |version| - requirement = Gem::Requirement.new(version) - if requirement.exact? - "~> #{version}.0" - else - requirement - end - end - end - end - def expand_dependencies(dependencies, remote = false) deps = [] dependencies.each do |dep| |