fix: migrate deprecated Gradle API usages (#974)

* Replace deprecated ClosureBackedAction * Replace deprecated ConfigureUtil
spotbugs · Oct 8, 2023 · b1ef0d0 · b1ef0d0
1 parent fda1755
commit b1ef0d0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/src/main/groovy/com/github/spotbugs/snom/SpotBugsReport.java b/src/main/groovy/com/github/spotbugs/snom/SpotBugsReport.java
@@ -19,6 +19,7 @@
 import java.io.File;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
+import org.gradle.api.Action;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.Property;
@@ -29,7 +30,6 @@
 import org.gradle.api.resources.TextResource;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Internal;
-import org.gradle.util.ConfigureUtil;
 
 public abstract class SpotBugsReport
     implements SingleFileReport,
@@ -118,7 +118,15 @@ public void setDestination(Provider<File> provider) {
 
   @Override
   public Report configure(Closure closure) {
-    ConfigureUtil.configureSelf(closure, this);
+    return configure(
+        report -> {
+          closure.setDelegate(report);
+          closure.call(report);
+        });
+  }
+
+  public Report configure(Action<? super Report> action) {
+    action.execute(this);
     return this;
   }
 

diff --git a/src/main/groovy/com/github/spotbugs/snom/SpotBugsTask.groovy b/src/main/groovy/com/github/spotbugs/snom/SpotBugsTask.groovy
@@ -13,7 +13,6 @@
  */
 package com.github.spotbugs.snom
 
-import com.github.spotbugs.snom.internal.SemanticVersion;
 import com.github.spotbugs.snom.internal.SpotBugsHtmlReport
 import com.github.spotbugs.snom.internal.SpotBugsRunnerForHybrid;
 import com.github.spotbugs.snom.internal.SpotBugsRunnerForJavaExec;
@@ -23,7 +22,7 @@ import com.github.spotbugs.snom.internal.SpotBugsTextReport;
 import com.github.spotbugs.snom.internal.SpotBugsXmlReport;
 import edu.umd.cs.findbugs.annotations.NonNull
 import edu.umd.cs.findbugs.annotations.Nullable
-import org.gradle.api.artifacts.Dependency;
+import org.gradle.api.Action
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.plugins.JavaPluginExtension
@@ -32,7 +31,6 @@ import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.SkipWhenEmpty
 
-import org.gradle.api.Action;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.InvalidUserDataException;
 import org.gradle.api.NamedDomainObjectContainer;
@@ -54,7 +52,6 @@ import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.VerificationTask
 import org.gradle.jvm.toolchain.JavaLauncher
 import org.gradle.jvm.toolchain.JavaToolchainService;
-import org.gradle.util.ClosureBackedAction
 import org.gradle.workers.WorkerExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory
@@ -428,12 +425,6 @@ abstract class SpotBugsTask extends DefaultTask implements VerificationTask {
         }
     }
 
-    final NamedDomainObjectContainer<? extends SpotBugsReport> reports(
-            Closure<NamedDomainObjectContainer<? extends SpotBugsReport>> closure) {
-        return reports(
-                new ClosureBackedAction<NamedDomainObjectContainer<? extends SpotBugsReport>>(closure))
-    }
-
     final NamedDomainObjectContainer<? extends SpotBugsReport> reports(
             Action<NamedDomainObjectContainer<? extends SpotBugsReport>> configureAction) {
         configureAction.execute(reports)