dependabot-gradle 0.129.1 → 0.130.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24cc176b8c4a45f3f4302043bde409d11ee8723d55c924a163f40ff527b60e95
-  data.tar.gz: e19cc15af72b9076b71acef04ce771a4b66a785bf761a61087d335b78af0c851
+  metadata.gz: 30806d65eba9550d4c72c1837957c402d24c4dfd28f2f72cbfc202e3e5abc3eb
+  data.tar.gz: f24664394a6464e90ccf6efb0a861f751ec0f4cfade7b0db14baf921c7e3afbc
 SHA512:
-  metadata.gz: 5f124e90638168272dda7b9c3f5c8f44401eebc902abf9ad9cdf939667e4c31c7f129ef822a887402441f6eb1629a1e86c03e4de35f61da60ab8798c7d087d94
-  data.tar.gz: 6986d7fa375c43171da2f3502c35c85f97791c511c16c29490492a0d5bfc365ef34bfc2d49e82769b8e5a295ccdcd84adcf2a3d70158c6ead2b2dc3069f5c5d4
+  metadata.gz: e62b649fadd3355e2ce0e7b7921a2198b908ad2682ba5f9097cdcb3c5968b2ba9102a7951c22cab9fd209c94dbc69139ecd4524a1aaab8d7190913814ed3d685
+  data.tar.gz: 208d5ef9f5d52a24c5f0d59d60ad76b2a651f89695bbe65be92180c935967e4d462c7d5e647b6809ca4053511580aaa4355830ee8003f360445d65dbebf90ae7

data/lib/dependabot/gradle/file_fetcher.rb

@@ -31,6 +31,7 @@ module Dependabot
         fetched_files << buildfile
         fetched_files += subproject_buildfiles
         fetched_files += dependency_script_plugins
+        check_required_files_present
         fetched_files
       end
 
@@ -38,7 +39,7 @@ module Dependabot
         @buildfile ||= begin
           file = supported_build_file
           @buildfile_name ||= file.name if file
-          fetch_file_from_host(file.name) if file
+          file
         end
       end
 
@@ -58,7 +59,10 @@ module Dependabot
         end.compact
       end
 
+      # rubocop:disable Metrics/PerceivedComplexity
       def dependency_script_plugins
+        return [] unless buildfile
+
         dependency_plugin_paths =
           buildfile.content.
           scan(/apply from:\s+['"]([^'"]+)['"]/).flatten.
@@ -77,6 +81,15 @@ module Dependabot
           raise
         end.compact
       end
+      # rubocop:enable Metrics/PerceivedComplexity
+
+      def check_required_files_present
+        return if buildfile
+
+        path = Pathname.new(File.join(directory, "build.gradle")).cleanpath.to_path
+        path += "(.kts)?"
+        raise Dependabot::DependencyFileNotFound, path
+      end
 
       def file_exists_in_submodule?(path)
         fetch_file_from_host(path, fetch_submodules: true)
@@ -86,12 +99,7 @@ module Dependabot
       end
 
       def settings_file
-        @settings_file ||= begin
-          file = supported_settings_file
-          fetch_file_from_host(file.name) if file
-        rescue Dependabot::DependencyFileNotFound
-          nil
-        end
+        @settings_file ||= supported_settings_file
       end
 
       def supported_build_file

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

@@ -6,9 +6,6 @@ module Dependabot
   module Gradle
     class FileFetcher
       class SettingsFileParser
-        INCLUDE_ARGS_REGEX =
-          /(?:^|\s)include(?:\(|\s)(\s*[^\s,\)]+(?:,\s*[^\s,\)]+)*)/.freeze
-
         def initialize(settings_file:)
           @settings_file = settings_file
         end
@@ -49,7 +46,7 @@ module Dependabot
 
         def function_regex(function_name)
           /
-            (?:^|\s)#{Regexp.quote(function_name)}(?:\(|\s)
+            (?:^|\s)#{Regexp.quote(function_name)}(?:\s*\(|\s)
             (?<args>\s*[^\s,\)]+(?:,\s*[^\s,\)]+)*)
           /mx
         end

data/lib/dependabot/gradle/file_parser.rb

