fixed bug(FibreFoX#147)

tuuzed · Jun 24, 2021 · 3efc0b3 · 3efc0b3
1 parent 178c9f6
commit 3efc0b3
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/src/main/java/de/dynamicfiles/projects/gradle/plugins/javafx/JavaFXGradlePlugin.java b/src/main/java/de/dynamicfiles/projects/gradle/plugins/javafx/JavaFXGradlePlugin.java
@@ -30,9 +30,8 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.gradle.api.GradleException;
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
+
+import org.gradle.api.*;
 
 /**
  *
@@ -51,11 +50,11 @@ public void apply(Project project) {
         // gradle is lame, so replace existing tasks with MY NAMES ! *battle-cry*
 
         // tasks will be available for the buldscript prior full evaluation
-        JfxJarTask jarTask = project.getTasks().replace(JfxJarTask.JFX_TASK_NAME, JfxJarTask.class);
-        JfxNativeTask nativeTask = project.getTasks().replace(JfxNativeTask.JFX_TASK_NAME, JfxNativeTask.class);
-        JfxGenerateKeystoreTask generateKeystoreTask = project.getTasks().replace(JfxGenerateKeystoreTask.JFX_TASK_NAME, JfxGenerateKeystoreTask.class);
-        JfxRunTask runTask = project.getTasks().replace(JfxRunTask.JFX_TASK_NAME, JfxRunTask.class);
-        JfxListBundlersTask jfxListBundlersTask = project.getTasks().replace(JfxListBundlersTask.JFX_TASK_NAME, JfxListBundlersTask.class);
+        JfxJarTask jarTask = setTask(project, JfxJarTask.JFX_TASK_NAME, JfxJarTask.class);
+        JfxNativeTask nativeTask = setTask(project, JfxNativeTask.JFX_TASK_NAME, JfxNativeTask.class);
+        JfxGenerateKeystoreTask generateKeystoreTask = setTask(project, JfxGenerateKeystoreTask.JFX_TASK_NAME, JfxGenerateKeystoreTask.class);
+        JfxRunTask runTask = setTask(project, JfxRunTask.JFX_TASK_NAME, JfxRunTask.class);
+        JfxListBundlersTask jfxListBundlersTask = setTask(project, JfxListBundlersTask.JFX_TASK_NAME, JfxListBundlersTask.class);
 
         String taskGroupName = "JavaFX";
 
@@ -96,6 +95,17 @@ public void apply(Project project) {
         });
     }
 
+    private <T extends Task> T setTask(Project project, String taskName, Class<T> taskType) {
+        T task;
+        try {
+            project.getTasks().getByName(taskName);
+            task = project.getTasks().replace(taskName, taskType);
+        } catch (UnknownTaskException e) {
+            task = project.getTasks().create(taskName, taskType);
+        }
+        return task;
+    }
+
     private void addJavaFXAntJARToGradleBuildpath(Project project) {
         String jfxAntJarPath = "/../lib/" + ANT_JAVAFX_JAR_FILENAME;