Add problem collection to BuildResult

gradle · Apr 17, 2024 · 483bda2 · 483bda2
1 parent d3262c2
commit 483bda2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/subprojects/core-api/build.gradle.kts b/subprojects/core-api/build.gradle.kts
@@ -31,6 +31,7 @@ dependencies {
     api(project(":resources"))
     api(project(":persistent-cache"))
     api(project(":declarative-dsl-api"))
+//    api(project(":problems-api"))
     api(libs.jsr305)
     api(libs.groovy)
     api(libs.groovyAnt)

diff --git a/subprojects/core-api/src/main/java/org/gradle/BuildResult.java b/subprojects/core-api/src/main/java/org/gradle/BuildResult.java
@@ -17,8 +17,8 @@
 
 import com.google.common.collect.ImmutableList;
 import org.gradle.api.GradleException;
+import org.gradle.api.Incubating;
 import org.gradle.api.invocation.Gradle;
-import org.gradle.api.problems.internal.Problem;
 
 import javax.annotation.Nullable;
 import java.util.Collection;
@@ -29,14 +29,24 @@
 public class BuildResult {
     private final String action;
     private final Throwable failure;
-    private final Collection<Problem> problemCollection;
+    private final Collection<?> problemCollection;
     private final Gradle gradle;
 
     public BuildResult(@Nullable Gradle gradle, @Nullable Throwable failure) {
         this("Build", gradle, failure, ImmutableList.of());
     }
 
-    public BuildResult(String action, @Nullable Gradle gradle, @Nullable Throwable failure, Collection<Problem> problemCollection) {
+    public BuildResult(String action, @Nullable Gradle gradle, @Nullable Throwable failure) {
+        this(action, gradle, failure, ImmutableList.of());
+    }
+
+    /**
+     * Constructor
+     *
+     * @since 8.9
+     */
+    @Incubating
+    public BuildResult(String action, @Nullable Gradle gradle, @Nullable Throwable failure, Collection<?> problemCollection) {
         this.action = action;
         this.gradle = gradle;
         this.failure = failure;
@@ -53,7 +63,13 @@ public Throwable getFailure() {
         return failure;
     }
 
-    public Collection<Problem> getProblems() {
+    /**
+     * Problems that occurred during the build.
+     *
+     * @since 8.9
+     */
+    @Incubating
+    public Collection<?> getProblems() {
         return problemCollection;
     }