Merge pull request #1787 from TNG/renovate/gradle-8.x

chore(deps): update dependency gradle to v8.11.1
TNG · Dec 2, 2024 · 2d08ca6 · 2d08ca6
2 parents 10ff2a7 + 11e0048
commit 2d08ca6
Show file tree

Hide file tree

Showing 11 changed files with 121 additions and 18 deletions.
diff --git a/example-projects/android/gradle/wrapper/gradle-wrapper.properties b/example-projects/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/example-projects/junit5/gradle/wrapper/gradle-wrapper.properties b/example-projects/junit5/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/example-projects/kotlin/gradle/wrapper/gradle-wrapper.properties b/example-projects/kotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/example-projects/selenium/gradle/wrapper/gradle-wrapper.properties b/example-projects/selenium/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/example-projects/spock/gradle/wrapper/gradle-wrapper.properties b/example-projects/spock/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/example-projects/spring-boot/build.gradle b/example-projects/spring-boot/build.gradle
@@ -19,7 +19,7 @@ apply plugin: 'io.spring.dependency-management'
 apply plugin: 'com.tngtech.jgiven.gradle-plugin'
 
 wrapper {
-    gradleVersion = '8.10.2'
+    gradleVersion = '8.11.1'
     distributionType = Wrapper.DistributionType.ALL
 }
 

diff --git a/example-projects/spring-boot/gradle/wrapper/gradle-wrapper.properties b/example-projects/spring-boot/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/example-projects/testng/gradle/wrapper/gradle-wrapper.properties b/example-projects/testng/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/...dle-plugin/src/main/java/com/tngtech/jgiven/gradle/internal/AbstractJGivenReportImpl.java b/...dle-plugin/src/main/java/com/tngtech/jgiven/gradle/internal/AbstractJGivenReportImpl.java
@@ -9,22 +9,35 @@
 import com.tngtech.jgiven.report.html5.Html5ReportConfig;
 import com.tngtech.jgiven.report.text.PlainTextReportConfig;
 import com.tngtech.jgiven.report.text.PlainTextReportGenerator;
+import groovy.lang.Closure;
+import org.gradle.api.NonNullApi;
 import org.gradle.api.Task;
-import org.gradle.api.reporting.internal.TaskGeneratedSingleDirectoryReport;
+import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.provider.Property;
+import org.gradle.api.reporting.Report;
 import org.gradle.api.tasks.Internal;
+import org.gradle.util.internal.ConfigureUtil;
 
+import javax.annotation.Nullable;
 import java.io.File;
 
