From 05e13bd9042b623c6c9b422831730f991e99f158 Mon Sep 17 00:00:00 2001
From: Lai Jiang <jianglai@google.com>
Date: Tue, 12 Sep 2023 10:47:57 -0400
Subject: [PATCH] Make Kythe work with Gradle 8 (#2141)

Mostly implementing the fix suggested by b/294850265. Tested by
submitting a job to GCB which ran successfully.
---
 build.gradle                  | 4 ++--
 release/cloudbuild-kythe.yaml | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 47ed21ce9..3f12ff3f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -210,8 +210,8 @@ allprojects {
     gradle.projectsEvaluated {
       tasks.withType(JavaCompile) {
         options.fork = true
-        options.forkOptions.javaHome =
-          file("${System.env.REAL_JAVA_HOME}")
+        options.forkOptions.executable =
+          file("${System.env.JAVA_HOME}/bin/javac")
       }
     }
   }
diff --git a/release/cloudbuild-kythe.yaml b/release/cloudbuild-kythe.yaml
index 911d36c17..5c26b016f 100644
--- a/release/cloudbuild-kythe.yaml
+++ b/release/cloudbuild-kythe.yaml
@@ -25,11 +25,9 @@ steps:
   args:
   - -c
   - |
-    export REAL_JAVAC=$(which javac)
-    export REAL_JAVA_HOME=$${PWD}/java_home
-    cp -r $(dirname $(dirname $(readlink -f $(which javac)))) $${REAL_JAVA_HOME}
-    rm $${REAL_JAVA_HOME}/bin/javac
-    cp ./kythe/extractors/javac-wrapper.sh $${REAL_JAVA_HOME}/bin/javac
+    export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which javac))))
+    mv $${JAVA_HOME}/bin/javac $${JAVA_HOME}/bin/javac.real
+    cp ./kythe/extractors/javac-wrapper.sh $${JAVA_HOME}/bin/javac
     export JAVAC_EXTRACTOR_JAR="$${PWD}/kythe/extractors/javac_extractor.jar"
     export KYTHE_VNAMES="$${PWD}/vnames.json"
     export KYTHE_ROOT_DIRECTORY="$${PWD}"