From 42bdca9c70e54d095e9ebfd69e82d1bca15bf9ac Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Tue, 9 Nov 2021 22:26:45 +0100 Subject: feat: adds two tests and makes them pass for new `runFregeTask` --- src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java') diff --git a/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java b/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java index 4f0bb34..8c50a5f 100644 --- a/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java +++ b/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java @@ -7,6 +7,7 @@ import org.gradle.api.tasks.TaskProvider; public class FregePlugin implements Plugin { public static final String SETUP_FREGE_TASK_NAME = "setupFrege"; public static final String COMPILE_FREGE_TASK_NAME = "compileFrege"; + public static final String RUN_FREGE_TASK_NAME = "runFrege"; public static final String FREGE_PLUGIN_ID = "ch.fhnw.thga.frege"; public static final String FREGE_EXTENSION_NAME = "frege"; @@ -20,11 +21,18 @@ public class FregePlugin implements Plugin { task.getDownloadDir().set(extension.getCompilerDownloadDir()); }); - project.getTasks().register(COMPILE_FREGE_TASK_NAME, CompileFregeTask.class, task -> { - task.dependsOn(setupFregeCompilerTask); + TaskProvider compileFregeTask = project.getTasks().register(COMPILE_FREGE_TASK_NAME, + CompileFregeTask.class, task -> { + task.dependsOn(setupFregeCompilerTask); + task.getFregeCompilerJar().set(setupFregeCompilerTask.get().getFregeCompilerOutputPath()); + task.getFregeMainSourceDir().set(extension.getMainSourceDir()); + task.getFregeOutputDir().set(extension.getOutputDir()); + }); + project.getTasks().register(RUN_FREGE_TASK_NAME, RunFregeTask.class, task -> { + task.dependsOn(compileFregeTask); task.getFregeCompilerJar().set(setupFregeCompilerTask.get().getFregeCompilerOutputPath()); - task.getFregeMainSourceDir().set(extension.getMainSourceDir()); task.getFregeOutputDir().set(extension.getOutputDir()); + task.getMainModule().set(extension.getMainModule()); }); } } -- cgit