@@ -36,8 +36,6 @@ module Dependabot
         /(?:^|\s)dependencySet\((?<arguments>[^\)]+)\)\s*\{/.freeze
       DEPENDENCY_SET_ENTRY_REGEX = /entry\s+['"](?<name>#{PART})['"]/.freeze
       PLUGIN_BLOCK_DECLARATION_REGEX = /(?:^|\s)plugins\s*\{/.freeze
-      PLUGIN_BLOCK_ENTRY_REGEX =
-        /id\s+"(?<id>#{PART})"\s+version\s+"(?<version>#{VSN_PART})"/.freeze
       PLUGIN_ID_REGEX = /['"](?<id>#{PART})['"]/.freeze
 
       def parse
@@ -149,14 +147,14 @@ module Dependabot
 
         plugin_blocks.each do |blk|
           blk.lines.each do |line|
-            name_regex = /id(\s+#{PLUGIN_ID_REGEX}|\(#{PLUGIN_ID_REGEX}\))/
+            name_regex = /(id|kotlin)(\s+#{PLUGIN_ID_REGEX}|\(#{PLUGIN_ID_REGEX}\))/
             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")
             next unless name && version
 
-            details = { name: name, group: "plugins", version: version }
+            details = { name: name, group: "plugins", extra_groups: extra_groups(line), version: version }
             dep = dependency_from(details_hash: details, buildfile: buildfile)
             dependency_set << dep if dep
           end
@@ -165,6 +163,10 @@ module Dependabot
         dependency_set
       end
 
+      def extra_groups(line)
+        line.match(/kotlin(\s+#{PLUGIN_ID_REGEX}|\(#{PLUGIN_ID_REGEX}\))/) ? ["kotlin"] : []
+      end
+
       def argument_from_string(string, arg_name)
         string.
           match(map_value_regex(arg_name))&.
@@ -176,13 +178,14 @@ module Dependabot
         group   = evaluated_value(details_hash[:group], buildfile)
         name    = evaluated_value(details_hash[:name], buildfile)
         version = evaluated_value(details_hash[:version], buildfile)
+        extra_groups = details_hash[:extra_groups] || []
 
         dependency_name =
           if group == "plugins" then name
           else "#{group}:#{name}"
           end
         groups =
-          if group == "plugins" then ["plugins"]
+          if group == "plugins" then ["plugins"] + extra_groups
           else []
           end
         source =

data/lib/dependabot/gradle/file_updater.rb

@@ -140,7 +140,7 @@ module Dependabot
             next false unless line.include?(dependency.name.split(":").last)
           else
             name_regex_value = /['"]#{Regexp.quote(dependency.name)}['"]/
-            name_regex = /id(\s+#{name_regex_value}|\(#{name_regex_value}\))/
+            name_regex = /(id|kotlin)(\s+#{name_regex_value}|\(#{name_regex_value}\))/
             next false unless line.match?(name_regex)
           end
 

data/lib/dependabot/gradle/metadata_finder.rb

@@ -11,6 +11,7 @@ module Dependabot
     class MetadataFinder < Dependabot::MetadataFinders::Base
       DOT_SEPARATOR_REGEX = %r{\.(?!\d+([.\/_\-]|$)+)}.freeze
       PROPERTY_REGEX      = /\$\{(?<property>.*?)\}/.freeze
+      KOTLIN_PLUGIN_REPO_PREFIX = "org.jetbrains.kotlin"
 
       private
 
@@ -101,7 +102,8 @@ module Dependabot
         return @dependency_pom_file unless @dependency_pom_file.nil?
 
         artifact_id =
-          if plugin? then "#{dependency.name}.gradle.plugin"
+          if kotlin_plugin? then "#{KOTLIN_PLUGIN_REPO_PREFIX}.#{dependency.name}.gradle.plugin"
+          elsif plugin? then "#{dependency.name}.gradle.plugin"
           else dependency.name.split(":").last
           end
 
@@ -150,7 +152,10 @@ module Dependabot
 
       def maven_repo_dependency_url
         group_id, artifact_id =
-          if plugin? then [dependency.name, "#{dependency.name}.gradle.plugin"]
+          if kotlin_plugin?
+            ["#{KOTLIN_PLUGIN_REPO_PREFIX}.#{dependency.name}",
+             "#{KOTLIN_PLUGIN_REPO_PREFIX}.#{dependency.name}.gradle.plugin"]
+          elsif plugin? then [dependency.name, "#{dependency.name}.gradle.plugin"]
           else dependency.name.split(":")
           end
 
@@ -158,7 +163,11 @@ module Dependabot
       end
 
       def plugin?
-        dependency.requirements.any? { |r| r.fetch(:groups) == ["plugins"] }
+        dependency.requirements.any? { |r| r.fetch(:groups).include? "plugins" }
+      end
+
+      def kotlin_plugin?
+        plugin? && dependency.requirements.any? { |r| r.fetch(:groups).include? "kotlin" }
       end
 
       def auth_details

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

@@ -13,6 +13,7 @@ module Dependabot
       class VersionFinder
         GOOGLE_MAVEN_REPO = "https://maven.google.com"
         GRADLE_PLUGINS_REPO = "https://plugins.gradle.org/m2"
+        KOTLIN_PLUGIN_REPO_PREFIX = "org.jetbrains.kotlin"
         TYPE_SUFFICES = %w(jre android java).freeze
 
         GRADLE_RANGE_REGEX = /[\(\[].*,.*[\)\]]/.freeze
@@ -295,6 +296,7 @@ module Dependabot
 
         def dependency_metadata_url(repository_url)
           group_id, artifact_id = group_and_artifact_ids
+          group_id = "#{KOTLIN_PLUGIN_REPO_PREFIX}.#{group_id}" if kotlin_plugin?
 
           "#{repository_url}/"\
           "#{group_id.tr('.', '/')}/"\
@@ -303,7 +305,9 @@ module Dependabot
         end
 
         def group_and_artifact_ids
-          if plugin?
+          if kotlin_plugin?
+            [dependency.name, "#{KOTLIN_PLUGIN_REPO_PREFIX}.#{dependency.name}.gradle.plugin"]
+          elsif plugin?
             [dependency.name, "#{dependency.name}.gradle.plugin"]
           else
             dependency.name.split(":")
@@ -311,7 +315,11 @@ module Dependabot
         end
 
         def plugin?
-          dependency.requirements.any? { |r| r.fetch(:groups) == ["plugins"] }
+          dependency.requirements.any? { |r| r.fetch(:groups).include? "plugins" }
+        end
+
+        def kotlin_plugin?
+          plugin? && dependency.requirements.any? { |r| r.fetch(:groups).include? "kotlin" }
         end
 
         def central_repo_urls

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-gradle
 version: !ruby/object:Gem::Version
-  version: 0.129.1
+  version: 0.130.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-21 00:00:00.000000000 Z
+date: 2021-01-13 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.129.1
+        version: 0.130.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.129.1
+        version: 0.130.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement