aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/ch/fhnw/thga/gradleplugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/ch/fhnw/thga/gradleplugins')
-rw-r--r--src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java3
-rw-r--r--src/main/java/ch/fhnw/thga/gradleplugins/ReplFregeTask.java27
2 files changed, 5 insertions, 25 deletions
diff --git a/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java b/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java
index 5fc89b2..b4948e6 100644
--- a/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java
+++ b/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java
@@ -42,9 +42,8 @@ public class FregePlugin implements Plugin<Project> {
task.getFregeDependencies().set(implementation.getAsPath());
});
project.getTasks().register(REPL_FREGE_TASK_NAME, ReplFregeTask.class, task -> {
- task.dependsOn(compileFregeTask);
+ task.dependsOn(setupFregeCompilerTask);
task.getFregeCompilerJar().set(setupFregeCompilerTask.get().getFregeCompilerOutputPath());
- task.getFregeOutputDir().set(extension.getOutputDir());
task.getFregeDependencies().set(implementation.getAsPath());
});
}
diff --git a/src/main/java/ch/fhnw/thga/gradleplugins/ReplFregeTask.java b/src/main/java/ch/fhnw/thga/gradleplugins/ReplFregeTask.java
index 9541861..5a915c0 100644
--- a/src/main/java/ch/fhnw/thga/gradleplugins/ReplFregeTask.java
+++ b/src/main/java/ch/fhnw/thga/gradleplugins/ReplFregeTask.java
@@ -1,55 +1,36 @@
package ch.fhnw.thga.gradleplugins;
-import javax.inject.Inject;
-
import org.gradle.api.DefaultTask;
-import org.gradle.api.file.DirectoryProperty;
import org.gradle.api.file.FileCollection;
import org.gradle.api.file.RegularFileProperty;
import org.gradle.api.logging.Logger;
import org.gradle.api.logging.Logging;
-import org.gradle.api.model.ObjectFactory;
import org.gradle.api.provider.Property;
import org.gradle.api.provider.Provider;
import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.InputDirectory;
import org.gradle.api.tasks.InputFile;
import org.gradle.api.tasks.Internal;
-import org.gradle.api.tasks.JavaExec;
import org.gradle.api.tasks.TaskAction;
public abstract class ReplFregeTask extends DefaultTask {
public static final Logger LOGGER = Logging.getLogger(SetupFregeTask.class);
- public static final String REPL_MAIN_CLASS = "frege.repl.FregeRepl";
-
- private final JavaExec javaExec;
@InputFile
public abstract RegularFileProperty getFregeCompilerJar();
- @InputDirectory
- public abstract DirectoryProperty getFregeOutputDir();
-
@Input
public abstract Property<String> getFregeDependencies();
@Internal
public final Provider<FileCollection> getClasspath() {
return getFregeDependencies().map(depsClasspath -> {
- return depsClasspath.isEmpty() ? getProject().files(getFregeCompilerJar(), getFregeOutputDir())
- : getProject().files(getFregeCompilerJar(), getFregeOutputDir(), depsClasspath);
+ return depsClasspath.isEmpty() ? getProject().files(getFregeCompilerJar())
+ : getProject().files(getFregeCompilerJar(), depsClasspath);
});
}
- @Inject
- public ReplFregeTask(ObjectFactory objectFactory) {
- javaExec = objectFactory.newInstance(JavaExec.class);
- }
-
@TaskAction
- public void startFregeRepl() {
- javaExec.setStandardInput(System.in);
- javaExec.getMainClass().set(REPL_MAIN_CLASS);
- javaExec.setClasspath(getClasspath().get()).exec();
+ public void fregeReplDependencies() {
+ System.out.println(getClasspath().get().getAsPath());
}
}