dependabot-gradle 0.211.0 → 0.213.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87960ca41a7fc3ec723a12d585ba7c6614b49c24649c215ecd9a83704a3f1d21
-  data.tar.gz: 387a7b664d2f48d4c66f317274ca203f202cc35c4cfb5990297eec37a12fc188
+  metadata.gz: 0fca8a86a99ff839c2a950ce045feffc4deb167ea7d45afb649d9c29c381b349
+  data.tar.gz: 99d3c12427a0dc2a89956f5dc27499e6176dc76c9b734b47a6e9fc7799616b2a
 SHA512:
-  metadata.gz: f68d5905f52f29e5f4a39841b26b00852f0b86c4e07cbfd26d2a74aca8528926579109992831de2e8e7c4c80001bb9d0bb35f18002b7adfb6f2ca646918bee49
-  data.tar.gz: 0bf43c70fc7099c2067c40e400e0523466289d4cad3ebba4c3255b172ff42258c9c4170aae2293d1cc810623035e492daa693007dc7fccaa703dc9848019d837
+  metadata.gz: 7aa6c8213da114c8ae5bfe35918f4cb045f18d0b5981617b38cf660bbc544b1767958dceb737c6fe51926327a474a6605092cb02f0ac32e41877d28947dac22d
+  data.tar.gz: e97bed5144eee699defa0a2c35138529a6cd829c837ea479ac69355a87a7d2602f9e0367799dcd54bf565a1099df6d922865e2e0149268fce9fa720a7743528d

data/lib/dependabot/gradle/file_fetcher/settings_file_parser.rb

@@ -10,13 +10,22 @@ module Dependabot
           @settings_file = settings_file
         end
 
