From 47a5b646d30a6cf7b9e3de2c4417e33d22fb4517 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Wed, 23 Oct 2019 18:15:57 +0300 Subject: [PATCH] Fix broken gradle buildNative The task needs to be executed after assemble --- .../gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java index 4aa1735c44d0f..326ebd0ad1c3d 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java @@ -60,11 +60,13 @@ private void registerTasks(Project project) { quarkusBuild.dependsOn(classesTask); }); - Task buildNative = tasks.create("buildNative", QuarkusNative.class).dependsOn(quarkusBuild); + Task buildNative = tasks.create("buildNative", QuarkusNative.class); // set up the source set for the testNative JavaPluginConvention javaPlugin = project.getConvention().findPlugin(JavaPluginConvention.class); if (javaPlugin != null) { + buildNative.dependsOn(tasks.getByName(BasePlugin.ASSEMBLE_TASK_NAME)); + SourceSetContainer sourceSets = javaPlugin.getSourceSets(); SourceSet nativeTestSourceSet = sourceSets.create("native-test"); // this name has to be the same as the directory in which the tests reside SourceSetOutput mainSourceSetOutput = sourceSets.getByName("main").getOutput();