Merge RubyGems/Bundler master

  https://github.com/rubygems/rubygems/commit/6214d00b2315ed37c76b1fbc1c72f61f92ba5a65

1 files changed, 2 insertions, 6 deletions

diff --git a/spec/bundler/support/indexes.rb b/spec/bundler/support/indexes.rb
index c496679ee6..e20059429c 100644
--- a/spec/bundler/support/indexes.rb
+++ b/spec/bundler/support/indexes.rb
@@ -16,21 +16,17 @@ module Spec
 
     def resolve(args = [])
       @platforms ||= ["ruby"]
-      deps = []
       default_source = instance_double("Bundler::Source::Rubygems", :specs => @index, :to_s => "locally install gems")
       source_requirements = { :default => default_source }
       @deps.each do |d|
         source_requirements[d.name] = d.source = default_source
-        @platforms.each do |p|
-          deps << Bundler::DepProxy.get_proxy(d, p)
-        end
       end
-      args[0] ||= [] # base
+      args[0] ||= Bundler::SpecSet.new([]) # 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
-      Bundler::Resolver.resolve(deps, source_requirements, *args)
+      Bundler::Resolver.new(source_requirements, *args).start(@deps)
     end
 
     def should_not_resolve