Allow running the task on subprojects too.

build.gradle

@@ -33,6 +33,7 @@ dependencies {
 
     testImplementation gradleTestKit()
     implementation 'com.gluonhq:substrate:0.0.38-SNAPSHOT'
+    implementation 'org.openjfx:javafx-plugin:0.0.10'
 }
 
 gradlePlugin {

src/main/java/com/gluonhq/gradle/tasks/ClientNativeRunAgent.java

@@ -33,9 +33,14 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
+import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.ApplicationPlugin;
 import org.gradle.api.tasks.JavaExec;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.util.GradleVersion;
+import org.openjfx.gradle.JavaFXModule;
+import org.openjfx.gradle.JavaFXOptions;
+import org.openjfx.gradle.JavaFXPlatform;
 
 import javax.inject.Inject;
 import java.io.BufferedWriter;
@@ -45,11 +50,15 @@
 import java.io.OutputStreamWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.TreeSet;
 
 public class ClientNativeRunAgent extends ClientNativeBase {
 
+    private static final String CONFIG_JAVAFX_RUN_TASK = "configJavafxRun";
+
     private static final String AGENTLIB_NATIVE_IMAGE_AGENT_STRING =
             "-agentlib:native-image-agent=access-filter-file=src/main/resources/META-INF/native-image/filter-file.json,config-merge-dir=src/main/resources/META-INF/native-image";
 
@@ -66,9 +75,9 @@ public ClientNativeRunAgent(Project project) {
         super(project);
         clientExtension = project.getExtensions().getByType(ClientExtension.class);
 
-        Task javafxRun = project.getTasks().findByPath(":configJavafxRun");
+        Task javafxRun = project.getTasks().findByName(CONFIG_JAVAFX_RUN_TASK);
         if (javafxRun == null) {
-            throw new GradleException("javafxplugin:configJavafxRun task not found.");
+            throw new GradleException("javafxplugin:" + CONFIG_JAVAFX_RUN_TASK + " task not found.");
         }
         this.dependsOn(javafxRun.getPath());
     }
@@ -87,7 +96,7 @@ public void action() {
 
         try {
             // folder
-            Path path = Path.of(project.getRootDir().getAbsolutePath(), "src", "main", "resources", "META-INF", "native-image");
+            Path path = Path.of(project.getProjectDir().getAbsolutePath(), "src", "main", "resources", "META-INF", "native-image");
             if (Files.exists(path)) {
                 // TODO: Delete files
                 // otherwise it keeps merging results from different runs
@@ -107,15 +116,39 @@ public void action() {
             if (execTask == null) {
                 throw new GradleException("Run task not found.");
             }
-            // collect all jvmArgs after :configJavafxRun
-            List<String> args = execTask.getAllJvmArgs();
+
+            JavaFXOptions javaFXOptions = project.getExtensions().getByType(JavaFXOptions.class);
+            var definedJavaFXModuleNames = new TreeSet<>(javaFXOptions.getModules());
+            if (definedJavaFXModuleNames.isEmpty()) {
+                throw new GradleException("No JavaFX modules found.");
+            }
+            final FileCollection classpathWithoutJavaFXJars = execTask.getClasspath().filter(
+                    jar -> Arrays.stream(JavaFXModule.values()).noneMatch(javaFXModule ->
+                            jar.getName().contains(javaFXModule.getArtifactName()))
+            );
+            final FileCollection javaFXPlatformJars = execTask.getClasspath().filter(jar ->
+                    isJavaFXJar(jar, javaFXOptions.getPlatform()));
+
+            // Remove all JavaFX jars from classpath
+            execTask.setClasspath(classpathWithoutJavaFXJars);
+
+            // Define JVM args for command line
+            var javaFXModuleJvmArgs = List.of("--module-path", javaFXPlatformJars.getAsPath());
+            var jvmArgs = new ArrayList<>(javaFXModuleJvmArgs);
+            jvmArgs.add("--add-modules");
+            jvmArgs.add(String.join(",", definedJavaFXModuleNames));
+            if (GradleVersion.current().compareTo(GradleVersion.version("6.6")) < 0) {
+                // Include classpath as JVM arg for Gradle versions lower than 6.6
+                jvmArgs.add("-cp");
+                jvmArgs.add(classpathWithoutJavaFXJars.getAsPath());
+            }
 
             // set java_home
             execTask.executable(Path.of(graalVMHome.toString(), "bin", "java").toString());
 
             // set jvmargs
             execTask.getJvmArgs().add(AGENTLIB_NATIVE_IMAGE_AGENT_STRING);
-            execTask.getJvmArgs().addAll(args);
+            execTask.getJvmArgs().addAll(jvmArgs);
 
             // run
             execTask.exec();
@@ -124,7 +157,7 @@ public void action() {
         }
     }
 
-    Path getGraalHome() {
+    private Path getGraalHome() {
         String graalvmHome = clientExtension.getGraalvmHome();
         if (graalvmHome == null) {
             graalvmHome = System.getenv("GRAALVM_HOME");
@@ -157,4 +190,11 @@ private void createFilterFile(String agentFilter) throws IOException {
             bw.write("}\n");
         }
     }
+
+    private static boolean isJavaFXJar(File jar, JavaFXPlatform platform) {
+        return jar.isFile() &&
+                Arrays.stream(JavaFXModule.values()).anyMatch(javaFXModule ->
+                        javaFXModule.compareJarFileName(platform, jar.getName()) ||
+                                javaFXModule.getModuleJarFileName().equals(jar.getName()));
+    }
 }