dependabot-gradle 0.160.1 → 0.162.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af780e13a388b218954639b902ce8a6100b670e111918afe418a468efc9f1fb3
-  data.tar.gz: c9cd3545010ef182a2b7bc1d429bb9926eba58ed35945696138d403cfda8d203
+  metadata.gz: ee0abc801d0d0c61a8d55e4ce75f0eb0c20f14af92766fd7097fe351a45aaaf8
+  data.tar.gz: 0e92668e917ff0b8bb7740a641f6d205e65251537c42f25084c2664e889f36cb
 SHA512:
-  metadata.gz: 93f13327d517ddff7f6be69812c2b4030f38cf70c1b24c631bf7220cd5f5c536dae40fc4b95eb04a7af188c8ca409e7919a497d2fce1b980742f9b27212d292d
-  data.tar.gz: fbbf0a69acd74fa3b610d95b3df10e7865ea6fcac998dacc933f39d66acd5d5bf3e012dcd4e9008d04b7ed0df56275de3a8d03357892dc5f722da7ec868fc434
+  metadata.gz: 4b06b98fc488a40fca9ff8b23316c01423004d916d2c919a1623976110c79a8d83ce032b84b962814c7489e7e2341c24f448202f88b4ea72ab8b6f83b6d7720b
+  data.tar.gz: 421477c81cb6ffc4ca5c2f26e3eee4683dd26d4780361232f828b8751ad8df50cfa167ca4ba1fe273690e4df468660c938abf3c8410f12313f183382f6ff3321

data/lib/dependabot/gradle/file_fetcher.rb

@@ -64,8 +64,7 @@ module Dependabot
         return [] unless buildfile
 
         dependency_plugin_paths =
-          buildfile.content.
-          scan(/apply from:\s+['"]([^'"]+)['"]/).flatten.
+          FileParser.find_include_names(buildfile).
           reject { |path| path.include?("://") }.
           reject { |path| !path.include?("/") && path.split(".").count > 2 }.
           select { |filename| filename.include?("dependencies") }.

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

@@ -96,11 +96,15 @@ module Dependabot
 
           # Look for a property in the callsite buildfile. If that fails, look
           # for the property in the top-level buildfile
-          if properties(callsite_buildfile).fetch(property_name, nil)
-            return properties(callsite_buildfile).fetch(property_name)
+          all_files = [callsite_buildfile, top_level_buildfile].concat(
+            FileParser.find_includes(callsite_buildfile, dependency_files),
+            FileParser.find_includes(top_level_buildfile, dependency_files)
+          )
+          all_files.each do |file|
+            details = properties(file).fetch(property_name, nil)
+            return details if details
           end
-
-          properties(top_level_buildfile).fetch(property_name, nil)
+          nil
         end
 
         def property_value(property_name:, callsite_buildfile:)

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

@@ -32,7 +32,10 @@ module Dependabot
 
         def repository_urls
           repository_urls = []
-          repository_urls += inherited_repository_urls
+          repository_urls += inherited_repository_urls(top_level_buildfile)
+          FileParser.find_includes(top_level_buildfile, dependency_files).each do |dependency_file|
+            repository_urls += inherited_repository_urls(dependency_file)
+          end
           repository_urls += own_buildfile_repository_urls
           repository_urls = repository_urls.uniq
 
@@ -45,10 +48,10 @@ module Dependabot
 
         attr_reader :dependency_files, :target_dependency_file
 
-        def inherited_repository_urls
-          return [] unless top_level_buildfile
+        def inherited_repository_urls(dependency_file)
+          return [] unless dependency_file
 
-          buildfile_content = comment_free_content(top_level_buildfile)
+          buildfile_content = comment_free_content(dependency_file)
           subproject_blocks = []
 
           buildfile_content.scan(/(?:^|\s)allprojects\s*\{/) do

data/lib/dependabot/gradle/file_parser.rb

@@ -49,6 +49,20 @@ module Dependabot
         dependency_set.dependencies
       end
 
+      def self.find_include_names(buildfile)
+        return [] unless buildfile
+
+        buildfile.content.
+          scan(/apply(\(| )\s*from(\s+=|:)\s+['"]([^'"]+)['"]/).
+          map { |match| match[2] }
+      end
+
+      def self.find_includes(buildfile, dependency_files)
+        FileParser.find_include_names(buildfile).
+          map { |f| dependency_files.find { |bf| bf.name == f } }.
+          compact
+      end
+
       private
 
       def map_value_regex(key)
@@ -301,10 +315,7 @@ module Dependabot
       def script_plugin_files
         @script_plugin_files ||=
           buildfiles.flat_map do |buildfile|
-            buildfile.content.
-              scan(/apply from(\s+=|:)\s+['"]([^'"]+)['"]/).flatten.
-              map { |f| dependency_files.find { |bf| bf.name == f } }.
-              compact
+            FileParser.find_includes(buildfile, dependency_files)
           end.
           uniq
       end

data/lib/dependabot/gradle/version.rb

@@ -14,7 +14,8 @@ module Dependabot
       NULL_VALUES = %w(0 final ga).freeze
       PREFIXED_TOKEN_HIERARCHY = {
         "." => { qualifier: 1, number: 4 },
-        "-" => { qualifier: 2, number: 3 }
+        "-" => { qualifier: 2, number: 3 },
+        "_" => { qualifier: 2, number: 3 }
       }.freeze
       NAMED_QUALIFIERS_HIERARCHY = {
         "a" => 1, "alpha"     => 1,
@@ -132,7 +133,7 @@ module Dependabot
       end
 
       def split_into_prefixed_tokens(version)
-        ".#{version}".split(/(?=[\-\.])/)
+        ".#{version}".split(/(?=[_\-\.])/)
       end
 
       def pad_for_comparison(prefixed_tokens, other_prefixed_tokens)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-gradle
 version: !ruby/object:Gem::Version
-  version: 0.160.1
+  version: 0.162.2
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.160.1
+        version: 0.162.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.160.1
+        version: 0.162.2
 - !ruby/object:Gem::Dependency
   name: dependabot-maven
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.160.1
+        version: 0.162.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.160.1
+        version: 0.162.2
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement