You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2023/09/21 08:42:59 UTC

[lucene] branch branch_9x updated: Resolve CompileJava task cache miss (#12577)

This is an automated email from the ASF dual-hosted git repository.

dweiss pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/lucene.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new eff9eb3c3c6 Resolve CompileJava task cache miss (#12577)
eff9eb3c3c6 is described below

commit eff9eb3c3c6b15a1eb9b8a5331f61fc4bd45164f
Author: Tyler Bertrand <12...@users.noreply.github.com>
AuthorDate: Thu Sep 21 03:42:20 2023 -0500

    Resolve CompileJava task cache miss (#12577)
    
    Resolve CompileJava task cache miss. Implement CommandLineArgumentProvider to give relative path sensitivity to apiJar file
---
 gradle/generation/extract-jdk-apis.gradle |  4 ++--
 gradle/java/core-mrjar.gradle             | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/gradle/generation/extract-jdk-apis.gradle b/gradle/generation/extract-jdk-apis.gradle
index 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.gradle
index 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}"]
+  }
+}