dependabot-gradle 0.384.0 → 0.386.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60a4e8bbe348c7bb7cbd6fbc275892a16a54bed033bd2668c483b1c8e905ad20
-  data.tar.gz: 268f0b46c9fce142acc4f4b615803481e6e9a72844aafcaee0b18becccd471ef
+  metadata.gz: 3e13edb6e52c235438f37abde8da6e16acbf8af7c9ad353b1107d5e3640c452b
+  data.tar.gz: 3a3e95bec57181355b897de358e3de6bf713b96968cbe8c28cc2465a81aa6599
 SHA512:
-  metadata.gz: '0093b562d15794bddca25d32a49a016c7728f2275c7c4e1b206c95ed570e2c4cb2f89b27e508f533371241d51d03bda0d58a47c9ea8939bf7fa47d857636d0cb'
-  data.tar.gz: 06c419e20a01912105e76ec70577a27ab9fc091b37493b7d2481ae7e3383fc1d971004b6561b573f45db9bb0d54cfaafa35588e38b5e1aafd8f5c50cbc31f563
+  metadata.gz: ebe25caa251686e54aea6dddddfe590c400e7261eba31772dd43e8dece9a4d037dbfa530f67737521d2f3e7b4c1389e8219bda2aa52a6a6e46c79687d2d62e0b
+  data.tar.gz: e12a6f556feb7ba1883c1458fc5a1f482be3b60d0a268c1048b86d11470efe262caa70dd324eb7dc9a564b7bc71c0cc941c797ab527b1e1e5a91f4f8bf1c2bc6

data/lib/dependabot/gradle/file_fetcher.rb

@@ -81,7 +81,8 @@ module Dependabot
 
       sig { params(root_dir: String).returns(T::Array[DependencyFile]) }
       def all_buildfiles_in_build(root_dir)
-        files = [buildfile(root_dir), settings_file(root_dir), version_catalog_file(root_dir), lockfile(root_dir)]
+        files = [buildfile(root_dir), settings_file(root_dir), version_catalog_file(root_dir), lockfile(root_dir),
+                 properties_file(root_dir)]
                 .compact
         files += wrapper_files(root_dir)
         files += subproject_buildfiles(root_dir)
@@ -251,6 +252,11 @@ module Dependabot
         fetch_file_if_present(File.join(dir, @lockfile_name))
       end
 
+      sig { params(dir: String).returns(T.nilable(DependencyFile)) }
+      def properties_file(dir)
+        fetch_file_if_present(File.join(dir, "gradle.properties"))
+      end
+
       sig { params(dir: String).returns(T.nilable(DependencyFile)) }
       def buildfile(dir)
         file = find_first(dir, SUPPORTED_BUILD_FILE_NAMES) || return

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

@@ -4,6 +4,7 @@
 require "sorbet-runtime"
 
 require "dependabot/gradle/file_parser"
+require "dependabot/maven/shared/property_value_finding"
 
 module Dependabot
   module Gradle
@@ -11,6 +12,8 @@ module Dependabot
       class PropertyValueFinder
         extend T::Sig
 
+        include Dependabot::Maven::Shared::PropertyValueFinding
+
         # rubocop:disable Layout/LineLength
         SUPPORTED_BUILD_FILE_NAMES = %w(build.gradle build.gradle.kts).freeze
 
@@ -76,7 +79,8 @@ module Dependabot
         end
 
         sig do
-          params(property_name: String, callsite_buildfile: Dependabot::DependencyFile)
+          override
+            .params(property_name: String, callsite_buildfile: Dependabot::DependencyFile)
             .returns(T.nilable(T::Hash[Symbol, String]))
         end
         def property_details(property_name:, callsite_buildfile:)

data/lib/dependabot/gradle/file_updater/lockfile_updater.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "fileutils"
+require "pathname"
 require "shellwords"
 require "sorbet-runtime"
 
@@ -41,14 +42,13 @@ module Dependabot
             write_init_script(init_script_path)
 
             command_parts = [
-              "gradle",
+              gradle_executable_for(cwd: cwd, workspace_root: temp_dir.to_s),
               "--init-script", init_script_path,
               INIT_SCRIPT_TASK_NAME,
               "--write-locks",
               "--no-daemon"
             ]
             command = Shellwords.join(command_parts)
-
             SharedHelpers.run_shell_command(command, cwd: cwd)
 
             update_lockfiles_content(temp_dir, lockfiles, updated_files)
@@ -176,7 +176,7 @@ module Dependabot
             relative_dir = file.directory == "/" ? "" : file.directory
             in_path_name = File.join(temp_dir, relative_dir, file.name)
             FileUtils.mkdir_p(File.dirname(in_path_name))
-            File.write(in_path_name, file.content)
+            File.binwrite(in_path_name, file.decoded_content)
           end
         end
 
@@ -191,12 +191,16 @@ module Dependabot
           http_proxy_port = http_split&.fetch(2) || "1080"
           https_proxy_port = https_split&.fetch(2) || "1080"
 
-          properties_content = "
+          existing_content = File.exist?(file_name) ? File.read(file_name) : ""
+
+          proxy_properties = "
 systemProp.http.proxyHost=#{http_proxy_host}
 systemProp.http.proxyPort=#{http_proxy_port}
 systemProp.https.proxyHost=#{https_proxy_host}
 systemProp.https.proxyPort=#{https_proxy_port}"
-          File.write(file_name, properties_content)
+
+          separator = !existing_content.empty? && !existing_content.end_with?("\n") ? "\n" : ""
+          File.write(file_name, existing_content + separator + proxy_properties)
         end
 
         sig { params(file_name: String).void }
@@ -217,6 +221,34 @@ systemProp.https.proxyPort=#{https_proxy_port}"
           File.write(file_name, script_content)
         end
 
+        sig { params(cwd: String, workspace_root: String).returns(String) }
+        def gradle_executable_for(cwd:, workspace_root:)
+          cwd_path = Pathname.new(cwd).expand_path
+          workspace_root_path = Pathname.new(workspace_root).expand_path
+
+          return "gradle" unless cwd_path == workspace_root_path || cwd_path.to_s.start_with?("#{workspace_root_path}/")
+
+          search_path = cwd_path
+
+          loop do
+            wrapper_script = search_path.join("gradlew")
+            if File.file?(wrapper_script)
+              wrapper_script_path = wrapper_script.to_s
+              FileUtils.chmod("+x", wrapper_script_path)
+
+              relative_path = wrapper_script.relative_path_from(cwd_path).to_s
+              return relative_path.start_with?(".") ? relative_path : "./#{relative_path}"
+            end
+
+            parent_path = search_path.parent
+            break if parent_path == search_path || search_path == workspace_root_path
+
+            search_path = parent_path
+          end
+
+          "gradle"
+        end
+
         sig { params(build_file: Dependabot::DependencyFile).returns(T.nilable(Dependabot::DependencyFile)) }
         def find_settings_file(build_file)
           settings_files = dependency_files.select do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-gradle
 version: !ruby/object:Gem::Version
-  version: 0.384.0
+  version: 0.386.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.384.0
+        version: 0.386.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.384.0
+        version: 0.386.0
 - !ruby/object:Gem::Dependency
   name: dependabot-maven
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.384.0
+        version: 0.386.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.384.0
+        version: 0.386.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -291,7 +291,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.384.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.386.0
 rdoc_options: []
 require_paths:
 - lib