diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/definition.rb | 7 | ||||
| -rw-r--r-- | lib/bundler/resolver.rb | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 66efd82b53..8bd9e11f32 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -484,15 +484,13 @@ module Bundler def resolver @resolver ||= begin last_resolve = converge_locked_specs + remove_ruby_from_platforms_if_necessary!(dependencies) Resolver.new(source_requirements, last_resolve, gem_version_promoter, additional_base_requirements_for_resolve, platforms) end end def expanded_dependencies - @expanded_dependencies ||= begin - remove_ruby_from_platforms_if_necessary!(dependencies) - expand_dependencies(dependencies + metadata_dependencies, true) - end + @expanded_dependencies ||= expand_dependencies(dependencies + metadata_dependencies, true) end def filter_specs(specs, deps) @@ -896,7 +894,6 @@ module Bundler remove_platform(Gem::Platform::RUBY) add_current_platform - resolver.platforms = @platforms end def source_map diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index e382319112..a74af45027 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -7,8 +7,6 @@ module Bundler include GemHelpers - attr_writer :platforms - # Figures out the best possible configuration of gems that satisfies # the list of passed dependencies and any child dependencies without # causing any gem activation errors. |