zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-23 19:20:44 +02:00
Code Issues Projects Releases Packages Wiki Activity

Make the formatting tasks work with Java 17 (take 2) (#2305)

Browse source 
We should not assume org.gradle.java.home to exist on kokoro or GCB.
This commit is contained in:
Lai Jiang 2024-01-25 12:08:30 -05:00 • committed by GitHub
parent a4903c27b9
commit 0112b3ae06
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
build.gradle
View file

@ -504,7 +504,13 @@ def createGetBuildSrcDirectDepsTask(outputFileName) {
rootProject.ext { rootProject.ext {
invokeJavaDiffFormatScript = { action -> invokeJavaDiffFormatScript = { action ->
def javaHome = project.findProperty('org.gradle.java.home') def javaHome = project.findProperty('org.gradle.java.home')
println("Running the formatting tool with JDK at $javaHome") def javaBin
if (javaHome != null) {
javaBin = "$javaHome/bin/java"
} else {
javaBin = ext.execInBash("which java", rootDir)
}
println("Running the formatting tool with $javaBin")
def scriptDir = rootDir.path.endsWith('buildSrc') def scriptDir = rootDir.path.endsWith('buildSrc')
? "${rootDir}/../java-format" ? "${rootDir}/../java-format"
: "${rootDir}/java-format" : "${rootDir}/java-format"
@ -515,7 +521,7 @@ rootProject.ext {
def pythonExe = getPythonExecutable() def pythonExe = getPythonExecutable()
return ext.execInBash( return ext.execInBash(
"JAVA=${javaHome}/bin/java PYTHON=${pythonExe} ${formatDiffScript} ${action}", "${workingDir}") "JAVA=${javaBin} PYTHON=${pythonExe} ${formatDiffScript} ${action}", "${workingDir}")
} }
} }