dependabot-gradle 0.95.10 → 0.95.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5f32434d2133bc364aade351029bb4e3f3024f9fd5363f3f7fafed616f2f1ff
-  data.tar.gz: a23beafdeb49b71adfd08d175b99e56a4ff52f6399290415d3e0f9bb39d1cdb0
+  metadata.gz: cd748eb70d5952c971feb1e60e45280a65b6c859111811ab163642792797a9ec
+  data.tar.gz: 709241039bb2e13620fa27c3fd1014747e224f9c99c08c77e5f78d79e97bf0ab
 SHA512:
-  metadata.gz: 6e6b422620ddeeb763fd9f9451737ae2c99f13510324fe04ebc7f6dfb59ab5e8f35be9f5ea8a574a8a5d95c440e2d3f6ad45cae877760b633365817be96f3497
-  data.tar.gz: e3d7b929ab07d100d283823b0fcc4baf299d3cc7a3baa34bd5dc0dc5c10d2ee2e52b7dfc319f245804b40a0988e44bb9df94ae3ddd99d21fc7330498a2309ac3
+  metadata.gz: 953e4e0b7f78324dedf53c507e29de0abda7e9de939b07172a1b2b95bfc0cf6e14caf30148b731c80ffcec8fc1941a98ebb6c94fea274ba6433f1d25439cdd11
+  data.tar.gz: 15e4334849de4c720fc8c8aef67d84ae11127f3e755b449d424cc1ebbabc2e26cb46c2e2a378ae2d57039162953266ed9945e14bb920658c03ec2a64f2724d80

data/lib/dependabot/gradle/file_fetcher.rb

@@ -22,6 +22,7 @@ module Dependabot
         fetched_files = []
         fetched_files << buildfile
         fetched_files += subproject_buildfiles
+        fetched_files += dependency_script_plugins
         fetched_files
       end
 
@@ -45,6 +46,22 @@ module Dependabot
         end.compact
       end
 
+      def dependency_script_plugins
+        dependency_plugin_paths =
+          buildfile.content.
+          scan(/apply from:\s+['"]([^'"]+)['"]/).flatten.
+          reject { |path| path.include?("://") }.
+          reject { |path| !path.include?("/") && path.split(".").count > 2 }.
+          select { |filename| filename.include?("dependencies") }
+
+        dependency_plugin_paths.map do |path|
+          fetch_file_from_host(path)
+        rescue Dependabot::DependencyFileNotFound
+          # Experimental feature - raise an error for Dependabot team to review
+          raise "Script plugin not found: #{path}"
+        end.compact
+      end
+
       def settings_file
         @settings_file ||= fetch_file_from_host("settings.gradle")
       rescue Dependabot::DependencyFileNotFound

data/lib/dependabot/gradle/file_parser.rb

@@ -35,6 +35,9 @@ module Dependabot
         buildfiles.each do |buildfile|
           dependency_set += buildfile_dependencies(buildfile)
         end
+        script_plugin_files.each do |plugin_file|
+          dependency_set += buildfile_dependencies(plugin_file)
+        end
         dependency_set.dependencies
       end
 
@@ -228,6 +231,15 @@ module Dependabot
           dependency_files.select { |f| f.name.end_with?("build.gradle") }
       end
 
+      def script_plugin_files
+        @script_plugin_files ||=
+          buildfiles.flat_map do |buildfile|
+            buildfile.content.
+              scan(/apply from:\s+['"]([^'"]+)['"]/).flatten.
+              map { |f| dependency_files.find { |bf| bf.name == f } }.compact
+          end
+      end
+
       def check_required_files
         raise "No build.gradle!" unless get_original_file("build.gradle")
       end

data/lib/dependabot/gradle/file_updater.rb

@@ -167,8 +167,7 @@ module Dependabot
       end
 
       def buildfiles
-        @buildfiles ||=
-          dependency_files.select { |f| f.name.end_with?("build.gradle") }
+        @buildfiles ||= dependency_files.reject(&:support_file?)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-gradle
 version: !ruby/object:Gem::Version
-  version: 0.95.10
+  version: 0.95.11
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.95.10
+        version: 0.95.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.95.10
+        version: 0.95.11
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement