dependabot-gradle 0.129.4 → 0.130.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 283f64fb68fc043f62ea93e7e7e258618aa1070c51524c135615e95f2c7121f5
-  data.tar.gz: f2d87711658001261ae0004bd90f8a09af9462385e0d8b5ffdc07f2886dc1fed
+  metadata.gz: 43febb12d9d4ec7859350f114234f9c3df9c272177c27227c711cae7e6fb2367
+  data.tar.gz: b194a01066622865329c012d21bda3719381dad446527739a77af8d2de8ccb3d
 SHA512:
-  metadata.gz: db85ba4de343e84e936983580dfe35ea967b11c05288026df4ff7d3e0bccf3899ad7297f1fa81e12dd55eea7e9297060ba9926e34a198523d7c617cb92128d9f
-  data.tar.gz: abe297b3bc2cbe8a279fc35d23493cee6acf311c94353abce92cb83a10c4b0f342fe3777677ba7c9f281844408772620c957cc710a762b65d533ee4a5894434b
+  metadata.gz: 697507b99763e2e86bc840ddd25c72cc36a2467497e877311c9245445359b1e2a7d77b55ae704e1c15f6af630f6d3507d66ba4d304964253ee2b97dae1ed4ad2
+  data.tar.gz: fe389eae8fd6dc26fbec49d07f22ce2f296fb03c9b759bb3bd44d2b478d6c858259563f24167b1422f43677cd1a9862a136e5afe531be22821117318368b9ec5

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.4
+  version: 0.130.3
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-01-26 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.4
+        version: 0.130.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.129.4
+        version: 0.130.3
 - !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