Gradle 8.11-rc-1

nebula-plugins · Oct 18, 2024 · c391c0b · c391c0b
1 parent 9f6d39f
commit c391c0b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
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.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-rc-1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignAndMigrateViaReplacementSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignAndMigrateViaReplacementSpec.groovy
@@ -15,15 +15,15 @@ class AlignAndMigrateViaReplacementSpec extends AbstractAlignAndMigrateSpec {
         then:
         results.output.contains("test.nebula:a:1.0.0 -> $alignedVersion")
         results.output.contains("test.nebula:b:$alignedVersion")
-        results.output.contains("other:e:4.0.0 -> test.nebula:c:1.0.1") // not aligned :/
+        results.output.contains("other:e:4.0.0 -> test.nebula:c:$alignedVersion")
         results.output.contains("belongs to platform aligned-platform")
 
         when:
         def dependenciesTasks = ['dependencies', '--configuration', 'compileClasspath']
         def resultsForDependencies = runTasks(*dependenciesTasks)
 
         then:
-        resultsForDependencies.output.contains("other:e:4.0.0 -> test.nebula:c:1.0.1") // not aligned :/
+        resultsForDependencies.output.contains("other:e:4.0.0 -> test.nebula:c:1.0.3")
     }
 
     @Unroll

diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesPluginInteractionSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesPluginInteractionSpec.groovy
@@ -156,6 +156,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec {
 
     @Unroll
     def 'alignment interaction with dependency-recommender transitive project dependencies'() {
+        System.setProperty('ignoreDeprecations', 'true')
         def graph = new DependencyGraphBuilder()
                 .addModule('test.a:a:1.42.2')
                 .build()
@@ -186,11 +187,11 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec {
             buildscript {
                 repositories { mavenCentral() }
                 dependencies {
-                    classpath 'com.netflix.nebula:nebula-dependency-recommender:10.0.1'
+                    classpath 'com.netflix.nebula:nebula-dependency-recommender:12.5.1'
                 }
             }
             allprojects {
-                apply plugin: 'nebula.dependency-recommender'
+                apply plugin: 'com.netflix.nebula.dependency-recommender'
                 apply plugin: 'com.netflix.nebula.resolution-rules'
 
                 repositories {
@@ -346,6 +347,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec {
 
     @Unroll
     def 'transitive aligns with spring dependency management'() {
+        System.setProperty('ignoreDeprecations', 'true')
         def rulesJsonFile = new File(projectDir, 'rules.json')
 
         rulesJsonFile << '''\