diff --git a/Dockerfile b/Dockerfile index 13cf05a9736..56e505bc2e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,7 +74,7 @@ ARG RUBY_INSTALL_VERSION=0.8.3 ARG RUBYGEMS_SYSTEM_VERSION=3.2.20 ARG BUNDLER_V1_VERSION=1.17.3 -ARG BUNDLER_V2_VERSION=2.3.14 +ARG BUNDLER_V2_VERSION=2.3.22 ENV BUNDLE_SILENCE_ROOT_WARNING=1 # Allow gem installs as the dependabot user ENV BUNDLE_PATH=".bundle" \ diff --git a/bundler/helpers/v2/lib/functions/version_resolver.rb b/bundler/helpers/v2/lib/functions/version_resolver.rb index c11931496fb..383eed7851e 100644 --- a/bundler/helpers/v2/lib/functions/version_resolver.rb +++ b/bundler/helpers/v2/lib/functions/version_resolver.rb @@ -16,6 +16,11 @@ def initialize(dependency_name:, dependency_requirements:, end def version_details + # If the dependency is Bundler itself then we can't trust the + # version that has been returned (it's the version Dependabot is + # running on, rather than the true latest resolvable version). + return nil if dependency_name == "bundler" + dep = dependency_from_definition # If the dependency wasn't found in the definition, but *is* @@ -28,11 +33,6 @@ def version_details # subdependency that was removed when attempting to update it. return nil if dep.nil? - # If the dependency is Bundler itself then we can't trust the - # version that has been returned (it's the version Dependabot is - # running on, rather than the true latest resolvable version). - return nil if dep.name == "bundler" - details = { version: dep.version, ruby_version: ruby_version, diff --git a/bundler/helpers/v2/monkey_patches/endpoint_specification_patch.rb b/bundler/helpers/v2/monkey_patches/endpoint_specification_patch.rb deleted file mode 100644 index 712fc783aa8..00000000000 --- a/bundler/helpers/v2/monkey_patches/endpoint_specification_patch.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -require "bundler/endpoint_specification" - -module EndpointSpecificationPatch - def required_ruby_version - @required_ruby_version ||= Gem::Requirement.default - end - - def required_rubygems_version - @required_rubygems_version ||= Gem::Requirement.default - end -end - -Bundler::EndpointSpecification.prepend(EndpointSpecificationPatch) diff --git a/bundler/helpers/v2/run.rb b/bundler/helpers/v2/run.rb index 323d2c3fe48..1e33c3a695f 100644 --- a/bundler/helpers/v2/run.rb +++ b/bundler/helpers/v2/run.rb @@ -15,7 +15,6 @@ # Bundler monkey patches require "definition_ruby_version_patch" require "definition_bundler_version_patch" -require "endpoint_specification_patch" require "git_source_patch" require "functions" diff --git a/bundler/spec/dependabot/bundler/update_checker/version_resolver_spec.rb b/bundler/spec/dependabot/bundler/update_checker/version_resolver_spec.rb index 403f732c93a..d5733fc6013 100644 --- a/bundler/spec/dependabot/bundler/update_checker/version_resolver_spec.rb +++ b/bundler/spec/dependabot/bundler/update_checker/version_resolver_spec.rb @@ -47,7 +47,6 @@ end let(:source) { nil } let(:requirement_string) { ">= 0" } - let(:rubygems_url) { "https://index.rubygems.org/api/v1/" } describe "#latest_resolvable_version_details" do subject { resolver.latest_resolvable_version_details } @@ -142,11 +141,6 @@ let(:dependency_files) { bundler_project_dependency_files("bundler_specified") } - before do - stub_request(:get, rubygems_url + "versions/bundler.json"). - to_return(status: 200, body: fixture("rubygems_responses", "versions-bundler.json")) - end - it "returns nil as resolution returns the bundler version installed by core" do expect(subject).to be_nil end