+        def included_build_paths
+          paths = []
+          comment_free_content.scan(function_regex("includeBuild")) do
+            arg = Regexp.last_match.named_captures.fetch("args")
+            paths << arg.gsub(/["']/, "").strip
+          end
+          paths.uniq
+        end
+
         def subproject_paths
           subprojects = []
 
           comment_free_content.scan(function_regex("include")) do
             args = Regexp.last_match.named_captures.fetch("args")
             args = args.split(",")
-            args = args.map { |p| p.gsub(/["']/, "").strip }.compact
+            args = args.filter_map { |p| p.gsub(/["']/, "").strip }
             subprojects += args
           end
 

data/lib/dependabot/gradle/file_fetcher.rb

@@ -27,72 +27,89 @@ module Dependabot
       private
 
       def fetch_files
-        fetched_files = []
-        fetched_files << buildfile if buildfile
-        fetched_files << settings_file if settings_file
-        fetched_files += subproject_buildfiles
-        fetched_files += dependency_script_plugins
-        check_required_files_present
-        fetched_files
+        files = all_buildfiles_in_build(".")
+        check_required_files_present(files)
+        files
       end
 
-      def buildfile
-        @buildfile ||= begin
-          file = supported_build_file
-          @buildfile_name ||= file.name if file
-          file
-        end
+      def all_buildfiles_in_build(root_dir)
+        files = [buildfile(root_dir), settings_file(root_dir)].compact
+        files += subproject_buildfiles(root_dir)
+        files += dependency_script_plugins(root_dir)
+        files + included_builds(root_dir).
+                flat_map { |dir| all_buildfiles_in_build(dir) }
+      end
+
+      def included_builds(root_dir)
+        builds = []
+
+        # buildSrc is implicit: included but not declared in settings.gradle
+        buildsrc = repo_contents(dir: root_dir, raise_errors: false).
+                   find { |item| item.type == "dir" && item.name == "buildSrc" }
+        builds << clean_join(root_dir, "buildSrc") if buildsrc
+
+        return builds unless settings_file(root_dir)
+
+        builds += SettingsFileParser.
+                  new(settings_file: settings_file(root_dir)).
+                  included_build_paths.
+                  map { |p| clean_join(root_dir, p) }
+
+        builds.uniq
+      end
+
+      def clean_join(*parts)
+        Pathname.new(File.join(*parts)).cleanpath.to_path
       end
 
-      def subproject_buildfiles
-        return [] unless settings_file
-
-        @subproject_buildfiles ||= begin
-          subproject_paths =
-            SettingsFileParser.
-            new(settings_file: settings_file).
-            subproject_paths
-
-          subproject_paths.map do |path|
-            if @buildfile_name
-              fetch_file_from_host(File.join(path, @buildfile_name))
-            else
-              supported_file(SUPPORTED_BUILD_FILE_NAMES.map { |f| File.join(path, f) })
-            end
-          rescue Dependabot::DependencyFileNotFound
-            # Gradle itself doesn't worry about missing subprojects, so we don't
-            nil
-          end.compact
+      def subproject_buildfiles(root_dir)
+        return [] unless settings_file(root_dir)
+
+        subproject_paths =
+          SettingsFileParser.
+          new(settings_file: settings_file(root_dir)).
+          subproject_paths
+
+        subproject_paths.filter_map do |path|
+          if @buildfile_name
+            fetch_file_from_host(File.join(root_dir, path, @buildfile_name))
+          else
+            buildfile(File.join(root_dir, path))
+          end
+        rescue Dependabot::DependencyFileNotFound
+          # Gradle itself doesn't worry about missing subprojects, so we don't
+          nil
         end
       end
 
       # rubocop:disable Metrics/PerceivedComplexity
-      def dependency_script_plugins
-        return [] unless buildfile
+      def dependency_script_plugins(root_dir)
+        return [] unless buildfile(root_dir)
 
         dependency_plugin_paths =
-          FileParser.find_include_names(buildfile).
+          FileParser.find_include_names(buildfile(root_dir)).
           reject { |path| path.include?("://") }.
           reject { |path| !path.include?("/") && path.split(".").count > 2 }.
           select { |filename| filename.include?("dependencies") }.
           map { |path| path.gsub("$rootDir", ".") }.
+          map { |path| File.join(root_dir, path) }.
           uniq
 
-        dependency_plugin_paths.map do |path|
+        dependency_plugin_paths.filter_map do |path|
           fetch_file_from_host(path)
         rescue Dependabot::DependencyFileNotFound
           next nil if file_exists_in_submodule?(path)
           next nil if path.include?("${")
 
           raise
-        end.compact
+        end
       end
       # rubocop:enable Metrics/PerceivedComplexity
 
-      def check_required_files_present
-        return if buildfile || (subproject_buildfiles && !subproject_buildfiles.empty?)
+      def check_required_files_present(files)
+        return if files.any?
 
-        path = Pathname.new(File.join(directory, "build.gradle")).cleanpath.to_path
+        path = clean_join(directory, "build.gradle")
         path += "(.kts)?"
         raise Dependabot::DependencyFileNotFound, path
       end
@@ -104,24 +121,35 @@ module Dependabot
         false
       end
 
-      def settings_file
-        @settings_file ||= supported_settings_file
+      def buildfile(dir)
+        file = find_first(dir, SUPPORTED_BUILD_FILE_NAMES) || return
+        @buildfile_name ||= File.basename(file.name)
+        file
       end
 
-      def supported_build_file
-        supported_file(SUPPORTED_BUILD_FILE_NAMES)
+      def settings_file(dir)
+        find_first(dir, SUPPORTED_SETTINGS_FILE_NAMES)
       end
 
-      def supported_settings_file
-        supported_file(SUPPORTED_SETTINGS_FILE_NAMES)
+      def find_first(dir, supported_names)
+        paths = supported_names.
+                map { |name| clean_join(dir, name) }.
+                each do |path|
+          return cached_files[path] || next
+        end
+        fetch_first_if_present(paths)
       end
 
-      def supported_file(supported_file_names)
-        supported_file_names.each do |supported_file_name|
-          file = fetch_file_if_present(supported_file_name)
-          return file if file
-        end
+      def cached_files
+        @cached_files ||= {}
+      end
 
+      def fetch_first_if_present(paths)
+        paths.each do |path|
+          file = fetch_file_if_present(path) || next
+          cached_files[path] = file
+          return file
+        end
         nil
       end
     end

data/lib/dependabot/gradle/file_parser/property_value_finder.rb

@@ -9,71 +9,58 @@ module Dependabot
         # rubocop:disable Layout/LineLength
         SUPPORTED_BUILD_FILE_NAMES = %w(build.gradle build.gradle.kts).freeze
 
-        QUOTED_VALUE_REGEX =
-          /\s*['"][^\s]+['"]\s*/.freeze
+        QUOTED_VALUE_REGEX = /\s*['"][^\s]+['"]\s*/
 
         # project.findProperty('property') ?:
-        FIND_PROPERTY_REGEX =
-          /\s*project\.findProperty\(#{QUOTED_VALUE_REGEX}\)\s*\?:/.freeze
+        FIND_PROPERTY_REGEX = /\s*project\.findProperty\(#{QUOTED_VALUE_REGEX}\)\s*\?:/
 
         # project.hasProperty('property') ? project.getProperty('property') :
         GROOVY_HAS_PROPERTY_REGEX =
-          /\s*project\.hasProperty\(#{QUOTED_VALUE_REGEX}\)\s*\?\s*project\.getProperty\(#{QUOTED_VALUE_REGEX}\)\s*:/.freeze
+          /\s*project\.hasProperty\(#{QUOTED_VALUE_REGEX}\)\s*\?\s*project\.getProperty\(#{QUOTED_VALUE_REGEX}\)\s*:/
 
         # if(project.hasProperty("property")) project.getProperty("property") else
         KOTLIN_HAS_PROPERTY_REGEX =
-          /\s*if\s*\(project\.hasProperty\(#{QUOTED_VALUE_REGEX}\)\)\s+project\.getProperty\(#{QUOTED_VALUE_REGEX}\)\s+else\s+/.freeze
+          /\s*if\s*\(project\.hasProperty\(#{QUOTED_VALUE_REGEX}\)\)\s+project\.getProperty\(#{QUOTED_VALUE_REGEX}\)\s+else\s+/
 
-        GROOVY_PROPERTY_DECLARATION_AS_DEFAULTS_REGEX =
-          /(?:#{FIND_PROPERTY_REGEX}|#{GROOVY_HAS_PROPERTY_REGEX})?/.freeze
+        GROOVY_PROPERTY_DECLARATION_AS_DEFAULTS_REGEX = /(?:#{FIND_PROPERTY_REGEX}|#{GROOVY_HAS_PROPERTY_REGEX})?/
 
-        KOTLIN_PROPERTY_DECLARATION_AS_DEFAULTS_REGEX =
-          /(?:#{FIND_PROPERTY_REGEX}|#{KOTLIN_HAS_PROPERTY_REGEX})?/.freeze
+        KOTLIN_PROPERTY_DECLARATION_AS_DEFAULTS_REGEX = /(?:#{FIND_PROPERTY_REGEX}|#{KOTLIN_HAS_PROPERTY_REGEX})?/
 
         PROPERTY_DECLARATION_AS_DEFAULTS_REGEX =
-          /(#{GROOVY_PROPERTY_DECLARATION_AS_DEFAULTS_REGEX}|#{KOTLIN_PROPERTY_DECLARATION_AS_DEFAULTS_REGEX})?/.freeze
+          /(#{GROOVY_PROPERTY_DECLARATION_AS_DEFAULTS_REGEX}|#{KOTLIN_PROPERTY_DECLARATION_AS_DEFAULTS_REGEX})?/
 
-        VALUE_REGEX =
-          /#{PROPERTY_DECLARATION_AS_DEFAULTS_REGEX}\s*['"](?<value>[^\s]+)['"]/.freeze
+        VALUE_REGEX = /#{PROPERTY_DECLARATION_AS_DEFAULTS_REGEX}\s*['"](?<value>[^\s]+)['"]/
 
-        GROOVY_SINGLE_PROPERTY_DECLARATION_REGEX =
-          /(?:^|\s+|ext.)(?<name>[^\s=]+)\s*=#{VALUE_REGEX}/.freeze
+        GROOVY_SINGLE_PROPERTY_DECLARATION_REGEX = /(?:^|\s+|ext.)(?<name>[^\s=]+)\s*=#{VALUE_REGEX}/
 
-        KOTLIN_SINGLE_PROPERTY_INDEX_DECLARATION_REGEX =
-          /\s*extra\[['"](?<name>[^\s=]+)['"]\]\s*=#{VALUE_REGEX}/.freeze
+        KOTLIN_SINGLE_PROPERTY_INDEX_DECLARATION_REGEX = /\s*extra\[['"](?<name>[^\s=]+)['"]\]\s*=#{VALUE_REGEX}/
 
-        KOTLIN_SINGLE_PROPERTY_SET_REGEX =
-          /\s*set\(['"](?<name>[^\s=]+)['"]\s*,#{VALUE_REGEX}\)/.freeze
+        KOTLIN_SINGLE_PROPERTY_SET_REGEX = /\s*set\(['"](?<name>[^\s=]+)['"]\s*,#{VALUE_REGEX}\)/
 
-        KOTLIN_SINGLE_PROPERTY_SET_DECLARATION_REGEX =
-          /\s*extra\.#{KOTLIN_SINGLE_PROPERTY_SET_REGEX}/.freeze
+        KOTLIN_SINGLE_PROPERTY_SET_DECLARATION_REGEX = /\s*extra\.#{KOTLIN_SINGLE_PROPERTY_SET_REGEX}/
 
         KOTLIN_SINGLE_PROPERTY_DECLARATION_REGEX =
-          /(#{KOTLIN_SINGLE_PROPERTY_INDEX_DECLARATION_REGEX}|#{KOTLIN_SINGLE_PROPERTY_SET_DECLARATION_REGEX})/.freeze
+          /(#{KOTLIN_SINGLE_PROPERTY_INDEX_DECLARATION_REGEX}|#{KOTLIN_SINGLE_PROPERTY_SET_DECLARATION_REGEX})/
 
         SINGLE_PROPERTY_DECLARATION_REGEX =
-          /(#{KOTLIN_SINGLE_PROPERTY_DECLARATION_REGEX}|#{GROOVY_SINGLE_PROPERTY_DECLARATION_REGEX})/.freeze
+          /(#{KOTLIN_SINGLE_PROPERTY_DECLARATION_REGEX}|#{GROOVY_SINGLE_PROPERTY_DECLARATION_REGEX})/
 
-        GROOVY_MULTI_PROPERTY_DECLARATION_REGEX =
-          /(?:^|\s+|ext.)(?<namespace>[^\s=]+)\s*=\s*\[(?<values>[^\]]+)\]/m.freeze
+        GROOVY_MULTI_PROPERTY_DECLARATION_REGEX = /(?:^|\s+|ext.)(?<namespace>[^\s=]+)\s*=\s*\[(?<values>[^\]]+)\]/m
 
-        KOTLIN_BLOCK_PROPERTY_DECLARATION_REGEX =
-          /\s*(?<namespace>[^\s=]+)\.apply\s*{(?<values>[^\]]+)}/m.freeze
+        KOTLIN_BLOCK_PROPERTY_DECLARATION_REGEX = /\s*(?<namespace>[^\s=]+)\.apply\s*{(?<values>[^\]]+)}/m
 
         KOTLIN_MULTI_PROPERTY_DECLARATION_REGEX =
-          /\s*extra\[['"](?<namespace>[^\s=]+)['"]\]\s*=\s*mapOf\((?<values>[^\]]+)\)/m.freeze
+          /\s*extra\[['"](?<namespace>[^\s=]+)['"]\]\s*=\s*mapOf\((?<values>[^\]]+)\)/m
 
         MULTI_PROPERTY_DECLARATION_REGEX =
-          /(#{KOTLIN_MULTI_PROPERTY_DECLARATION_REGEX}|#{GROOVY_MULTI_PROPERTY_DECLARATION_REGEX})/.freeze
+          /(#{KOTLIN_MULTI_PROPERTY_DECLARATION_REGEX}|#{GROOVY_MULTI_PROPERTY_DECLARATION_REGEX})/
 
-        KOTLIN_MAP_NAMESPACED_DECLARATION_REGEX =
-          /(?:^|\s+)['"](?<name>[^\s:]+)['"]\s*to#{VALUE_REGEX}\s*/.freeze
+        KOTLIN_MAP_NAMESPACED_DECLARATION_REGEX = /(?:^|\s+)['"](?<name>[^\s:]+)['"]\s*to#{VALUE_REGEX}\s*/
 
-        REGULAR_NAMESPACED_DECLARATION_REGEX =
-          /(?:^|\s+)(?<name>[^\s:]+)\s*[:=]#{VALUE_REGEX}\s*/.freeze
+        REGULAR_NAMESPACED_DECLARATION_REGEX = /(?:^|\s+)(?<name>[^\s:]+)\s*[:=]#{VALUE_REGEX}\s*/
 
         NAMESPACED_DECLARATION_REGEX =
-          /(#{REGULAR_NAMESPACED_DECLARATION_REGEX}|#{KOTLIN_MAP_NAMESPACED_DECLARATION_REGEX})/.freeze
+          /(#{REGULAR_NAMESPACED_DECLARATION_REGEX}|#{KOTLIN_MAP_NAMESPACED_DECLARATION_REGEX})/
         # rubocop:enable Layout/LineLength
 
         def initialize(dependency_files:)

data/lib/dependabot/gradle/file_parser/repositories_finder.rb

@@ -15,16 +15,13 @@ module Dependabot
         GOOGLE_MAVEN_REPO = "https://maven.google.com"
         GRADLE_PLUGINS_REPO = "https://plugins.gradle.org/m2"
 
-        REPOSITORIES_BLOCK_START = /(?:^|\s)repositories\s*\{/.freeze
+        REPOSITORIES_BLOCK_START = /(?:^|\s)repositories\s*\{/
 
-        GROOVY_MAVEN_REPO_REGEX =
-          /maven\s*\{[^\}]*\surl[\s\(]=?[^'"]*['"](?<url>[^'"]+)['"]/.freeze
+        GROOVY_MAVEN_REPO_REGEX = /maven\s*\{[^\}]*\surl[\s\(]=?[^'"]*['"](?<url>[^'"]+)['"]/
 
-        KOTLIN_MAVEN_REPO_REGEX =
-          /maven\((url\s?\=\s?)?["](?<url>[^"]+)["]\)/.freeze
+        KOTLIN_MAVEN_REPO_REGEX = /maven\((url\s?\=\s?)?["](?<url>[^"]+)["]\)/
 
-        MAVEN_REPO_REGEX =
-          /(#{KOTLIN_MAVEN_REPO_REGEX}|#{GROOVY_MAVEN_REPO_REGEX})/.freeze
+        MAVEN_REPO_REGEX = /(#{KOTLIN_MAVEN_REPO_REGEX}|#{GROOVY_MAVEN_REPO_REGEX})/
 
         def initialize(dependency_files:, target_dependency_file:)
           @dependency_files = dependency_files

data/lib/dependabot/gradle/file_parser.rb

@@ -25,18 +25,16 @@ module Dependabot
           (?:\$\{property\((?<property_name>[^:\s]*?)\)\})|
           (?:\$\{(?<property_name>[^:\s]*?)\})|
           (?:\$(?<property_name>[^:\s"']*))
-        /x.freeze
-
-      PART = %r{[^\s,@'":/\\]+}.freeze
-      VSN_PART = %r{[^\s,'":/\\]+}.freeze
-      DEPENDENCY_DECLARATION_REGEX =
-        /(?:\(|\s)\s*['"](?<declaration>#{PART}:#{PART}:#{VSN_PART})['"]/.
-        freeze
-      DEPENDENCY_SET_DECLARATION_REGEX =
-        /(?:^|\s)dependencySet\((?<arguments>[^\)]+)\)\s*\{/.freeze
-      DEPENDENCY_SET_ENTRY_REGEX = /entry\s+['"](?<name>#{PART})['"]/.freeze
-      PLUGIN_BLOCK_DECLARATION_REGEX = /(?:^|\s)plugins\s*\{/.freeze
-      PLUGIN_ID_REGEX = /['"](?<id>#{PART})['"]/.freeze
+        /x
+
+      PART = %r{[^\s,@'":/\\]+}
+      VSN_PART = %r{[^\s,'":/\\]+}
+      DEPENDENCY_DECLARATION_REGEX = /(?:\(|\s)\s*['"](?<declaration>#{PART}:#{PART}:#{VSN_PART})['"]/
+
+      DEPENDENCY_SET_DECLARATION_REGEX = /(?:^|\s)dependencySet\((?<arguments>[^\)]+)\)\s*\{/
+      DEPENDENCY_SET_ENTRY_REGEX = /entry\s+['"](?<name>#{PART})['"]/
+      PLUGIN_BLOCK_DECLARATION_REGEX = /(?:^|\s)plugins\s*\{/
+      PLUGIN_ID_REGEX = /['"](?<id>#{PART})['"]/
 
       def parse
         dependency_set = DependencySet.new
@@ -59,8 +57,7 @@ module Dependabot
 
       def self.find_includes(buildfile, dependency_files)
         FileParser.find_include_names(buildfile).
-          map { |f| dependency_files.find { |bf| bf.name == f } }.
-          compact
+          filter_map { |f| dependency_files.find { |bf| bf.name == f } }
       end
 
       private
@@ -161,11 +158,10 @@ module Dependabot
 
         plugin_blocks.each do |blk|
           blk.lines.each do |line|
-            name_regex = /(id|kotlin)(\s+#{PLUGIN_ID_REGEX}|\(#{PLUGIN_ID_REGEX}\))/
+            name_regex = /(id|kotlin)(\s+#{PLUGIN_ID_REGEX}|\(#{PLUGIN_ID_REGEX}\))/o
             name = line.match(name_regex)&.named_captures&.fetch("id")
-            version_regex = /version\s+['"](?<version>#{VSN_PART})['"]/
-            version = line.match(version_regex)&.named_captures&.
-                fetch("version")
+            version_regex = /version\s+['"]?(?<version>#{VSN_PART})['"]?/o
+            version = format_plugin_version(line.match(version_regex)&.named_captures&.fetch("version"))
             next unless name && version
 
             details = { name: name, group: "plugins", extra_groups: extra_groups(line), version: version }
@@ -177,8 +173,12 @@ module Dependabot
         dependency_set
       end
 
+      def format_plugin_version(version)
+        version&.match?(/^\w+$/) ? "$#{version}" : version
+      end
+
       def extra_groups(line)
-        line.match(/kotlin(\s+#{PLUGIN_ID_REGEX}|\(#{PLUGIN_ID_REGEX}\))/) ? ["kotlin"] : []
+        line.match?(/kotlin(\s+#{PLUGIN_ID_REGEX}|\(#{PLUGIN_ID_REGEX}\))/o) ? ["kotlin"] : []
       end
 
       def argument_from_string(string, arg_name)

data/lib/dependabot/gradle/metadata_finder.rb

@@ -11,8 +11,8 @@ require "dependabot/registry_client"
 module Dependabot
   module Gradle
     class MetadataFinder < Dependabot::MetadataFinders::Base
-      DOT_SEPARATOR_REGEX = %r{\.(?!\d+([.\/_\-]|$)+)}.freeze
-      PROPERTY_REGEX      = /\$\{(?<property>.*?)\}/.freeze
+      DOT_SEPARATOR_REGEX = %r{\.(?!\d+([.\/_\-]|$)+)}
+      PROPERTY_REGEX      = /\$\{(?<property>.*?)\}/
       KOTLIN_PLUGIN_REPO_PREFIX = "org.jetbrains.kotlin"
 
       private

data/lib/dependabot/gradle/requirement.rb

@@ -8,9 +8,8 @@ module Dependabot
   module Gradle
     class Requirement < Gem::Requirement
       quoted = OPS.keys.map { |k| Regexp.quote k }.join("|")
-      PATTERN_RAW =
-        "\\s*(#{quoted})?\\s*(#{Gradle::Version::VERSION_PATTERN})\\s*"
-      PATTERN = /\A#{PATTERN_RAW}\z/.freeze
+      PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Gradle::Version::VERSION_PATTERN})\\s*"
+      PATTERN = /\A#{PATTERN_RAW}\z/
 
       def self.parse(obj)
         return ["=", Gradle::Version.new(obj.to_s)] if obj.is_a?(Gem::Version)

data/lib/dependabot/gradle/update_checker/version_finder.rb

@@ -137,8 +137,8 @@ module Dependabot
           url = Gradle::FileParser::RepositoriesFinder::GOOGLE_MAVEN_REPO
           group_id, artifact_id = group_and_artifact_ids
 
-          dependency_metadata_url = "#{Gradle::FileParser::RepositoriesFinder::GOOGLE_MAVEN_REPO}/"\
-                                    "#{group_id.tr('.', '/')}/"\
+          dependency_metadata_url = "#{Gradle::FileParser::RepositoriesFinder::GOOGLE_MAVEN_REPO}/" \
+                                    "#{group_id.tr('.', '/')}/" \
                                     "group-index.xml"
 
           @google_version_details ||=
@@ -185,7 +185,7 @@ module Dependabot
         end
 
         def check_response(response, repository_url)
-          return unless [401, 403].include?(response.status)
+          return unless response.status == 401 || response.status == 403
           return if @forbidden_urls.include?(repository_url)
           return if central_repo_urls.include?(repository_url)
 
@@ -277,10 +277,10 @@ module Dependabot
           group_id, artifact_id = group_and_artifact_ids
           group_id = "#{KOTLIN_PLUGIN_REPO_PREFIX}.#{group_id}" if kotlin_plugin?
 
-          "#{repository_url}/"\
-          "#{group_id.tr('.', '/')}/"\
-          "#{artifact_id}/"\
-          "maven-metadata.xml"
+          "#{repository_url}/" \
+            "#{group_id.tr('.', '/')}/" \
+            "#{artifact_id}/" \
+            "maven-metadata.xml"
         end
 
         def group_and_artifact_ids

data/lib/dependabot/gradle/version.rb

@@ -27,10 +27,10 @@ module Dependabot
         "sp" => 7
       }.freeze
       VERSION_PATTERN =
-        "[0-9a-zA-Z]+"\
-        '(?>\.[0-9a-zA-Z]*)*'\
+        "[0-9a-zA-Z]+" \
+        '(?>\.[0-9a-zA-Z]*)*' \
         '([_\-\+][0-9A-Za-z_-]*(\.[0-9A-Za-z_-]*)*)?'
-      ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/.freeze
+      ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/
 
       def self.correct?(version)
         return false if version.nil?
@@ -117,11 +117,11 @@ module Dependabot
       end
 
       def trim_version(version)
-        version.split("-").map do |v|
+        version.split("-").filter_map do |v|
           parts = v.split(".")
           parts = parts[0..-2] while NULL_VALUES.include?(parts&.last)
           parts&.join(".")
-        end.compact.reject(&:empty?).join("-")
+        end.reject(&:empty?).join("-")
       end
 
       def convert_dates(version, other_version)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-gradle
 version: !ruby/object:Gem::Version
-  version: 0.211.0
+  version: 0.213.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,56 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.211.0
+        version: 0.213.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.211.0
+        version: 0.213.0
 - !ruby/object:Gem::Dependency
   name: dependabot-maven
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.211.0
+        version: 0.213.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.211.0
-- !ruby/object:Gem::Dependency
-  name: debase
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.3
-- !ruby/object:Gem::Dependency
-  name: debase-ruby_core_source
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.10.16
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.10.16
+        version: 0.213.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.1
+        version: 3.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.1
+        version: 3.13.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.35.1
+        version: 1.37.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.35.1
+        version: 1.37.1
 - !ruby/object:Gem::Dependency
-  name: ruby-debug-ide
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 1.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -283,14 +255,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Gradle support for dependabot