From 7ef464ab2c2a6a2e0b9ee857d6979ab98f1ec930 Mon Sep 17 00:00:00 2001
From: Thibault Gagnaux <tgagnaux@gmail.com>
Date: Fri, 11 Feb 2022 13:58:28 +0100
Subject: refactor: finishes the compileFregeTask refactoring

---
 src/main/java/ch/fhnw/thga/gradleplugins/CompileFregeTask.java | 8 ++++++--
 src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java      | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/ch/fhnw/thga/gradleplugins/CompileFregeTask.java b/src/main/java/ch/fhnw/thga/gradleplugins/CompileFregeTask.java
index c280607..a3c42d2 100644
--- a/src/main/java/ch/fhnw/thga/gradleplugins/CompileFregeTask.java
+++ b/src/main/java/ch/fhnw/thga/gradleplugins/CompileFregeTask.java
@@ -25,6 +25,7 @@ import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.PathSensitive;
 import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.api.tasks.options.Option;
 
 @CacheableTask
 public abstract class CompileFregeTask extends DefaultTask {
@@ -46,7 +47,10 @@ public abstract class CompileFregeTask extends DefaultTask {
     public abstract Property<String> getFregeDependencies();
 
     @Input
-    public abstract Property<String> getFregeMainModuleName();
+    @Option(option = "compileItem",
+           description = "The absolute path to the frege file or the module name"
+    )
+    public abstract Property<String> getFregeCompileItem();
 
     @OutputDirectory
     public abstract DirectoryProperty getFregeOutputDir();
@@ -63,7 +67,7 @@ public abstract class CompileFregeTask extends DefaultTask {
 
     @Internal
     public final Provider<List<String>> getCompileItems() {
-        return getFregeMainModuleName()
+        return getFregeCompileItem()
             .map(name ->
             {
                 return name.isEmpty() ? getFregeSourceFiles().get()
diff --git a/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java b/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java
index ce2ce01..957dc83 100644
--- a/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java
+++ b/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java
@@ -52,7 +52,7 @@ public class FregePlugin implements Plugin<Project>
                     task.getFregeOutputDir().set(extension.getOutputDir());
                     task.getFregeCompilerFlags().set(extension.getCompilerFlags());
                     task.getFregeDependencies().set(implementation.getAsPath());
-                    task.getFregeMainModuleName().set("");
+                    task.getFregeCompileItem().set("");
                 }
             );
 
@@ -66,7 +66,7 @@ public class FregePlugin implements Plugin<Project>
                 task.dependsOn(compileFregeTask.map(
                     compileTask ->
                     {
-                        compileTask.getFregeMainModuleName().set(task.getMainModule());
+                        compileTask.getFregeCompileItem().set(task.getMainModule());
                         return compileTask;
                     })
                 .get());
@@ -86,7 +86,7 @@ public class FregePlugin implements Plugin<Project>
                 task.dependsOn(compileFregeTask.map(
                     compileTask ->
                     {
-                        compileTask.getFregeMainModuleName().set(task.getReplSource());
+                        compileTask.getFregeCompileItem().set(task.getReplSource());
                         return compileTask;
                     })
                 .get());
-- 
cgit