diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-07-26 13:43:48 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-07-26 14:38:17 +0900 |
| commit | 9e6d07f3462d29f340114650da9f13a36b866d5f (patch) | |
| tree | 1b347705d94dc8a6f2df99372d10e3f0946ef0c0 /spec/bundler/support | |
| parent | b404a5f106d13e25708c163c91e117b2e106b70c (diff) | |
Merge rubygems/bundler HEAD
Merge from https://github.com/rubygems/rubygems/commit/2af2520b4a7ab1c6eb1fdc3d2ef4d8c062d96ad7
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6184
Diffstat (limited to 'spec/bundler/support')
| -rw-r--r-- | spec/bundler/support/builders.rb | 4 | ||||
| -rw-r--r-- | spec/bundler/support/indexes.rb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/spec/bundler/support/builders.rb b/spec/bundler/support/builders.rb index 285b68c047..2397d74010 100644 --- a/spec/bundler/support/builders.rb +++ b/spec/bundler/support/builders.rb @@ -94,8 +94,8 @@ module Spec end build_gem "platform_specific" do |s| - s.platform = Bundler.local_platform - s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0.0 #{Bundler.local_platform}'" + s.platform = Gem::Platform.local + s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0.0 #{Gem::Platform.local}'" end build_gem "platform_specific" do |s| diff --git a/spec/bundler/support/indexes.rb b/spec/bundler/support/indexes.rb index 638f394e76..55d798a90a 100644 --- a/spec/bundler/support/indexes.rb +++ b/spec/bundler/support/indexes.rb @@ -26,6 +26,7 @@ module Spec end end args[0] ||= [] # base + args[0].each {|ls| ls.source = default_source } args[1] ||= Bundler::GemVersionPromoter.new # gem_version_promoter args[2] ||= [] # additional_base_requirements args[3] ||= @platforms # platforms |