From fd6c893f28cfc05e5237bc540172bdc0d8fdf47a Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Fri, 25 Oct 2024 11:48:26 -0700
Subject: [PATCH] [High Priority] Excavator:  Update gradle-jdks infrastructure
 plugins (#2397)

---
 build.gradle                 |   2 +-
 gradle/gradle-jdks-setup.jar | Bin 111518 -> 111536 bytes
 gradle/gradle-jdks-setup.sh  |   3 ++-
 gradlew                      |   2 ++
 settings.gradle              |   2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index e6a089684..57bde0777 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ buildscript {
 
     dependencies {
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
-        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.51.0'
+        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.52.0'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.16.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
         classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.13.0'
diff --git a/gradle/gradle-jdks-setup.jar b/gradle/gradle-jdks-setup.jar
index b6386839c858b023de6109488262cbc144b56ba1..f1b8b4d170cbc0cb7a4d2cdbf8cff0e6dc0b0499 100644
GIT binary patch
delta 1580
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

delta 1555
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
F006nL^soQ`

diff --git a/gradle/gradle-jdks-setup.sh b/gradle/gradle-jdks-setup.sh
index f8cd65782..fe7d91221 100755
--- a/gradle/gradle-jdks-setup.sh
+++ b/gradle/gradle-jdks-setup.sh
@@ -74,6 +74,7 @@ gradle_daemon_jdk_distribution_local_path=$(read_value "$APP_GRADLE_DIR"/jdks/"$
 "$GRADLE_JDKS_HOME"/"$gradle_daemon_jdk_distribution_local_path"/bin/java -cp "$APP_GRADLE_DIR"/gradle-jdks-setup.jar com.palantir.gradle.jdks.setup.GradleJdkInstallationSetup daemonSetup "$APP_HOME" "$GRADLE_JDKS_HOME/$gradle_daemon_jdk_distribution_local_path"
 
 # [Used by ./gradlew only] Setting the Gradle Daemon Java Home to the JDK distribution
-set -- "-Dorg.gradle.java.home=$GRADLE_JDKS_HOME/$gradle_daemon_jdk_distribution_local_path" "$@"
+export GRADLE_DAEMON_JDK="$GRADLE_JDKS_HOME/$gradle_daemon_jdk_distribution_local_path"
+set -- "-Dorg.gradle.java.home=$GRADLE_DAEMON_JDK" "$@"
 
 cleanup
diff --git a/gradlew b/gradlew
index 6938ca3e3..75d68b56f 100755
--- a/gradlew
+++ b/gradlew
@@ -68,6 +68,8 @@ if [ -f gradle/gradle-jdks-setup.sh ]; then
         echo "Failed to set up JDK, running gradle/gradle-jdks-setup.sh failed with non-zero exit code"
         exit 1
     fi
+    # Setting JAVA_HOME to the gradle daemon to make sure gradlew uses this jdk for `JAVACMD`
+    JAVA_HOME="$GRADLE_DAEMON_JDK"
 fi
 # <<< Gradle JDK setup <<<
 
diff --git a/settings.gradle b/settings.gradle
index f15e89daf..7f0611d35 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
         gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
     }
     dependencies {
-        classpath 'com.palantir.gradle.jdks:gradle-jdks-settings:0.51.0'
+        classpath 'com.palantir.gradle.jdks:gradle-jdks-settings:0.52.0'
     }
 }
 apply plugin: 'com.palantir.jdks.settings'