Fixed Project name captured at configuration time for configuration-cache safety

Author: mfriesen

src/main/java/com/formkiq/gradle/GraalvmNativePlugin.java

@@ -42,6 +42,7 @@ public void apply(final Project project) {
           task.setExtension(ext);
           task.usesService(svc);
           task.getBuildDirectory().set(project.getLayout().getBuildDirectory().dir("graalvm"));
+          task.getProjectName().set(project.getName());
 
           // ✅ Opt-in: task will only run if configured
           task.onlyIf(t -> {

src/main/java/com/formkiq/gradle/GraalvmNativeTask.java

@@ -37,6 +37,7 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.provider.Property;
 import org.gradle.api.resources.ResourceException;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Classpath;
@@ -80,6 +81,14 @@ public abstract class GraalvmNativeTask extends DefaultTask {
   @OutputDirectory
   public abstract DirectoryProperty getBuildDirectory();
 
+  /**
+   * Project name captured at configuration time for configuration-cache safety.
+   *
+   * @return Property
+   */
+  @Input
+  public abstract Property<String> getProjectName();
+
   /**
    * Extension configuration fingerprint for task caching.
    *
@@ -214,8 +223,9 @@ public void createImage() {
           }
 
           executor.runGuInstallation(getExecOperations(), graalvmBaseDir);
-          executor.runNativeImage(getExecOperations(), getProject(), getBuildDirectoryAsPath(),
-              graalvmBaseDir.toFile(), path.toFile(), getRuntimeClasspath());
+          executor.runNativeImage(getExecOperations(), getProjectName().get(),
+              getBuildDirectoryAsPath(), graalvmBaseDir.toFile(), path.toFile(),
+              getRuntimeClasspath());
         }
 
       } catch (IOException | InterruptedException e) {

src/main/java/com/formkiq/gradle/internal/NativeImageExecutor.java

@@ -27,7 +27,6 @@
 import java.util.Arrays;
 import java.util.List;
 import org.apache.tools.ant.helper.DefaultExecutor;
-import org.gradle.api.Project;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.internal.os.OperatingSystem;
 import org.gradle.process.ExecOperations;
@@ -54,15 +53,15 @@ public NativeImageExecutor(final GraalvmNativeExtension ext) {
    * Build Graalvm Image.
    *
    * @param execOperations {@link ExecOperations}
-   * @param project {@link Project}
+   * @param projectName project name
    * @param buildDir {@link Path}
    * @param graalvmBaseDir {@link File}
    * @param outputDir {@link File}
    */
-  public void buildGraalvmImage(final ExecOperations execOperations, final Project project,
+  public void buildGraalvmImage(final ExecOperations execOperations, final String projectName,
       final Path buildDir, final File graalvmBaseDir, File outputDir) {
 
-    List<String> args = getBuildGraalvmImageArguments(project, buildDir);
+    List<String> args = getBuildGraalvmImageArguments(projectName, buildDir);
 
     execOperations.exec(arg0 -> {
       String executeable =
@@ -86,14 +85,14 @@ public void buildGraalvmJavaMain(final Path buildDir,
     new RuntimeDependenciesDecompress().apply(buildDir, runtimeClasspath);
   }
 
-  List<String> getBuildGraalvmImageArguments(final Project project, final Path buildDir) {
+  List<String> getBuildGraalvmImageArguments(final String projectName, final Path buildDir) {
 
     List<String> args = new ArrayList<>(new GraalvmParameterToStrings().apply(this.extension));
 
     String executableName = this.extension.getOutputFileName();
 
     if (executableName != null) {
-      args.add("-H:Name=" + getExecutableName(project));
+      args.add("-H:Name=" + getExecutableName(projectName));
     }
 
     args.addAll(new GraalvmClasspathArguments(buildDir).apply(this.extension));
@@ -103,9 +102,9 @@ List<String> getBuildGraalvmImageArguments(final Project project, final Path bui
     return args;
   }
 
-  private String getExecutableName(final Project project) {
+  private String getExecutableName(final String projectName) {
     return this.extension.getOutputFileName() != null ? this.extension.getOutputFileName()
-        : project.getName();
+        : projectName;
   }
 
   private Path getGraalBin(final File graalvmBaseDir) {
@@ -139,19 +138,19 @@ public void runGuInstallation(final ExecOperations execOperations, final Path gr
    * Run Native Image Command.
    *
    * @param execOperations {@link ExecOperations}
-   * @param project {@link Project}
+   * @param projectName project name
    * @param buildDir {@link Path}
    * @param graalvmBaseDir {@link Files}
    * @param outputDir {@link File}
    * @param runtimeClasspath {@link ConfigurableFileCollection}
    * @throws IOException IOException
    */
-  public void runNativeImage(final ExecOperations execOperations, final Project project,
+  public void runNativeImage(final ExecOperations execOperations, final String projectName,
       final Path buildDir, final File graalvmBaseDir, File outputDir,
       final ConfigurableFileCollection runtimeClasspath) throws IOException {
 
     buildGraalvmJavaMain(buildDir, runtimeClasspath);
 
-    buildGraalvmImage(execOperations, project, buildDir, graalvmBaseDir, outputDir);
+    buildGraalvmImage(execOperations, projectName, buildDir, graalvmBaseDir, outputDir);
   }
 }

src/test/java/com/formkiq/gradle/internal/NativeImageExecutorTest.java

@@ -32,7 +32,7 @@ void testGetBuildGraalvmImageArguments01() {
     NativeImageExecutor executor = new NativeImageExecutor(extension);
 
     // when
-    List<String> args = executor.getBuildGraalvmImageArguments(project, fakeBuildDir);
+    List<String> args = executor.getBuildGraalvmImageArguments(project.getName(), fakeBuildDir);
 
     // then
     assertTrue(args.stream().anyMatch(a -> a.equals("-H:Name=my-app")),
@@ -49,7 +49,7 @@ void testGetBuildGraalvmImageArguments02() {
     NativeImageExecutor executor = new NativeImageExecutor(extension);
 
     // when
-    List<String> args = executor.getBuildGraalvmImageArguments(project, fakeBuildDir);
+    List<String> args = executor.getBuildGraalvmImageArguments(project.getName(), fakeBuildDir);
 
     // then
     assertTrue(args.stream().noneMatch(a -> a.startsWith("-H:Name=")),
@@ -67,7 +67,7 @@ void testGetBuildGraalvmImageArguments03() {
     NativeImageExecutor executor = new NativeImageExecutor(extension);
 
     // when
-    List<String> args = executor.getBuildGraalvmImageArguments(project, fakeBuildDir);
+    List<String> args = executor.getBuildGraalvmImageArguments(project.getName(), fakeBuildDir);
 
     // then
     final int expected = 7;