diff --git a/src/main/java/org/jastadd/preprocessor/testing/plugin/JastAddConfiguration.java b/src/main/java/org/jastadd/preprocessor/testing/plugin/JastAddConfiguration.java index ae3d27c7c493514dc439210399c3b29f63eee152..f21b0b268f331fb81c73495170881e5bfda39cc8 100644 --- a/src/main/java/org/jastadd/preprocessor/testing/plugin/JastAddConfiguration.java +++ b/src/main/java/org/jastadd/preprocessor/testing/plugin/JastAddConfiguration.java @@ -62,6 +62,9 @@ public interface JastAddConfiguration { @Description(value = "_only used internally_", skip = true) @OutputDirectory default File getPackageOutputDir() { + if (isSkipRun() != null && isSkipRun()) { + return null; + } return getOutputDirOrDefault().toPath().resolve(getPackageName().replace('.', File.separatorChar)).toFile(); } diff --git a/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java b/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java index e963068682f05a838c95c391c2795f36750907a7..102c05da2064be1fb660cd3ebaa5113271b28e00 100644 --- a/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java +++ b/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java @@ -6,10 +6,7 @@ import org.gradle.api.DefaultTask; import org.gradle.api.Project; import org.gradle.api.file.FileCollection; import org.gradle.api.plugins.JavaPlugin; -import org.gradle.api.tasks.Nested; -import org.gradle.api.tasks.SourceSet; -import org.gradle.api.tasks.SourceSetContainer; -import org.gradle.api.tasks.TaskAction; +import org.gradle.api.tasks.*; import java.io.File; import java.io.IOException; @@ -80,7 +77,8 @@ public abstract class RelastTest extends DefaultTask { return b != null ? b : defaultValue; } - boolean isVerbose() { + @Internal + protected boolean isVerbose() { return getRelast().isVerbose() != null && getRelast().isVerbose(); }