From e13d0eb68d497879c000c4e2e50850deea289a26 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Tue, 8 Mar 2022 16:49:31 +0100
Subject: [PATCH] 0.2.13
- mark isVerbose in RelastTest as internal
- do not evaluate getPackageOutputDir if isSkipRun equals true in JastAddConfiguration
---
.../preprocessor/testing/plugin/JastAddConfiguration.java | 3 +++
.../jastadd/preprocessor/testing/plugin/RelastTest.java | 8 +++-----
2 files changed, 6 insertions(+), 5 deletions(-)
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 ae3d27c..f21b0b2 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 e963068..102c05d 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();
}
--
GitLab