Skip to content

Commit 4652338

Browse files
committed
use real action decorator and remove disabling of deprecation warning (#36)
1 parent 8976f71 commit 4652338

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/main/java/de/aaschmid/gradle/plugins/cpd/Cpd.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.gradle.api.InvalidUserDataException;
1515
import org.gradle.api.file.FileCollection;
1616
import org.gradle.api.file.FileTree;
17+
import org.gradle.api.internal.CollectionCallbackActionDecorator;
1718
import org.gradle.api.reporting.Reporting;
1819
import org.gradle.api.reporting.SingleFileReport;
1920
import org.gradle.api.tasks.CacheableTask;
@@ -27,7 +28,6 @@
2728
import org.gradle.api.tasks.TaskAction;
2829
import org.gradle.api.tasks.VerificationTask;
2930
import org.gradle.internal.reflect.Instantiator;
30-
import org.gradle.util.DeprecationLogger;
3131
import org.gradle.workers.WorkerExecutor;
3232

3333

@@ -88,9 +88,9 @@ public class Cpd extends SourceTask implements VerificationTask, Reporting<CpdRe
8888

8989

9090
@Inject
91-
public Cpd(Instantiator instantiator, WorkerExecutor workerExecutor) {
91+
public Cpd(CollectionCallbackActionDecorator callbackActionDecorator, Instantiator instantiator, WorkerExecutor workerExecutor) {
92+
this.reports = instantiator.newInstance(CpdReportsImpl.class, this, callbackActionDecorator);
9293
this.workerExecutor = workerExecutor;
93-
this.reports = DeprecationLogger.whileDisabled(() -> instantiator.newInstance(CpdReportsImpl.class, this));
9494
}
9595

9696
@TaskAction

src/main/java/de/aaschmid/gradle/plugins/cpd/internal/CpdReportsImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
public class CpdReportsImpl extends TaskReportContainer<SingleFileReport> implements CpdReports {
1414

15-
public CpdReportsImpl(Cpd task) {
16-
super(SingleFileReport.class, task, CollectionCallbackActionDecorator.NOOP);
15+
public CpdReportsImpl(Cpd task, CollectionCallbackActionDecorator callbackActionDecorator) {
16+
super(SingleFileReport.class, task, callbackActionDecorator);
1717

1818
add(CpdCsvFileReportImpl.class, "csv", task);
1919
add(CpdTextFileReportImpl.class, "text", task);

0 commit comments

Comments
 (0)