From f15beb19f0f744310219b62622f3a7bf5bc79874 Mon Sep 17 00:00:00 2001
From: samypr100 <3933065+samypr100@users.noreply.github.com>
Date: Sat, 23 Sep 2023 21:49:38 -0400
Subject: [PATCH 1/2] feat: support application.mainClass instead of
 mainClassName deprecated convention and lazy plugin loading to get source
 main sets

---
 .../com/gluonhq/gradle/tasks/ConfigBuild.java | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/gluonhq/gradle/tasks/ConfigBuild.java b/src/main/java/com/gluonhq/gradle/tasks/ConfigBuild.java
index 7778b33..c45f328 100644
--- a/src/main/java/com/gluonhq/gradle/tasks/ConfigBuild.java
+++ b/src/main/java/com/gluonhq/gradle/tasks/ConfigBuild.java
@@ -32,7 +32,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
@@ -40,6 +40,10 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.DependencySet;
+import org.gradle.api.plugins.ApplicationPlugin;
+import org.gradle.api.plugins.JavaApplication;
+import org.gradle.api.plugins.JavaPlugin;
+import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
 
@@ -84,7 +88,7 @@ public void build() {
 
             Path buildRootPath = project.getLayout().getBuildDirectory().dir(Constants.GLUONFX_PATH).get().getAsFile().toPath();
             project.getLogger().debug("BuildRoot: " + buildRootPath);
-            
+
             SubstrateDispatcher dispatcher = new SubstrateDispatcher(buildRootPath, clientConfig);
             result = dispatcher.nativeCompile();
         } catch (Exception e) {
@@ -97,7 +101,19 @@ public void build() {
     }
 
     private ProjectConfiguration createSubstrateConfiguration() {
-        ProjectConfiguration clientConfig = new ProjectConfiguration((String) project.getProperties().get("mainClassName"), getClassPath());
+        // Use Application Plugin First to get mainClass
+        Property<String> mainClass = project.getObjects().property(String.class);
+        project.getPlugins().withType(ApplicationPlugin.class, applicationPlugin -> {
+            JavaApplication javaApp = project.getExtensions().getByType(JavaApplication.class);
+            mainClass.set(javaApp.getMainClass().getOrNull());
+        });
+        // Fallback to deprecated mainClassName
+        if (!mainClass.isPresent()){
+            mainClass.set((String) project.getProperties().get("mainClassName"));
+        }
+
+        // Init Client Config
+        ProjectConfiguration clientConfig = new ProjectConfiguration(mainClass.getOrNull(), getClassPath());
         clientConfig.setJavaStaticSdkVersion(clientExtension.getJavaStaticSdkVersion());
         clientConfig.setJavafxStaticSdkVersion(clientExtension.getJavafxStaticSdkVersion());
 
@@ -159,14 +175,15 @@ private String getClassPath() {
     }
 
     private List<Path> getClassPathFromSourceSets() {
-        List<Path> classPath = Collections.emptyList();
-        SourceSetContainer sourceSetContainer = (SourceSetContainer) project.getProperties().get("sourceSets");
-        SourceSet mainSourceSet = sourceSetContainer.findByName("main");
-        if (mainSourceSet != null) {
-            classPath = mainSourceSet.getRuntimeClasspath().getFiles().stream()
+        final List<Path> classPath = new ArrayList<>();
+        project.getPlugins().withType(JavaPlugin.class, javaPlugin -> {
+            SourceSetContainer sourceSetContainer = project.getExtensions().getByType(SourceSetContainer.class);
+            SourceSet mainSourceSet = sourceSetContainer.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+            mainSourceSet.getRuntimeClasspath().getFiles().stream()
                     .filter(File::exists)
-                    .map(File::toPath).collect(Collectors.toList());
-        }
+                    .map(File::toPath)
+                    .forEachOrdered(classPath::add);
+        });
         return classPath;
     }
 

From 85ab3832e16817c46a89011834918a3d65625560 Mon Sep 17 00:00:00 2001
From: Abhinay Agarwal <abhinay.agarwal@gluonhq.com>
Date: Sat, 13 Jul 2024 13:44:18 +0530
Subject: [PATCH 2/2] changes as per feedback

---
 src/main/java/com/gluonhq/gradle/tasks/ConfigBuild.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gluonhq/gradle/tasks/ConfigBuild.java b/src/main/java/com/gluonhq/gradle/tasks/ConfigBuild.java
index c45f328..a027013 100644
--- a/src/main/java/com/gluonhq/gradle/tasks/ConfigBuild.java
+++ b/src/main/java/com/gluonhq/gradle/tasks/ConfigBuild.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Gluon
+ * Copyright (c) 2019, 2024, Gluon
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -108,7 +108,7 @@ private ProjectConfiguration createSubstrateConfiguration() {
             mainClass.set(javaApp.getMainClass().getOrNull());
         });
         // Fallback to deprecated mainClassName
-        if (!mainClass.isPresent()){
+        if (!mainClass.isPresent()) {
             mainClass.set((String) project.getProperties().get("mainClassName"));
         }