Merge branch 'main' of github.com:freefair/gradle-plugins into fix/13…

…02-java-fork-options-and-tmpdir

embedded-sass-plugin/src/main/java/io/freefair/gradle/plugins/sass/SassCompile.java

@@ -22,8 +22,7 @@
 import org.gradle.api.file.FileVisitDetails;
 import org.gradle.api.internal.plugins.DslObject;
 import org.gradle.api.plugins.ExtraPropertiesExtension;
-import org.gradle.api.problems.Problems;
-import org.gradle.api.problems.Severity;
+import org.gradle.api.problems.*;
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.*;
@@ -46,6 +45,8 @@
 @CacheableTask
 public abstract class SassCompile extends SourceTask {
 
+    public static final ProblemGroup PROBLEM_GROUP = ProblemGroup.create("sass", "Sass compiler");
+
     public SassCompile() {
         include("**/*.scss");
         include("**/*.sass");
@@ -149,13 +150,12 @@ public void visitFile(@Nonnull FileVisitDetails fileVisitDetails) {
 
                             getLogger().error(sassError.getMessage());
 
-                            throw getProblems().getReporter()
-                                            .throwing(problemSpec -> problemSpec
-                                                    .id("sass-compilation-failed", "Sass Compilation Failed")
-                                                    .lineInFileLocation(sassError.getSpan().getUrl(), sassError.getSpan().getStart().getLine(), sassError.getSpan().getStart().getColumn())
-                                                    .withException(new RuntimeException(e))
-                                                    .details(sassError.getFormatted())
-                                                    .severity(Severity.ERROR));
+                            ProblemId problemId = ProblemId.create("sass-compilation-failed", "Sass Compilation Failed", PROBLEM_GROUP);
+                            throw getProblems().getReporter().throwing(e, problemId, problemSpec -> {
+                                problemSpec.lineInFileLocation(sassError.getSpan().getUrl(), sassError.getSpan().getStart().getLine(), sassError.getSpan().getStart().getColumn());
+                                problemSpec.details(sassError.getFormatted());
+                                problemSpec.severity(Severity.ERROR);
+                            });
 
                         } catch (IOException e) {
                             getLogger().error(e.getLocalizedMessage());

examples/plantuml/build.gradle

@@ -1,6 +1,7 @@
 import io.freefair.gradle.plugins.plantuml.PlantumlTask
 
 plugins {
+    id "base"
     id "io.freefair.plantuml"
 }
 
@@ -15,3 +16,8 @@ tasks.register("plantUml2", PlantumlTask) {
     fileFormat = "SVG"
     outputDirectory = layout.buildDirectory.dir("dist2")
 }
+
+
+tasks.withType(PlantumlTask).configureEach {
+    tasks.getByName("build").dependsOn(it)
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

maven-plugin/src/main/java/io/freefair/gradle/plugins/maven/central/ValidateMavenPom.java

@@ -8,7 +8,10 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.problems.ProblemGroup;
+import org.gradle.api.problems.ProblemId;
 import org.gradle.api.problems.Problems;
+import org.gradle.api.problems.Severity;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFile;
@@ -25,6 +28,8 @@
  */
 public abstract class ValidateMavenPom extends DefaultTask implements VerificationTask {
 
+    public static final ProblemGroup PROBLEM_GROUP = ProblemGroup.create("validate-maven-pom", "Maven Pom Validation");
+
     @Inject
     public abstract Problems getProblems();
 
@@ -118,12 +123,12 @@ private void logError(String element) {
         errorFound = true;
         getLogger().error("No {} found in {}", element, getPomFile().getAsFile().get());
         try {
-            getProblems()
-                    .getReporter()
-                    .reporting(problem -> problem.id("maven-pom", "Missing Element in Maven Pom")
-                            .fileLocation(getPomFile().getAsFile().get().getPath())
-                            .details("No " + element + " found")
-                    );
+            ProblemId problemId = ProblemId.create("maven-pom", "Missing Element in Maven Pom", PROBLEM_GROUP);
+            getProblems().getReporter().report(problemId, problemSpec -> {
+                problemSpec.fileLocation(getPomFile().getAsFile().get().getPath());
+                problemSpec.details("No " + element + " found");
+                problemSpec.severity(Severity.ERROR);
+            });
         } catch (LinkageError e) {
             // https://github.com/freefair/gradle-plugins/issues/1299
             getLogger().info("Incompatible Gradle Version", e);