Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove legacy task configurer #384

Merged
merged 1 commit into from
Feb 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@ class GradleLintPlugin implements Plugin<Project> {

LintRuleRegistry.classLoader = getClass().classLoader

// TODO: we need to retire this once we have folks in Gradle 7.x+
// TODO: we need to retire this once we have folks in Gradle 7.1+
if (GradleKt.versionCompareTo(project.gradle, '7.1') >= 0) {
new Gradle7AndHigherLintPluginTaskConfigurer().configure(project)
} else if (GradleKt.versionCompareTo(project.gradle, '5.0') >= 0) {
new GradleBetween5And7LintPluginTaskConfigurer().configure(project)
} else {
new LegacyGradleLintPluginTaskConfigurer().configure(project)
new GradleSevenOneAndHigherLintPluginTaskConfigurer().configure(project)
} else if (GradleKt.versionCompareTo(project.gradle, '7.0') >= 0) {
new GradleSevenZeroLintPluginTaskConfigurer().configure(project)
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.netflix.nebula.lint.plugin

import org.gradle.api.Action
import org.gradle.api.Project

class GradleSevenOneAndHigherLintPluginTaskConfigurer extends GradleSevenZeroLintPluginTaskConfigurer {
@Override
Action<GradleLintReportTask> configureReportAction(Project project, GradleLintExtension extension) {
new Action<GradleLintReportTask>() {
@Override
void execute(GradleLintReportTask gradleLintReportTask) {
gradleLintReportTask.reportOnlyFixableViolations = getReportOnlyFixableViolations(project, extension)
gradleLintReportTask.reports.all { report ->
def fileSuffix = report.name == 'text' ? 'txt' : report.name
report.conventionMapping.with {
required.set(report.name == getReportFormat(project, extension))
outputLocation.set(new File(project.buildDir, "reports/gradleLint/${project.name}.$fileSuffix"))
}
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import org.gradle.api.tasks.TaskProvider
import org.gradle.api.tasks.TaskState
import org.gradle.api.tasks.compile.AbstractCompile

class GradleBetween5And7LintPluginTaskConfigurer extends GradleLintPluginTaskConfigurer{
class GradleSevenZeroLintPluginTaskConfigurer extends GradleLintPluginTaskConfigurer{
@Override
Action<GradleLintReportTask> configureReportAction(Project project, GradleLintExtension extension) {
new Action<GradleLintReportTask>() {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.netflix.nebula.lint.plugin
import org.gradle.api.Action
import org.gradle.api.Project

class Gradle7AndHigherLintPluginTaskConfigurer extends GradleBetween5And7LintPluginTaskConfigurer {
class LintPluginTaskConfigurer extends GradleLintPluginTaskConfigurer {
@Override
Action<GradleLintReportTask> configureReportAction(Project project, GradleLintExtension extension) {
new Action<GradleLintReportTask>() {
Expand Down