GradleLintReportTask.groovy: use lazy apis

nebula-plugins · Nov 14, 2023 · e3bc4cd · e3bc4cd
1 parent f7535b1
commit e3bc4cd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -158,6 +158,7 @@ java {
 }
 
 tasks.withType(Test) {
+    maxHeapSize = '512m'
     maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
     javaLauncher = javaToolchains.launcherFor {
         languageVersion = JavaLanguageVersion.of(System.getenv("JDK_VERSION_FOR_TESTS")?.toInteger() ?: 8)

diff --git a/src/main/groovy/com/netflix/nebula/lint/plugin/GradleLintReportTask.groovy b/src/main/groovy/com/netflix/nebula/lint/plugin/GradleLintReportTask.groovy
@@ -31,9 +31,11 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
 import org.gradle.api.plugins.quality.CodeNarcReports
 import org.gradle.api.plugins.quality.internal.CodeNarcReportsImpl
+import org.gradle.api.provider.Property
 import org.gradle.api.reporting.Report
 import org.gradle.api.reporting.Reporting
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.Nested
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.VerificationTask
@@ -48,20 +50,12 @@ abstract class GradleLintReportTask extends DefaultTask implements VerificationT
 
     @Nested
     private final CodeNarcReportsImpl reports
+
     @Input
-    boolean reportOnlyFixableViolations
+    abstract Property<Boolean> getReportOnlyFixableViolations()
 
     GradleLintReportTask() {
-        CodeNarcReportsImpl codeNarcReports
-        if (GradleVersion.version(project.gradle.gradleVersion).compareTo(GradleVersion.version('4.4.1')) > 0) {
-            codeNarcReports = project.objects.newInstance(CodeNarcReportsImpl.class, this)
-        } else {
-            //TODO: remove this once we don't have customers in Gradle 4.1
-            DeprecationLoggerUtils.whileDisabled() {
-                codeNarcReports = instantiator.newInstance(CodeNarcReportsImpl, this)
-            }
-        }
-        reports = codeNarcReports
+        reports = project.objects.newInstance(CodeNarcReportsImpl.class, this)
         outputs.upToDateWhen { false }
         group = 'lint'
     }
@@ -133,7 +127,7 @@ abstract class GradleLintReportTask extends DefaultTask implements VerificationT
     }
 
     void filterOnlyFixableViolations(Results results) {
-        if (reportOnlyFixableViolations) {
+        if (reportOnlyFixableViolations.isPresent() && reportOnlyFixableViolations.get()) {
             new GradleLintPatchAction(project).lintFinished(results.violations)
             List<Violation> toRemove = results.violations.findAll {
                 it.fixes.size() == 0 || it.fixes.any { it.reasonForNotFixing != null }

diff --git a/...main/groovy/com/netflix/nebula/lint/plugin/GradleSevenZeroLintPluginTaskConfigurer.groovy b/...main/groovy/com/netflix/nebula/lint/plugin/GradleSevenZeroLintPluginTaskConfigurer.groovy
@@ -15,7 +15,7 @@ class GradleSevenZeroLintPluginTaskConfigurer extends GradleLintPluginTaskConfig
         new Action<GradleLintReportTask>() {
             @Override
             void execute(GradleLintReportTask gradleLintReportTask) {
-                gradleLintReportTask.reportOnlyFixableViolations = getReportOnlyFixableViolations(project, extension)
+                gradleLintReportTask.reportOnlyFixableViolations.set(getReportOnlyFixableViolations(project, extension))
                 gradleLintReportTask.reports.all { report ->
                     report.conventionMapping.with {
                         enabled = { report.name == getReportFormat(project, extension) }

diff --git a/src/main/groovy/com/netflix/nebula/lint/plugin/LintPluginTaskConfigurer.groovy b/src/main/groovy/com/netflix/nebula/lint/plugin/LintPluginTaskConfigurer.groovy
@@ -9,7 +9,7 @@ class LintPluginTaskConfigurer extends GradleLintPluginTaskConfigurer {
         new Action<GradleLintReportTask>() {
             @Override
             void execute(GradleLintReportTask gradleLintReportTask) {
-                gradleLintReportTask.reportOnlyFixableViolations = getReportOnlyFixableViolations(project, extension)
+                gradleLintReportTask.reportOnlyFixableViolations.set(getReportOnlyFixableViolations(project, extension))
                 gradleLintReportTask.reports.all { report ->
                     def fileSuffix = report.name == 'text' ? 'txt' : report.name
                     report.conventionMapping.with {