diff --git a/build.gradle b/build.gradle index 8cc64671..58cfe737 100644 --- a/build.gradle +++ b/build.gradle @@ -83,7 +83,7 @@ dependencies { } plugin 'commons-lang:commons-lang:2.6' - plugin ("org.eclipse.jgit:org.eclipse.jgit:$jgitVersion") { + plugin ("org.eclipse.jgit:org.eclipse.jgit:$jgitVersion") { //6.6.1.202309212850-r transitive = false } plugin 'org.eclipse.jdt:core:3.1.1' @@ -186,7 +186,7 @@ tasks.named('compileKotlin') { ['compileClasspath', 'runtimeClasspath', 'testCompileClasspath', 'testRuntimeClasspath'].each { confName -> tasks.register("dependencyReport${confName.capitalize()}", DependencyReportTask) { - configurations = [project.configurations.getByName(confName)] as Set + configurations = [project.configurations.named(confName)] as Set outputFile = new File(project.projectDir, "build/reports/project/${confName}-dependencies.txt") } check.dependsOn("dependencyReport${confName.capitalize()}") diff --git a/src/main/groovy/com/netflix/nebula/lint/plugin/LintGradleTask.groovy b/src/main/groovy/com/netflix/nebula/lint/plugin/LintGradleTask.groovy index ee4d4604..052c2196 100644 --- a/src/main/groovy/com/netflix/nebula/lint/plugin/LintGradleTask.groovy +++ b/src/main/groovy/com/netflix/nebula/lint/plugin/LintGradleTask.groovy @@ -19,6 +19,7 @@ import com.netflix.nebula.lint.* import org.gradle.api.DefaultTask import org.gradle.api.GradleException import org.gradle.api.Task +import org.gradle.api.file.ProjectLayout import org.gradle.api.provider.ListProperty import org.gradle.api.provider.Property import org.gradle.api.tasks.Input @@ -27,6 +28,8 @@ import org.gradle.api.tasks.Optional import org.gradle.api.tasks.TaskAction import org.gradle.internal.deprecation.DeprecationLogger +import javax.inject.Inject + import static com.netflix.nebula.lint.StyledTextService.Styling.* abstract class LintGradleTask extends DefaultTask { @@ -55,15 +58,14 @@ abstract class LintGradleTask extends DefaultTask { } catch (NoSuchMethodException ignore) { } } - @TaskAction void lint() { - //TODO: address Invocation of Task.project at execution time has been deprecated. DeprecationLogger.whileDisabled { - def violations = new LintService().lint(project, onlyCriticalRules.get()).violations + + def violations = new LintService().lint(getProject(), onlyCriticalRules.get()).violations .unique { v1, v2 -> v1.is(v2) ? 0 : 1 } - (getListeners() + new GradleLintPatchAction(project) + new GradleLintInfoBrokerAction(project) + consoleOutputAction).each { + (getListeners() + new GradleLintPatchAction(getProject()) + new GradleLintInfoBrokerAction(getProject()) + consoleOutputAction).each { it.lintFinished(violations) } }