fix(gradle): restore task replacement (#3110)

* Use same approach as in Maven * Re-enable task override * Restore task dependency
vaadin · Jan 2, 2025 · 567ad7e · 567ad7e
1 parent c6fd240
commit 567ad7e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/...ages/java/engine-core/src/main/java/com/vaadin/hilla/engine/AotBrowserCallableFinder.java b/...ages/java/engine-core/src/main/java/com/vaadin/hilla/engine/AotBrowserCallableFinder.java
@@ -89,9 +89,15 @@ private static Path generateAotArtifacts(
 
         // Runs the SpringApplicationAotProcessor to generate the
         // reflect-config.json file. This comes from the `process-aot` goal.
-        new ProcessBuilder().inheritIO().command(javaExecutable, "@" + argsFile)
-                .start().waitFor();
-        Files.delete(argsFile);
+        int exitCode = new ProcessBuilder().inheritIO()
+                .command(javaExecutable, "@" + argsFile).start().waitFor();
+
+        if (exitCode == 0) {
+            Files.delete(argsFile);
+        } else {
+            LOGGER.error(
+                    SPRING_AOT_PROCESSOR + " exited with code: " + exitCode);
+        }
 
         var json = aotOutput.resolve(Path.of("resources", "META-INF",
                 "native-image", engineConfiguration.getGroupId(),

diff --git a/...s/java/gradle-plugin/src/main/kotlin/com/vaadin/hilla/gradle/plugin/EngineGenerateTask.kt b/...s/java/gradle-plugin/src/main/kotlin/com/vaadin/hilla/gradle/plugin/EngineGenerateTask.kt
@@ -34,7 +34,7 @@ public open class EngineGenerateTask : DefaultTask() {
         description = "Hilla Generate Task"
 
         // we need the compiled classes:
-        dependsOn("classes", "hillaConfigure")
+        dependsOn("classes")
 
         // Make sure to run this task before the `war`/`jar` tasks, so that
         // generated endpoints and models will end up packaged in the war/jar archive.

diff --git a/packages/java/gradle-plugin/src/main/kotlin/com/vaadin/hilla/gradle/plugin/HillaPlugin.kt b/packages/java/gradle-plugin/src/main/kotlin/com/vaadin/hilla/gradle/plugin/HillaPlugin.kt
@@ -42,6 +42,8 @@ public class HillaPlugin : Plugin<Project> {
         // to leverage from vaadinPrepareFrontend and vaadinBuildFrontend:
         project.pluginManager.apply(VaadinPlugin::class.java)
 
+        project.tasks.replace("vaadinBuildFrontend", EngineBuildFrontendTask::class.java)
+
         project.tasks.apply {
             register("hillaConfigure", EngineConfigureTask::class.java)
             register("hillaGenerate", EngineGenerateTask::class.java)

diff --git a/...-tests/src/test/java/com/vaadin/hilla/gradle/plugin/test/ProductionBuildFunctionalIT.java b/...-tests/src/test/java/com/vaadin/hilla/gradle/plugin/test/ProductionBuildFunctionalIT.java
@@ -68,7 +68,7 @@ public void runProductionBuild() {
         } catch (IOException e) {
             fail(e);
         }
-        runGradleCommand("--info -Pvaadin.productionMode=true build");
+        runGradleCommand("--info --stacktrace -Pvaadin.productionMode=true build");
     }
 
     private void runGradleCommand(String executable) {