diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index 573d0621a813ed..54e25a2adc545e 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -80,8 +80,7 @@ def setup_solver def solve_versions(root:, logger:) solver = PubGrub::VersionSolver.new(source: self, root: root, logger: logger) result = solver.solve - resolved_specs = result.flat_map {|package, version| version.to_specs(package, @most_specific_locked_platform) } - resolved_specs |= @base.specs_compatible_with(SpecSet.new(resolved_specs)) + result.flat_map {|package, version| version.to_specs(package, @most_specific_locked_platform) } rescue PubGrub::SolveFailure => e incompatibility = e.incompatibility diff --git a/lib/bundler/resolver/base.rb b/lib/bundler/resolver/base.rb index 078bde0fd132fd..f7d15a30242d21 100644 --- a/lib/bundler/resolver/base.rb +++ b/lib/bundler/resolver/base.rb @@ -30,10 +30,6 @@ def initialize(source_requirements, dependencies, base, platforms, options) end end - def specs_compatible_with(result) - @base.specs_compatible_with(result) - end - def [](name) @base[name] end diff --git a/lib/bundler/spec_set.rb b/lib/bundler/spec_set.rb index abb194b808a439..b44b98c8d373b3 100644 --- a/lib/bundler/spec_set.rb +++ b/lib/bundler/spec_set.rb @@ -163,12 +163,6 @@ def find_by_name_and_platform(name, platform) @specs.detect {|spec| spec.name == name && spec.match_platform(platform) } end - def specs_compatible_with(other) - select do |spec| - other.valid?(spec) - end - end - def delete_by_name(name) @specs.reject! {|spec| spec.name == name }