dependabot-gradle 0.162.0 → 0.162.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e0660c9981bbf8014904fbb2bde509d142cb8851d4eb45194aa8472d3acb3c6
-  data.tar.gz: 04ddb5f13f795d8057e984a149f433921bfb17343491f6808cf34a2f4b60b78a
+  metadata.gz: b1e4733a81cd4c3296c2724abbe0c7ac80916bf3f5332c3ebea5688e6f668d8a
+  data.tar.gz: 3a6598cdfff7f67ee92cc72479f6562710d0b7bd374bf326e2b0412796bbb288
 SHA512:
-  metadata.gz: 5c577400eb083e3813f21241cf2972eff3ebd06bcf3eaca357764c6a3f63842e0b254f74e1c5673550a97bfae8d728591ea835dcbf0edf010f0ba9acfc7d0287
-  data.tar.gz: 3bf33441eac7025c20417e0a7ab87d8631887254ed0a36aca88283eab275ebb9e4b330eb91adf18e8b1868305a88bfbb036c2d8c4d694882399ab4bcbc712502
+  metadata.gz: e614dc00a5f665e25dd85a1e142e7ebf74a58d10060f4c217cfff594d8de1da0dbeb509f7f8fda49fe4fdc5ad9b87a27cad23a91001db311811fe58bdc4d9f00
+  data.tar.gz: d5b093c459100bd09966334121b92deb1f84fbc482b92836009f17aecff3ae7d9a653357fb1d558a2d5f95c7ab8d0a577c18eaa64b682a0d12ee1caf45cdc9c0

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-gradle
 version: !ruby/object:Gem::Version
-  version: 0.162.0
+  version: 0.162.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2021-09-20 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.162.0
+        version: 0.162.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.162.0
+        version: 0.162.1
 - !ruby/object:Gem::Dependency
   name: dependabot-maven
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.162.0
+        version: 0.162.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.162.0
+        version: 0.162.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement