diff options
| author | Sutou Kouhei <kou@clear-code.com> | 2020-01-05 07:23:05 +0900 |
|---|---|---|
| committer | Sutou Kouhei <kou@clear-code.com> | 2020-01-15 06:27:03 +0900 |
| commit | 2a374012d4d977905b01fb0d789375e274d1be13 (patch) | |
| tree | a24c3a923c3e3d6851ef2bfee4b105f72c67ac97 /lib | |
| parent | 13f5a8a72090727e55ec789f44a1820ad61069d3 (diff) | |
| download | bundler-2a374012d4d977905b01fb0d789375e274d1be13.tar.gz | |
Don't set platforms to dependency registered by gemspec
Platform related dependencies are resolved in Resolver now. So we
don't need to register all available platforms explicitly.
This reverts commit 0a8ca4879e0b79aa4109a0dc424940b079ef38d0.
See also: #4150 and #4102
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/definition.rb | 3 | ||||
| -rw-r--r-- | lib/bundler/dependency.rb | 9 | ||||
| -rw-r--r-- | lib/bundler/dsl.rb | 3 |
3 files changed, 1 insertions, 14 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index d6fbb0b5b7..a5780d3b2a 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -706,9 +706,6 @@ module Bundler elsif dep.source dep.source = sources.get(dep.source) end - if dep.source.is_a?(Source::Gemspec) - dep.platforms.concat(@platforms.map {|p| Dependency::REVERSE_PLATFORM_MAP[p] }.flatten(1)).uniq! - end end changes = false diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb index 6c2642163e..26e5f3d1a5 100644 --- a/lib/bundler/dependency.rb +++ b/lib/bundler/dependency.rb @@ -74,15 +74,6 @@ module Bundler :x64_mingw_26 => Gem::Platform::X64_MINGW, }.freeze - REVERSE_PLATFORM_MAP = {}.tap do |reverse_platform_map| - PLATFORM_MAP.each do |key, value| - reverse_platform_map[value] ||= [] - reverse_platform_map[value] << key - end - - reverse_platform_map.each {|_, platforms| platforms.freeze } - end.freeze - def initialize(name, version, options = {}, &blk) type = options["type"] || :runtime super(name, version, type) diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb index 99a369281a..bb92a28381 100644 --- a/lib/bundler/dsl.rb +++ b/lib/bundler/dsl.rb @@ -75,8 +75,7 @@ module Bundler @gemspecs << spec - gem_platforms = Bundler::Dependency::REVERSE_PLATFORM_MAP[Bundler::GemHelpers.generic_local_platform] - gem spec.name, :name => spec.name, :path => path, :glob => glob, :platforms => gem_platforms + gem spec.name, :name => spec.name, :path => path, :glob => glob group(development_group) do spec.development_dependencies.each do |dep| |