-public abstract class AbstractJGivenReportImpl extends TaskGeneratedSingleDirectoryReport implements JGivenReport {
+@NonNullApi
+public abstract class AbstractJGivenReportImpl implements JGivenReport {
 
     private File customCssFile;
     private File customJsFile;
     private String title;
     private boolean excludeEmptyScenarios = false;
     private boolean thumbnailsAreShown = true;
+    private final String taskPath;
+    private final String name;
+    private final String relativeEntryPath;
 
     public AbstractJGivenReportImpl( String name, Task task, String relativeEntryPath ) {
-        super( name, task, relativeEntryPath );
+        this.name = name;
+        this.taskPath = task.getPath();
+        this.relativeEntryPath = relativeEntryPath;
+        this.getRequired().convention(false);
     }
 
     public AbstractReportGenerator createGenerator() {
@@ -67,23 +80,23 @@ public AbstractReportGenerator createGenerator() {
     @Internal
     public abstract ReportGenerator.Format getFormat();
 
-    @Override public File getCustomCssFile() {
+    @Override @Nullable public File getCustomCssFile() {
         return customCssFile;
     }
 
     @Override public void setCustomCssFile( File customCssFile ) {
         this.customCssFile = customCssFile;
     }
 
-    @Override public File getCustomJsFile() {
+    @Override @Nullable public File getCustomJsFile() {
         return customJsFile;
     }
 
     @Override public void setCustomJsFile( File customJsFile ) {
         this.customJsFile = customJsFile;
     }
 
-    @Override public String getTitle() {
+    @Override @Nullable public String getTitle() {
         return title;
     }
 
@@ -107,4 +120,41 @@ public AbstractReportGenerator createGenerator() {
         this.thumbnailsAreShown = thumbnailsAreShown;
     }
 
+    @Override
+    public File getEntryPoint() {
+        return new File(this.getOutputLocation().getAsFile().getOrNull(), this.relativeEntryPath);
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getDisplayName() {
+        return "Report generated by task '" + taskPath + "' (" + name + ")";
+    }
+
+    @Override
+    public abstract Property<Boolean> getRequired();
+
+    @Override
+    public abstract DirectoryProperty getOutputLocation();
+
+    @Override
+    @Deprecated
+    public void setDestination(File file) {
+        throw new UnsupportedOperationException("Use outputLocation instead");
+    }
+
+    @Override
+    public Report.OutputType getOutputType() {
+        return Report.OutputType.DIRECTORY;
+    }
+
+    @Override
+    public Report configure(Closure configure) {
+        return ConfigureUtil.configureSelf(configure, this);
+    }
+
 }
diff --git a/...e-plugin/src/main/java/com/tngtech/jgiven/gradle/internal/JGivenReportsContainerImpl.java b/...e-plugin/src/main/java/com/tngtech/jgiven/gradle/internal/JGivenReportsContainerImpl.java
@@ -2,21 +2,37 @@
 
 import com.tngtech.jgiven.gradle.JGivenReport;
 import com.tngtech.jgiven.gradle.JGivenReportsContainer;
+import groovy.lang.Closure;
+import groovyjarjarantlr4.v4.runtime.misc.NotNull;
+import org.gradle.api.InvalidUserDataException;
+import org.gradle.api.NamedDomainObjectSet;
+import org.gradle.api.NonNullApi;
 import org.gradle.api.Task;
-import org.gradle.api.reporting.internal.TaskReportContainer;
+import org.gradle.api.internal.DefaultNamedDomainObjectSet;
+import org.gradle.api.internal.project.ProjectInternal;
+import org.gradle.api.reporting.Report;
+import org.gradle.api.reporting.ReportContainer;
+import org.gradle.internal.instantiation.InstanceGenerator;
+import org.gradle.internal.instantiation.InstantiatorFactory;
+import org.gradle.internal.service.ServiceRegistry;
+import org.gradle.util.internal.ConfigureUtil;
 
 import javax.inject.Inject;
+import java.util.Map;
 
 import static org.gradle.api.internal.CollectionCallbackActionDecorator.NOOP;
 
-public class JGivenReportsContainerImpl extends TaskReportContainer<JGivenReport> implements JGivenReportsContainer {
+@NonNullApi
+public class JGivenReportsContainerImpl extends DefaultNamedDomainObjectSet<JGivenReport> implements JGivenReportsContainer {
 
+    private final NamedDomainObjectSet<JGivenReport> enabled;
     @Inject
     public JGivenReportsContainerImpl( Task task ) {
-        super( JGivenReport.class, task, NOOP);
+        super( JGivenReport.class, locateInstantiator(task), Report::getName, NOOP);
         add(JGivenHtmlReportImpl.class, task);
         add(JGivenTextReportImpl.class, task);
         add(JGivenAsciiDocReportImpl.class, task);
+        enabled = this.matching(element -> element.getRequired().get());
     }
 
     @Override public JGivenHtmlReportImpl getHtml() {
@@ -31,4 +47,41 @@ public JGivenReportsContainerImpl( Task task ) {
     public JGivenAsciiDocReportImpl getAsciiDoc() {
       return (JGivenAsciiDocReportImpl) getByName( JGivenAsciiDocReportImpl.NAME );
     }
+
+    private static InstanceGenerator locateInstantiator(Task task) {
+        ServiceRegistry projectServices = ((ProjectInternal)task.getProject()).getServices();
+        return ((InstantiatorFactory)projectServices.get(InstantiatorFactory.class)).decorateLenient(projectServices);
+    }
+
+
+    protected void assertMutableCollectionContents() {
+        throw new ReportContainer.ImmutableViolationException();
+    }
+
+    public NamedDomainObjectSet<JGivenReport> getEnabled() {
+        return this.enabled;
+    }
+
+    public ReportContainer<JGivenReport> configure(Closure cl) {
+        ConfigureUtil.configureSelf(cl, this);
+        return this;
+    }
+
+
+    protected <N extends JGivenReport> N add(Class<N> clazz, Object... constructionArgs) {
+        N report = (N) this.getInstantiator().newInstance(clazz, constructionArgs);
+        String name = report.getName();
+        if (name.equals("enabled")) {
+            throw new InvalidUserDataException("Reports that are part of a ReportContainer cannot be named 'enabled'");
+        } else {
+            this.getStore().add(report);
+            this.index();
+            return report;
+        }
+    }
+
+    @NotNull
+    public Map<String, JGivenReport> getEnabledReports() {
+        return this.getEnabled().getAsMap();
+    }
 }