dependabot-gradle 0.385.0 → 0.386.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b33a1aadd94d7a204f604651aceeba5486fd6cc60c2819a6c1682cb1e5076458
-  data.tar.gz: aa1551e8c761d7d3b720a6a58e8e1e1831f008ceb0390ceece8cc082690ead8d
+  metadata.gz: 3e13edb6e52c235438f37abde8da6e16acbf8af7c9ad353b1107d5e3640c452b
+  data.tar.gz: 3a3e95bec57181355b897de358e3de6bf713b96968cbe8c28cc2465a81aa6599
 SHA512:
-  metadata.gz: 62324f5138718c95e6bb1f7635a15cb999778400e01a4dc3f9ca6b86363abe387487ee22af7924987a25e77ca5b913527eea08a9b1bacec16756332a65a6b5fb
-  data.tar.gz: c3bb6f063ceb40e7f05cb9381957b07ab1687121a4bf2739297d855ec721152b7d6418a9d80e9e8fe4271a768082fb9dfce5711fad11e6a82a28544d05753d8d
+  metadata.gz: ebe25caa251686e54aea6dddddfe590c400e7261eba31772dd43e8dece9a4d037dbfa530f67737521d2f3e7b4c1389e8219bda2aa52a6a6e46c79687d2d62e0b
+  data.tar.gz: e12a6f556feb7ba1883c1458fc5a1f482be3b60d0a268c1048b86d11470efe262caa70dd324eb7dc9a564b7bc71c0cc941c797ab527b1e1e5a91f4f8bf1c2bc6

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
 
@@ -221,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.385.0
+  version: 0.386.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.385.0
+        version: 0.386.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.385.0
+        version: 0.386.0
 - !ruby/object:Gem::Dependency
   name: dependabot-maven
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.385.0
+        version: 0.386.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.385.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.385.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.386.0
 rdoc_options: []
 require_paths:
 - lib