zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-25 12:08:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Make Kythe work with Gradle 8 (#2141)

Browse source 
Mostly implementing the fix suggested by b/294850265. Tested by
submitting a job to GCB which ran successfully.
This commit is contained in:
Lai Jiang 2023-09-12 10:47:57 -04:00 • committed by GitHub
parent 042e2f166d
commit 05e13bd904
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -210,8 +210,8 @@ allprojects {
gradle.projectsEvaluated { gradle.projectsEvaluated {
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.fork = true options.fork = true
options.forkOptions.javaHome = options.forkOptions.executable =
file("${System.env.REAL_JAVA_HOME}") file("${System.env.JAVA_HOME}/bin/javac")
} }
} }
} }

8
release/cloudbuild-kythe.yaml
View file

@ -25,11 +25,9 @@ steps:
args: args:
- -c - -c
- | - |
export REAL_JAVAC=$(which javac) export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which javac))))
export REAL_JAVA_HOME=$${PWD}/java_home mv $${JAVA_HOME}/bin/javac $${JAVA_HOME}/bin/javac.real
cp -r $(dirname $(dirname $(readlink -f $(which javac)))) $${REAL_JAVA_HOME} cp ./kythe/extractors/javac-wrapper.sh $${JAVA_HOME}/bin/javac
rm $${REAL_JAVA_HOME}/bin/javac
cp ./kythe/extractors/javac-wrapper.sh $${REAL_JAVA_HOME}/bin/javac
export JAVAC_EXTRACTOR_JAR="$${PWD}/kythe/extractors/javac_extractor.jar" export JAVAC_EXTRACTOR_JAR="$${PWD}/kythe/extractors/javac_extractor.jar"
export KYTHE_VNAMES="$${PWD}/vnames.json" export KYTHE_VNAMES="$${PWD}/vnames.json"
export KYTHE_ROOT_DIRECTORY="$${PWD}" export KYTHE_ROOT_DIRECTORY="$${PWD}"