summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2024-11-14 22:03:46 +0100
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2024-11-26 15:11:05 +0900
commit2b91a56d40f384de8dcdfb334e996f2ff058f6e7 (patch)
treea01363bc99be1c26a4566e9d5c3415d339464170 /lib
parent10de74b75b8e74b2758f806d18522b096dc60c16 (diff)
[rubygems/rubygems] Remove no longer necessary code
https://github.com/rubygems/rubygems/commit/9ea1539b08
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/resolver.rb3
-rw-r--r--lib/bundler/resolver/base.rb4
-rw-r--r--lib/bundler/spec_set.rb6
3 files changed, 1 insertions, 12 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index 573d0621a8..54e25a2adc 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -80,8 +80,7 @@ module Bundler
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 078bde0fd1..f7d15a3024 100644
--- a/lib/bundler/resolver/base.rb
+++ b/lib/bundler/resolver/base.rb
@@ -30,10 +30,6 @@ module Bundler
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 abb194b808..b44b98c8d3 100644
--- a/lib/bundler/spec_set.rb
+++ b/lib/bundler/spec_set.rb
@@ -163,12 +163,6 @@ module Bundler
@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 }