dependabot-gradle 0.129.3 → 0.130.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52304dd1ce847db147408d7c059e277e5e9ac378791b83ae6541f93773f84639
-  data.tar.gz: 6b63e2f958a895e903841215ba951b269f7e15f10c1005e94e2a235285eb7e41
+  metadata.gz: c552c89e6de7aba43235b5cd4ca47ee99b48c47f4c7e0d8c553d68c2c7ab62f9
+  data.tar.gz: 569e642bc246241b0c467afb7ed39c56dc8430b5055d37d76a96e65b8361a7b3
 SHA512:
-  metadata.gz: 0e281b5edbedc64f7a96486c377837e8504df3688b18af0b163357a3554cd90f9fad02f1bd18ed31f43b2b169c128fadb4c5d1334d46c74048c4b556b67f035b
-  data.tar.gz: e7274c38d3a6255f14df0eafbccd8b3a5a66b69ca4991dd9b0b1628380c44fd35e0f20a1a83aae93d7941f2af593ba6e3d750126173bc5e6b8cace8dcd57a292
+  metadata.gz: 33258f243e39c378b0f37936287ccd6ecb8545dfd0ee60ab67fdf3ce1cb9a19009101376a670193d0c0e85439bdbf88f7fb17c19aa8dfdd733f2d83dd5d7fed7
+  data.tar.gz: 2eaf67f2a0ed5b5f4a00168f6f2af9924bfb026e3976682708e802f550664e05aa3efc8bf1a0f98565f0dae1c72ae65db6c26e8ef1a887c7811e3241f65650a8

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_parser/repositories_finder.rb

@@ -16,7 +16,7 @@ module Dependabot
         REPOSITORIES_BLOCK_START = /(?:^|\s)repositories\s*\{/.freeze
 
         GROOVY_MAVEN_REPO_REGEX =
-          /maven\s*\{[^\}]*\surl[\s\(]\s*['"](?<url>[^'"]+)['"]/.freeze
+          /maven\s*\{[^\}]*\surl[\s\(]=?\s*['"](?<url>[^'"]+)['"]/.freeze
 
         KOTLIN_MAVEN_REPO_REGEX =
           /maven\(['"](?<url>[^'"]+)['"]\)/.freeze

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.3
+  version: 0.130.2
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2021-01-19 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.3
+        version: 0.130.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.129.3
+        version: 0.130.2
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.0
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Gradle support for dependabot