lib/bundler/patch/conservative_definition.rb in bundler-patch-0.10.3 vs lib/bundler/patch/conservative_definition.rb in bundler-patch-0.10.4

@@ -14,18 +14,24 @@
         if Bundler.settings[:frozen] || (!@unlocking && nothing_changed?)
           last_resolve
         else
           # Run a resolve against the locally available gems
           base = last_resolve.is_a?(Bundler::SpecSet) ? Bundler::SpecSet.new(last_resolve) : []
-          if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('1.13.0.rc.2')
+          bundler_version = Gem::Version.new(Bundler::VERSION)
+          if bundler_version >= Gem::Version.new('1.13.0.rc.2')
             require 'bundler/patch/gem_version_patch_promoter'
 
             gvpp = Bundler::Patch::GemVersionPatchPromoter.new(@gem_version_promoter.locked_specs, @gem_version_promoter.unlock_gems)
             gvpp.level = @minor_preferred ? :minor : :patch
             gvpp.strict = @strict
             gvpp.minimal = @prefer_minimal
             gvpp.gems_to_update = @gems_to_update
-            resolver = Bundler::Resolver.new(index, source_requirements, base, nil, gvpp, additional_base_requirements_for_resolve)
+
+            if bundler_version >= Gem::Version.new('1.14.0.rc.1')
+              resolver = Bundler::Resolver.new(index, source_requirements, base, gvpp, additional_base_requirements_for_resolve, platforms)
+            else
+              resolver = Bundler::Resolver.new(index, source_requirements, base, nil, gvpp, additional_base_requirements_for_resolve)
+            end
           else
             resolver = ConservativeResolver.new(index, source_requirements, base)
             locked_specs = if @unlocking && @locked_specs.length == 0
                              # Have to grab these again. Default behavior is to not store any
                              # locked_specs if updating all gems, because behavior is the same