Gradle 8.2-rc-1

rpalcolea · rpalcolea · commit f1d876c3128b · 2023-06-01T14:52:48.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@
 import org.gradle.util.GradleVersion
 
 plugins {
-    id 'com.netflix.nebula.plugin-plugin' version '20.8.0'
+    id 'com.netflix.nebula.plugin-plugin' version '20.8.1'
     id 'com.netflix.nebula.optional-base' version '9.0.0'
     id "org.jetbrains.kotlin.jvm" version "1.7.20"
     id 'java-gradle-plugin'
diff --git a/gradle.lockfile b/gradle.lockfile
@@ -22,14 +22,14 @@ com.jcraft:jsch.agentproxy.svnkit-trilead-ssh2:0.0.7=integTestRuntimeClasspath,t
 com.jcraft:jsch.agentproxy.usocket-jna:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath
 com.jcraft:jsch.agentproxy.usocket-nc:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath
 com.jcraft:jzlib:1.1.2=integTestRuntimeClasspath,testRuntimeClasspath
-com.netflix.nebula:gradle-contacts-plugin:7.0.0=integTestRuntimeClasspath,testRuntimeClasspath
+com.netflix.nebula:gradle-contacts-plugin:7.0.1=integTestRuntimeClasspath,testRuntimeClasspath
 com.netflix.nebula:gradle-git-scm-plugin:6.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.netflix.nebula:gradle-info-plugin:12.0.0=integTestRuntimeClasspath,testRuntimeClasspath
+com.netflix.nebula:gradle-info-plugin:12.1.4=integTestRuntimeClasspath,testRuntimeClasspath
 com.netflix.nebula:gradle-scm-plugin:7.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.netflix.nebula:nebula-dependencies-comparison:0.2.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.netflix.nebula:nebula-gradle-interop:2.1.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.netflix.nebula:nebula-project-plugin:10.1.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.netflix.nebula:nebula-publishing-plugin:19.1.0=integTestRuntimeClasspath,testRuntimeClasspath
+com.netflix.nebula:nebula-project-plugin:10.1.4=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.netflix.nebula:nebula-publishing-plugin:20.3.0=integTestRuntimeClasspath,testRuntimeClasspath
 com.netflix.nebula:nebula-test:10.5.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.perforce:p4java:2015.2.1365273=integTestRuntimeClasspath,testRuntimeClasspath
 com.squareup.moshi:moshi:1.12.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-rc-1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreSpec.groovy
@@ -94,7 +94,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec
             plugins {
                 id 'com.netflix.nebula.dependency-lock'
                 id 'java'
-                id 'com.github.johnrengelman.shadow' version '7.1.0'
+                id 'com.github.johnrengelman.shadow' version '8.1.1'
             }
             repositories {
                 ${mavenrepo.mavenRepositoryBlock}
@@ -166,7 +166,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec
             plugins {
                 id 'com.netflix.nebula.dependency-lock'
                 id 'java'
-                id 'com.github.johnrengelman.shadow' version '7.1.0'
+                id 'com.github.johnrengelman.shadow' version '8.1.1'
             }
             repositories {
                 ${mavenrepo.mavenRepositoryBlock}
@@ -537,6 +537,8 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec
                 testRuntimeOnly 'org.scala-lang.modules:scala-xml_2.12:1.1.1'
                 """.stripIndent()
         } else if (languagePlugin == "com.netflix.nebula.clojure") {
+            //TODO: clojure plugin needs to be refactored to stop using project.convention
+            System.setProperty('ignoreDeprecations', 'true')
             additionalDependencies = """
                 implementation 'org.clojure:clojure:1.8.0'
                 """.stripIndent()
@@ -686,7 +688,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec
                 }
               }
               dependencies {
-                classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.6.0"
+                classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.14"
               }
             }
             apply plugin: 'test.wrapper-plugin'
@@ -885,7 +887,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec
                 }
               }
               dependencies {
-                classpath "com.netflix.nebula:nebula-project-plugin:7.0.9"
+                classpath "com.netflix.nebula:nebula-project-plugin:10.1.4"
               }
             }
             plugins {
@@ -946,7 +948,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec
 
         where:
         facet       | plugin             | setParentSourceSet
-        'integTest' | 'nebula.integtest' | false
+        'integTest' | 'com.netflix.nebula.integtest' | false
 //        'smokeTest' | 'nebula.facet'     | true
 //        'examples'  | 'nebula.facet'     | true
     }
diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreVerifierSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreVerifierSpec.groovy
@@ -376,6 +376,8 @@ empty=annotationProcessor,testAnnotationProcessor
     @Unroll
     def 'com.netflix.nebula.clojure: fail when dependency is unresolvable upon update via #lockArg'() {
         given:
+        //TODO: clojure plugin needs to be refactored to stop using project.convention
+        System.setProperty('ignoreDeprecations', 'true')
         createSingleProjectBaseline('com.netflix.nebula.clojure')
 
         when:
@@ -607,7 +609,7 @@ empty=annotationProcessor,testAnnotationProcessor
                 buildscript {
                     repositories { maven { url "https://plugins.gradle.org/m2/" } }
                     dependencies {
-                        classpath "com.netflix.nebula:nebula-clojure-plugin:13.0.0"
+                        classpath "com.netflix.nebula:nebula-clojure-plugin:13.0.1"
                     }
                 }
                 plugins {
diff --git a/src/test/groovy/nebula/plugin/dependencylock/tasks/MigrateToCoreLocksTaskSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/tasks/MigrateToCoreLocksTaskSpec.groovy
@@ -566,7 +566,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec {
                 }
               }
               dependencies {
-                classpath "com.netflix.nebula:nebula-project-plugin:7.0.9"
+                classpath "com.netflix.nebula:nebula-project-plugin:10.1.4"
               }
             }
             plugins {
@@ -625,9 +625,9 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec {
 
         where:
         facet       | plugin             | setParentSourceSet
-        'integTest' | 'nebula.integtest' | false
-        'smokeTest' | 'nebula.facet'     | true
-        'examples'  | 'nebula.facet'     | true
+        'integTest' | 'com.netflix.nebula.integtest' | false
+        'smokeTest' | 'com.netflix.nebula.facet'     | true
+        'examples'  | 'com.netflix.nebula.facet'     | true
     }
 
     @Unroll
@@ -657,7 +657,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec {
                 }
               }
               dependencies {
-                classpath "com.netflix.nebula:nebula-project-plugin:7.0.9"
+                classpath "com.netflix.nebula:nebula-project-plugin:10.1.4"
               }
             }
             plugins {
@@ -706,9 +706,9 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec {
 
         where:
         facet       | plugin             | setParentSourceSet
-        'integTest' | 'nebula.integtest' | false
-        'smokeTest' | 'nebula.facet'     | true
-        'examples'  | 'nebula.facet'     | true
+        'integTest' | 'com.netflix.nebula.integtest' | false
+        'smokeTest' | 'com.netflix.nebula.facet'     | true
+        'examples'  | 'com.netflix.nebula.facet'     | true
     }
 
     def 'migration does not lock all configurations by default'() {
diff --git a/src/test/groovy/nebula/plugin/dependencylock/utils/ConfigurationFiltersProjectSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/utils/ConfigurationFiltersProjectSpec.groovy
@@ -194,22 +194,11 @@ class ConfigurationFiltersProjectSpec extends ProjectSpec {
             deprecatedConfig
             nonDeprecatedConfig
         }
-
-        if (!GradleVersionUtils.currentGradleVersionIsLessThan("6.0")) {
-            project.configurations {
-                deprecatedConfig.deprecateForResolution('nonDeprecatedConfig')
-            }
-        }
-
         when:
         def hasAResolutionAlternative = ConfigurationFilters.safelyHasAResolutionAlternative(project.configurations.findByName('deprecatedConfig'))
 
         then:
-        if (!GradleVersionUtils.currentGradleVersionIsLessThan("6.0")) {
-            assert hasAResolutionAlternative
-        } else {
-            assert !hasAResolutionAlternative
-        }
+        assert !hasAResolutionAlternative
     }
 
     def 'verifies that a configuration does not have resolution alternatives'() {
@@ -219,12 +208,6 @@ class ConfigurationFiltersProjectSpec extends ProjectSpec {
             nonDeprecatedConfig
         }
 
-        if (!GradleVersionUtils.currentGradleVersionIsLessThan("6.0")) {
-            project.configurations {
-                deprecatedConfig.deprecateForResolution('nonDeprecatedConfig')
-            }
-        }
-
         when:
         def hasAResolutionAlternative = ConfigurationFilters.safelyHasAResolutionAlternative(project.configurations.findByName('nonDeprecatedConfig'))
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec`
`94`	`94`	`plugins {`
`95`	`95`	`id 'com.netflix.nebula.dependency-lock'`
`96`	`96`	`id 'java'`
`97`		`- id 'com.github.johnrengelman.shadow' version '7.1.0'`
	`97`	`+ id 'com.github.johnrengelman.shadow' version '8.1.1'`
`98`	`98`	`}`
`99`	`99`	`repositories {`
`100`	`100`	`${mavenrepo.mavenRepositoryBlock}`
`@@ -166,7 +166,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec`
`166`	`166`	`plugins {`
`167`	`167`	`id 'com.netflix.nebula.dependency-lock'`
`168`	`168`	`id 'java'`
`169`		`- id 'com.github.johnrengelman.shadow' version '7.1.0'`
	`169`	`+ id 'com.github.johnrengelman.shadow' version '8.1.1'`
`170`	`170`	`}`
`171`	`171`	`repositories {`
`172`	`172`	`${mavenrepo.mavenRepositoryBlock}`
`@@ -537,6 +537,8 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec`
`537`	`537`	`testRuntimeOnly 'org.scala-lang.modules:scala-xml_2.12:1.1.1'`
`538`	`538`	`""".stripIndent()`
`539`	`539`	`} else if (languagePlugin == "com.netflix.nebula.clojure") {`
	`540`	`+ //TODO: clojure plugin needs to be refactored to stop using project.convention`
	`541`	`+ System.setProperty('ignoreDeprecations', 'true')`
`540`	`542`	`additionalDependencies = """`
`541`	`543`	`implementation 'org.clojure:clojure:1.8.0'`
`542`	`544`	`""".stripIndent()`
`@@ -686,7 +688,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec`
`686`	`688`	`}`
`687`	`689`	`}`
`688`	`690`	`dependencies {`
`689`		`- classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.6.0"`
	`691`	`+ classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.14"`
`690`	`692`	`}`
`691`	`693`	`}`
`692`	`694`	`apply plugin: 'test.wrapper-plugin'`
`@@ -885,7 +887,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec`
`885`	`887`	`}`
`886`	`888`	`}`
`887`	`889`	`dependencies {`
`888`		`- classpath "com.netflix.nebula:nebula-project-plugin:7.0.9"`
	`890`	`+ classpath "com.netflix.nebula:nebula-project-plugin:10.1.4"`
`889`	`891`	`}`
`890`	`892`	`}`
`891`	`893`	`plugins {`
`@@ -946,7 +948,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec`
`946`	`948`
`947`	`949`	`where:`
`948`	`950`	`facet \| plugin \| setParentSourceSet`
`949`		`- 'integTest' \| 'nebula.integtest' \| false`
	`951`	`+ 'integTest' \| 'com.netflix.nebula.integtest' \| false`
`950`	`952`	`// 'smokeTest' \| 'nebula.facet' \| true`
`951`	`953`	`// 'examples' \| 'nebula.facet' \| true`
`952`	`954`	`}`
Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec {`
`566`	`566`	`}`
`567`	`567`	`}`
`568`	`568`	`dependencies {`
`569`		`- classpath "com.netflix.nebula:nebula-project-plugin:7.0.9"`
	`569`	`+ classpath "com.netflix.nebula:nebula-project-plugin:10.1.4"`
`570`	`570`	`}`
`571`	`571`	`}`
`572`	`572`	`plugins {`
`@@ -625,9 +625,9 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec {`
`625`	`625`
`626`	`626`	`where:`
`627`	`627`	`facet \| plugin \| setParentSourceSet`
`628`		`- 'integTest' \| 'nebula.integtest' \| false`
`629`		`- 'smokeTest' \| 'nebula.facet' \| true`
`630`		`- 'examples' \| 'nebula.facet' \| true`
	`628`	`+ 'integTest' \| 'com.netflix.nebula.integtest' \| false`
	`629`	`+ 'smokeTest' \| 'com.netflix.nebula.facet' \| true`
	`630`	`+ 'examples' \| 'com.netflix.nebula.facet' \| true`
`631`	`631`	`}`
`632`	`632`
`633`	`633`	`@Unroll`
`@@ -657,7 +657,7 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec {`
`657`	`657`	`}`
`658`	`658`	`}`
`659`	`659`	`dependencies {`
`660`		`- classpath "com.netflix.nebula:nebula-project-plugin:7.0.9"`
	`660`	`+ classpath "com.netflix.nebula:nebula-project-plugin:10.1.4"`
`661`	`661`	`}`
`662`	`662`	`}`
`663`	`663`	`plugins {`
`@@ -706,9 +706,9 @@ class MigrateToCoreLocksTaskSpec extends AbstractDependencyLockPluginSpec {`
`706`	`706`
`707`	`707`	`where:`
`708`	`708`	`facet \| plugin \| setParentSourceSet`
`709`		`- 'integTest' \| 'nebula.integtest' \| false`
`710`		`- 'smokeTest' \| 'nebula.facet' \| true`
`711`		`- 'examples' \| 'nebula.facet' \| true`
	`709`	`+ 'integTest' \| 'com.netflix.nebula.integtest' \| false`
	`710`	`+ 'smokeTest' \| 'com.netflix.nebula.facet' \| true`
	`711`	`+ 'examples' \| 'com.netflix.nebula.facet' \| true`
`712`	`712`	`}`
`713`	`713`
`714`	`714`	`def 'migration does not lock all configurations by default'() {`