From 9a80404d1d715bbbf7061bbdacd514c6d2c90e1f Mon Sep 17 00:00:00 2001 From: Roberto Perez Alcolea Date: Thu, 11 Jul 2024 11:18:33 -0700 Subject: [PATCH] Gradle 8.9 --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../lint/rule/dependency/DependencyClassVisitorSpec.groovy | 4 +--- .../lint/rule/dependency/UndeclaredDependencyRuleSpec.groovy | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4413138..09523c0e 100644 --- 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.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/test/groovy/com/netflix/nebula/lint/rule/dependency/DependencyClassVisitorSpec.groovy b/src/test/groovy/com/netflix/nebula/lint/rule/dependency/DependencyClassVisitorSpec.groovy index 9e6a73fe..f79eeac7 100644 --- a/src/test/groovy/com/netflix/nebula/lint/rule/dependency/DependencyClassVisitorSpec.groovy +++ b/src/test/groovy/com/netflix/nebula/lint/rule/dependency/DependencyClassVisitorSpec.groovy @@ -18,7 +18,6 @@ package com.netflix.nebula.lint.rule.dependency import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier import org.gradle.api.internal.artifacts.DefaultResolvedDependency -import org.gradle.api.internal.artifacts.ResolvedConfigurationIdentifier import spock.lang.Specification import spock.lang.Unroll @@ -256,7 +255,6 @@ class DependencyClassVisitorSpec extends Specification { static DefaultResolvedDependency gav(String g, String a, String v) { def mvid = new DefaultModuleVersionIdentifier(g, a, v) - def id = new ResolvedConfigurationIdentifier(mvid, 'compile') - new DefaultResolvedDependency(id, null) + new DefaultResolvedDependency("compile", mvid, null) } } diff --git a/src/test/groovy/com/netflix/nebula/lint/rule/dependency/UndeclaredDependencyRuleSpec.groovy b/src/test/groovy/com/netflix/nebula/lint/rule/dependency/UndeclaredDependencyRuleSpec.groovy index f9f64e58..9605062d 100644 --- a/src/test/groovy/com/netflix/nebula/lint/rule/dependency/UndeclaredDependencyRuleSpec.groovy +++ b/src/test/groovy/com/netflix/nebula/lint/rule/dependency/UndeclaredDependencyRuleSpec.groovy @@ -25,7 +25,7 @@ import spock.lang.Unroll @Subject(UndeclaredDependencyRule) class UndeclaredDependencyRuleSpec extends BaseIntegrationTestKitSpec { private static final def sample = new Coordinate('sample', 'alpha', '1.0') - private static final def commonsLogging = new Coordinate('commons-logging', 'commons-logging', '1.3.2') + private static final def commonsLogging = new Coordinate('commons-logging', 'commons-logging', '1.3.3') private static final def commonsLang = new Coordinate('commons-lang', 'commons-lang', '2.6') private static final def lombok = new Coordinate('org.projectlombok', 'lombok', '1.18.30') private static final def junit = new Coordinate('junit', 'junit', '4.12')