diff options
| author | Thibault Gagnaux <tgagnaux@gmail.com> | 2021-11-28 11:40:14 +0100 |
|---|---|---|
| committer | Thibault Gagnaux <tgagnaux@gmail.com> | 2021-11-28 12:10:06 +0100 |
| commit | 8fed7811e535d3f8892ea16f7587e461ef1ee98e (patch) | |
| tree | a3e03352508205c5a2974b70e244bb49cd97ff96 | |
| parent | 133a0cc6e0c5d5130f415cf8d9bb7155a702d2d0 (diff) | |
| download | frege-gradle-plugin-8fed7811e535d3f8892ea16f7587e461ef1ee98e.tar.gz frege-gradle-plugin-8fed7811e535d3f8892ea16f7587e461ef1ee98e.tar.bz2 frege-gradle-plugin-8fed7811e535d3f8892ea16f7587e461ef1ee98e.zip | |
fix: adds `System.in` as StandardInput to make `ReplFrege` task interactively
| -rw-r--r-- | gradle.properties | 2 | ||||
| -rw-r--r-- | src/functionalTest/java/ch/fhnw/thga/gradleplugins/FregePluginFunctionalTest.java | 9 | ||||
| -rw-r--r-- | src/main/java/ch/fhnw/thga/gradleplugins/ReplFregeTask.java | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/gradle.properties b/gradle.properties index ea66424..aa3263c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ group = ch.fhnw.thga -version = 1.4.0-alpha
\ No newline at end of file +version = 1.4.1-alpha
\ No newline at end of file diff --git a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/FregePluginFunctionalTest.java b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/FregePluginFunctionalTest.java index 70756b0..395d26f 100644 --- a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/FregePluginFunctionalTest.java +++ b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/FregePluginFunctionalTest.java @@ -1,7 +1,12 @@ package ch.fhnw.thga.gradleplugins; import static ch.fhnw.thga.gradleplugins.FregeExtension.DEFAULT_DOWNLOAD_DIRECTORY; -import static ch.fhnw.thga.gradleplugins.FregePlugin.*; +import static ch.fhnw.thga.gradleplugins.FregePlugin.COMPILE_FREGE_TASK_NAME; +import static ch.fhnw.thga.gradleplugins.FregePlugin.FREGE_EXTENSION_NAME; +import static ch.fhnw.thga.gradleplugins.FregePlugin.FREGE_PLUGIN_ID; +import static ch.fhnw.thga.gradleplugins.FregePlugin.REPL_FREGE_TASK_NAME; +import static ch.fhnw.thga.gradleplugins.FregePlugin.RUN_FREGE_TASK_NAME; +import static ch.fhnw.thga.gradleplugins.FregePlugin.SETUP_FREGE_TASK_NAME; import static ch.fhnw.thga.gradleplugins.GradleBuildFileConversionTest.createPluginsSection; import static org.gradle.testkit.runner.TaskOutcome.FAILED; import static org.gradle.testkit.runner.TaskOutcome.FROM_CACHE; @@ -29,7 +34,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayNameGenerator; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; @@ -359,7 +363,6 @@ public class FregePluginFunctionalTest { @IndicativeSentencesGeneration(separator = " -> ", generator = DisplayNameGenerator.ReplaceUnderscores.class) class Repl_frege_task_works { @Test - @Tag("hard") void given_minimal_build_file_config() throws Exception { Files.createDirectories(testProjectDir.toPath().resolve(Paths.get("src", "main", "frege"))); String minimalBuildFileConfig = createFregeSection( diff --git a/src/main/java/ch/fhnw/thga/gradleplugins/ReplFregeTask.java b/src/main/java/ch/fhnw/thga/gradleplugins/ReplFregeTask.java index 9ee14df..9541861 100644 --- a/src/main/java/ch/fhnw/thga/gradleplugins/ReplFregeTask.java +++ b/src/main/java/ch/fhnw/thga/gradleplugins/ReplFregeTask.java @@ -48,6 +48,7 @@ public abstract class ReplFregeTask extends DefaultTask { @TaskAction public void startFregeRepl() { + javaExec.setStandardInput(System.in); javaExec.getMainClass().set(REPL_MAIN_CLASS); javaExec.setClasspath(getClasspath().get()).exec(); } |