Apache Lucene open-source search software
Resolve CompileJava task cache miss (#12577)
Tyler Bertrande43bea4fa4c9
diff --git a/gradle/generation/extract-jdk-apis.gradle b/gradle/generation/extract-jdk-apis.gradleindex 78e74aa261a..28f56ea6432 100644--- a/gradle/generation/extract-jdk-apis.gradle+++ b/gradle/generation/extract-jdk-apis.gradle@@ -26,7 +26,7 @@ configure(rootProject) {configure(project(":lucene:core")) {ext {- apijars = file('src/generated/jdk');+ apijars = layout.projectDirectory.dir("src/generated/jdk")mrjarJavaVersions = [ 19, 20, 21 ]}@@ -66,7 +66,7 @@ configure(project(":lucene:core")) {]args = [jdkVersion,- new File(apijars, "jdk${jdkVersion}.apijar"),+ apijars.file("jdk${jdkVersion}.apijar"),]}diff --git a/gradle/java/core-mrjar.gradle b/gradle/java/core-mrjar.gradleindex 5715e782f00..ed102c8566e 100644--- a/gradle/java/core-mrjar.gradle+++ b/gradle/java/core-mrjar.gradle@@ -29,20 +29,19 @@ configure(project(":lucene:core")) {dependencies.add("main${jdkVersion}Implementation", sourceSets.main.output)tasks.named("compileMain${jdkVersion}Java").configure {- def apijar = new File(apijars, "jdk${jdkVersion}.apijar")-- inputs.file(apijar)+ def apijar = apijars.file("jdk${jdkVersion}.apijar")int releaseIndex = options.compilerArgs.indexOf("--release")options.compilerArgs.removeAt(releaseIndex)options.compilerArgs.removeAt(releaseIndex)options.compilerArgs += ["-Xlint:-options",- "--patch-module", "java.base=${apijar}","--add-exports", "java.base/java.lang.foreign=ALL-UNNAMED",// for compilation we patch the incubator packages into java.base, this has no effect on resulting class files:"--add-exports", "java.base/jdk.incubator.vector=ALL-UNNAMED",]++ options.compilerArgumentProviders.add(new CompilerArgsProvider(apiJarFile: apijar))}}@@ -59,3 +58,15 @@ configure(project(":lucene:core")) {}}}++class CompilerArgsProvider implements CommandLineArgumentProvider {++ @InputFile+ @PathSensitive(PathSensitivity.RELATIVE)+ RegularFile apiJarFile++ @Override+ Iterable<String> asArguments() {+ return ["--patch-module", "java.base=${apiJarFile}"]+ }+}