Move report location computation out of 'configureEach'

TNG · Feb 16, 2024 · 37c736e · 37c736e
1 parent 66f5337
commit 37c736e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/jgiven-gradle-plugin/src/main/java/com/tngtech/jgiven/gradle/JGivenPlugin.java b/jgiven-gradle-plugin/src/main/java/com/tngtech/jgiven/gradle/JGivenPlugin.java
@@ -64,7 +64,7 @@ public void execute(Task task) {
 
     private void configureJGivenReportDefaults(Project project) {
         project.getTasks()
-            .withType(JGivenReportTask.class).forEach(reportTask ->
+            .withType(JGivenReportTask.class).configureEach(reportTask ->
             reportTask.getReports().all((Action<Report>) report ->
                 report.getRequired().convention(report.getName().equals(JGivenHtmlReportImpl.NAME))
             ));
@@ -90,9 +90,11 @@ private void configureDefaultReportTask(final Test test, JGivenReportTask report
 
         reportTask.getResults().set(getResultsDirectory);
 
+        String relativeFilePath = "jgiven" + "/" + test.getName() + "/";
+        Provider<Directory> reportOutputLocation = reportingExtension.getBaseDirectory().dir(relativeFilePath);
+
         reportTask.getReports().configureEach(report -> {
-            String relativeFilePath = "jgiven" + "/" + test.getName() + "/" + report.getName();
-            report.getOutputLocation().set(reportingExtension.getBaseDirectory().dir(relativeFilePath));
+            report.getOutputLocation().set(reportOutputLocation.map(d -> d.dir(report.getName())));
         });
     }
 }