Skip to content

Commit c635e42

Browse files
rpalcolearpalcolea
committed
Cleanup GradleLint task configurers and fix POM generation
1 parent 8f612f5 commit c635e42

6 files changed

+26
-174
lines changed

‎build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ configurations.all {
5858

5959
dependencies {
6060
compileOnly 'dev.gradleplugins:gradle-api:7.6'
61-
api 'com.netflix.nebula:nebula-gradle-interop:latest.release'
62-
api 'org.apache.maven:maven-model-builder:3.8.3'
63-
api 'org.codehaus.gpars:gpars:1.2.1'
61+
shadow 'com.netflix.nebula:nebula-gradle-interop:latest.release'
62+
shadow 'org.apache.maven:maven-model-builder:3.8.3'
63+
shadow 'org.codehaus.gpars:gpars:1.2.1'
6464
plugin 'com.google.guava:guava:19.0'
6565
plugin('org.ow2.asm:asm:9.+') {
6666
version {

‎gradle.lockfile

+20-19
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ com.jcraft:jsch:0.1.54=integTestRuntimeClasspath,testRuntimeClasspath
1515
com.jcraft:jzlib:1.1.2=integTestRuntimeClasspath,testRuntimeClasspath
1616
com.netflix.nebula:gradle-contacts-plugin:7.0.0=integTestRuntimeClasspath,testRuntimeClasspath
1717
com.netflix.nebula:gradle-info-plugin:12.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
18-
com.netflix.nebula:nebula-gradle-interop:2.1.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
18+
com.netflix.nebula:nebula-gradle-interop:2.0.0=integTestRuntimeClasspath,testRuntimeClasspath
19+
com.netflix.nebula:nebula-gradle-interop:2.1.1=compileClasspath,shadow
1920
com.netflix.nebula:nebula-test:10.3.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
2021
com.perforce:p4java:2015.2.1365273=integTestRuntimeClasspath,testRuntimeClasspath
2122
com.trilead:trilead-ssh2:1.0.0-build220=integTestRuntimeClasspath,testRuntimeClasspath
@@ -24,41 +25,41 @@ commons-lang:commons-lang:2.6=compileClasspath,runtimeClasspath,testCompileClass
2425
commons-logging:commons-logging:1.2=integTestRuntimeClasspath,testRuntimeClasspath
2526
de.regnis.q.sequence:sequence-library:1.0.3=integTestRuntimeClasspath,testRuntimeClasspath
2627
dev.gradleplugins:gradle-api:7.6=compileClasspath
27-
javax.inject:javax.inject:1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
28+
javax.inject:javax.inject:1=compileClasspath,shadow
2829
joda-time:joda-time:2.12.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
2930
junit:junit:4.13.2=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
3031
net.java.dev.jna:jna-platform:5.7.0=integTestRuntimeClasspath,testRuntimeClasspath
3132
net.java.dev.jna:jna:5.7.0=integTestRuntimeClasspath,testRuntimeClasspath
3233
net.java.dev.jna:platform:3.4.0=integTestRuntimeClasspath,testRuntimeClasspath
3334
org.antlr:antlr-runtime:3.4=integTestRuntimeClasspath,testRuntimeClasspath
34-
org.apache.commons:commons-lang3:3.8.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
35+
org.apache.commons:commons-lang3:3.8.1=compileClasspath,shadow
3536
org.apache.httpcomponents:httpclient:4.5.2=integTestRuntimeClasspath,testRuntimeClasspath
3637
org.apache.httpcomponents:httpcore:4.4.4=integTestRuntimeClasspath,testRuntimeClasspath
37-
org.apache.maven:maven-artifact:3.8.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
38-
org.apache.maven:maven-builder-support:3.8.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
39-
org.apache.maven:maven-model-builder:3.8.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
40-
org.apache.maven:maven-model:3.8.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
38+
org.apache.maven:maven-artifact:3.8.3=compileClasspath,shadow
39+
org.apache.maven:maven-builder-support:3.8.3=compileClasspath,shadow
40+
org.apache.maven:maven-model-builder:3.8.3=compileClasspath,shadow
41+
org.apache.maven:maven-model:3.8.3=compileClasspath,shadow
4142
org.apiguardian:apiguardian-api:1.1.2=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
42-
org.codehaus.gpars:gpars:1.2.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
43+
org.codehaus.gpars:gpars:1.2.1=compileClasspath,shadow
4344
org.codehaus.groovy:groovy:3.0.13=compileClasspath
4445
org.codehaus.groovy:groovy:3.0.9=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
45-
org.codehaus.jsr166-mirror:jsr166y:1.7.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
46-
org.codehaus.plexus:plexus-interpolation:1.26=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
47-
org.codehaus.plexus:plexus-utils:3.3.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
46+
org.codehaus.jsr166-mirror:jsr166y:1.7.0=compileClasspath,shadow
47+
org.codehaus.plexus:plexus-interpolation:1.26=compileClasspath,shadow
48+
org.codehaus.plexus:plexus-utils:3.3.0=compileClasspath,shadow
4849
org.codenarc:CodeNarc:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4950
org.eclipse.jdt:core:3.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5051
org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r=compileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
51-
org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
52+
org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5=compileClasspath,shadow
5253
org.hamcrest:hamcrest-core:1.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
5354
org.hamcrest:hamcrest:2.2=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
54-
org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
55-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
56-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
57-
org.jetbrains.kotlin:kotlin-stdlib:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
58-
org.jetbrains:annotations:13.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
55+
org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
56+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
57+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
58+
org.jetbrains.kotlin:kotlin-stdlib:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
59+
org.jetbrains:annotations:13.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
5960
org.junit.platform:junit-platform-commons:1.8.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
6061
org.junit.platform:junit-platform-engine:1.8.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
61-
org.multiverse:multiverse-core:0.7.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
62+
org.multiverse:multiverse-core:0.7.0=compileClasspath,shadow
6263
org.objenesis:objenesis:2.4=integTestRuntimeClasspath,testRuntimeClasspath
6364
org.opentest4j:opentest4j:1.2.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
6465
org.ow2.asm:asm-commons:9.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -72,4 +73,4 @@ org.spockframework:spock-core:2.1-M2-groovy-3.0=compileClasspath,integTestCompil
7273
org.spockframework:spock-junit4:2.1-M2-groovy-3.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
7374
org.tmatesoft.sqljet:sqljet:1.1.10=integTestRuntimeClasspath,testRuntimeClasspath
7475
org.tmatesoft.svnkit:svnkit:1.8.12=integTestRuntimeClasspath,testRuntimeClasspath
75-
empty=annotationProcessor,compile,integTestAnnotationProcessor,integTestCompile,integTestCompileOnly,integTestRuntime,runtime,shadow,testAnnotationProcessor,testCompile,testCompileOnly,testRuntime
76+
empty=annotationProcessor,compile,integTestAnnotationProcessor,integTestCompile,integTestCompileOnly,integTestRuntime,runtime,testAnnotationProcessor,testCompile,testCompileOnly,testRuntime

‎src/main/groovy/com/netflix/nebula/lint/plugin/GradleBetween5And7LintPluginTaskConfigurer.groovy

-31
This file was deleted.

‎src/main/groovy/com/netflix/nebula/lint/plugin/GradleLintPlugin.groovy

+2-10
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.netflix.nebula.lint.plugin
1717

18-
import com.netflix.nebula.interop.GradleKt
18+
1919
import org.gradle.BuildAdapter
2020
import org.gradle.api.BuildCancelledException
2121
import org.gradle.api.Plugin
@@ -31,15 +31,7 @@ class GradleLintPlugin implements Plugin<Project> {
3131
}
3232

3333
LintRuleRegistry.classLoader = getClass().classLoader
34-
35-
// TODO: we need to retire this once we have folks in Gradle 7.x+
36-
if (GradleKt.versionCompareTo(project.gradle, '7.1') >= 0) {
37-
new Gradle7AndHigherLintPluginTaskConfigurer().configure(project)
38-
} else if (GradleKt.versionCompareTo(project.gradle, '5.0') >= 0) {
39-
new GradleBetween5And7LintPluginTaskConfigurer().configure(project)
40-
} else {
41-
new LegacyGradleLintPluginTaskConfigurer().configure(project)
42-
}
34+
new LintPluginTaskConfigurer().configure(project)
4335
}
4436

4537
protected static abstract class LintListener extends BuildAdapter implements TaskExecutionGraphListener {}

‎src/main/groovy/com/netflix/nebula/lint/plugin/LegacyGradleLintPluginTaskConfigurer.groovy

-110
This file was deleted.

‎src/main/groovy/com/netflix/nebula/lint/plugin/Gradle7AndHigherLintPluginTaskConfigurer.groovy ‎src/main/groovy/com/netflix/nebula/lint/plugin/LintPluginTaskConfigurer.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.netflix.nebula.lint.plugin
33
import org.gradle.api.Action
44
import org.gradle.api.Project
55

6-
class Gradle7AndHigherLintPluginTaskConfigurer extends GradleBetween5And7LintPluginTaskConfigurer {
6+
class LintPluginTaskConfigurer extends GradleLintPluginTaskConfigurer {
77
@Override
88
Action<GradleLintReportTask> configureReportAction(Project project, GradleLintExtension extension) {
99
new Action<GradleLintReportTask>() {

0 commit comments

Comments
 (0)