dependabot-maven 0.280.0 → 0.282.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 669e3997e249e8535406a9d5d9e0c7acde26c6b44f2d8ee0b56ef7b6bc731147
-  data.tar.gz: 448771065c86241d417f1a62ed0e35192c3c3fe217f3ff748d668b82dbf2a557
+  metadata.gz: 1bf9f7686a3cbcde7aec78a885563f57ccd6065b335752a1aacd79af36725f83
+  data.tar.gz: a39c086f41077801e24376641a2786ec6f17b4c6fce488ae561847d4ec3bde92
 SHA512:
-  metadata.gz: e73590f9ac4791ab3a853fab6eadda290aea9f4749e4d5cee786c95257d85d781d74fbf1d662e0b9095e1dce69f18d30f37e806db60bdaf5df0ffaa74f7ebb99
-  data.tar.gz: 7e13ff18fd4fcbe3127d4cf6740537f076dd571bbcd87b14eeb8c726bf568f29a7f1f0a11779b232f9cc0702d0d9bd327bd7cc113876050317d9d190760eadae
+  metadata.gz: 9c522dd5900cec227bb8349adf509f2b350d9cd1ee0b7f7d4ae1f7d5241205b3b975deeb410a8b16c33b6f6102c52543173bf0160ff902d53282a9d99a127890
+  data.tar.gz: 96928d15c8a3733c362ff3df19b4bca4ec6e155c2987e8a9badba477f87845db59fbfffcdbf3cb0a3fa1e9ae1fd5c4249210c0be87eda6a5e9667f4ca4b67ed1

data/lib/dependabot/maven/update_checker/requirements_updater.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 #######################################################
@@ -6,6 +6,7 @@
 # https://maven.apache.org/pom.html#Dependencies      #
 #######################################################
 
+require "dependabot/requirements_updater/base"
 require "dependabot/maven/update_checker"
 require "dependabot/maven/version"
 require "dependabot/maven/requirement"
@@ -14,6 +15,22 @@ module Dependabot
   module Maven
     class UpdateChecker
       class RequirementsUpdater
+        extend T::Sig
+        extend T::Generic
+
+        Version = type_member { { fixed: Dependabot::Maven::Version } }
+        Requirement = type_member { { fixed: Dependabot::Maven::Requirement } }
+
+        include Dependabot::RequirementsUpdater::Base
+
+        sig do
+          params(
+            requirements: T::Array[T::Hash[Symbol, T.untyped]],
+            latest_version: T.nilable(T.any(Version, String)),
+            source_url: String,
+            properties_to_update: T::Array[String]
+          ).void
+        end
         def initialize(requirements:, latest_version:, source_url:,
                        properties_to_update:)
           @requirements = requirements
@@ -21,9 +38,10 @@ module Dependabot
           @properties_to_update = properties_to_update
           return unless latest_version
 
-          @latest_version = version_class.new(latest_version)
+          @latest_version = T.let(version_class.new(latest_version), Version)
         end
 
+        sig { override.returns(T::Array[T::Hash[Symbol, T.untyped]]) }
         def updated_requirements
           return requirements unless latest_version
 
@@ -44,30 +62,42 @@ module Dependabot
 
         private
 
+        sig { returns(T::Array[T::Hash[Symbol, T.untyped]]) }
         attr_reader :requirements
+
+        sig { returns(T.nilable(Version)) }
         attr_reader :latest_version
+
+        sig { returns(String) }
         attr_reader :source_url
+
+        sig { returns(T::Array[String]) }
         attr_reader :properties_to_update
 
+        sig { params(req_string: String).returns(String) }
         def update_requirement(req_string)
           # Since range requirements are excluded this must be exact
           update_exact_requirement(req_string)
         end
 
+        sig { params(req_string: String).returns(String) }
         def update_exact_requirement(req_string)
           old_version = requirement_class.new(req_string)
                                          .requirements.first.last
           req_string.gsub(old_version.to_s, latest_version.to_s)
         end
 
+        sig { override.returns(T::Class[Version]) }
         def version_class
           Maven::Version
         end
 
+        sig { override.returns(T::Class[Requirement]) }
         def requirement_class
           Maven::Requirement
         end
 
+        sig { returns(T::Hash[Symbol, String]) }
         def updated_source
           { type: "maven_repo", url: source_url }
         end

data/lib/dependabot/maven/version.rb

@@ -65,6 +65,11 @@ module Dependabot
         end
       end
 
+      sig { returns(String) }
+      def lowest_prerelease_suffix
+        "a0"
+      end
+
       sig { params(other: VersionParameter).returns(Integer) }
       def <=>(other)
         other = Dependabot::Maven::Version.new(other.to_s) unless other.is_a? Dependabot::Maven::Version
@@ -78,7 +83,7 @@ module Dependabot
 
         version_parts = parts.fill("0", parts.length...2)
         # the a0 is so we can get the next earliest prerelease patch version
-        upper_parts = version_parts.first(1) + [version_parts[1].to_i + 1] + ["a0"]
+        upper_parts = version_parts.first(1) + [version_parts[1].to_i + 1] + [lowest_prerelease_suffix]
         lower_bound = "> #{to_semver}"
         upper_bound = "< #{upper_parts.join('.')}"
 
@@ -91,8 +96,8 @@ module Dependabot
         return [] if parts.empty? # for non-semver versions
 
         version_parts = parts.fill("0", parts.length...2)
-        lower_parts = version_parts.first(1) + [version_parts[1].to_i + 1] + ["a0"]
-        upper_parts = version_parts.first(0) + [version_parts[0].to_i + 1] + ["a0"]
+        lower_parts = version_parts.first(1) + [version_parts[1].to_i + 1] + [lowest_prerelease_suffix]
+        upper_parts = version_parts.first(0) + [version_parts[0].to_i + 1] + [lowest_prerelease_suffix]
         lower_bound = ">= #{lower_parts.join('.')}"
         upper_bound = "< #{upper_parts.join('.')}"
 
@@ -104,7 +109,7 @@ module Dependabot
         version_parts = token_bucket.tokens # e.g [1,2,3] if version is 1.2.3-alpha3
         return [] if version_parts.empty? # for non-semver versions
 
-        lower_parts = [version_parts[0].to_i + 1] + ["a0"] # earliest next major version prerelease
+        lower_parts = [version_parts[0].to_i + 1] + [lowest_prerelease_suffix] # earliest next major version prerelease
         lower_bound = ">= #{lower_parts.join('.')}"
 
         [lower_bound]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-maven
 version: !ruby/object:Gem::Version
-  version: 0.280.0
+  version: 0.282.0
 platform: ruby
 authors:
 - Dependabot
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-10 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.280.0
+        version: 0.282.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.280.0
+        version: 0.282.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.65.0
+        version: 1.67.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.65.0
+        version: 1.67.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.22.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.22.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -266,8 +266,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.280.0
-post_install_message:
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.282.0
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -283,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 3.1.0
 requirements: []
 rubygems_version: 3.5.9
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Provides Dependabot support for Maven
 test_files: []