From 2c7baf78a54e947434c142a0d148668cadfe6eda Mon Sep 17 00:00:00 2001 From: Justin Van Dort Date: Fri, 29 Mar 2024 00:18:00 -0400 Subject: [PATCH] Avoid spec-accepting overload of getFirstLevelModuleDependencies (#856) This method will be deprecated soon in Gradle for removal in 9.0 --- .../com/github/benmanes/gradle/versions/updates/Resolver.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gradle-versions-plugin/src/main/kotlin/com/github/benmanes/gradle/versions/updates/Resolver.kt b/gradle-versions-plugin/src/main/kotlin/com/github/benmanes/gradle/versions/updates/Resolver.kt index 997faa7c..f4591d06 100644 --- a/gradle-versions-plugin/src/main/kotlin/com/github/benmanes/gradle/versions/updates/Resolver.kt +++ b/gradle-versions-plugin/src/main/kotlin/com/github/benmanes/gradle/versions/updates/Resolver.kt @@ -28,7 +28,6 @@ import org.gradle.api.attributes.HasConfigurableAttributes import org.gradle.api.attributes.java.TargetJvmVersion import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier import org.gradle.api.internal.artifacts.dependencies.DefaultProjectDependencyConstraint -import org.gradle.api.specs.Specs.SATISFIES_ALL import org.gradle.internal.component.external.model.DefaultModuleComponentIdentifier import org.gradle.maven.MavenModule import org.gradle.maven.MavenPomArtifact @@ -57,7 +56,7 @@ class Resolver( val coordinates = getCurrentCoordinates(configuration) val latestConfiguration = createLatestConfiguration(configuration, revision, coordinates) val lenient = latestConfiguration.resolvedConfiguration.lenientConfiguration - val resolved = lenient.getFirstLevelModuleDependencies(SATISFIES_ALL) + val resolved = lenient.firstLevelModuleDependencies val unresolved = lenient.unresolvedModuleDependencies return getStatus(coordinates, resolved, unresolved) } @@ -279,7 +278,7 @@ class Resolver( disableAutoTargetJvm(copy) val lenient = copy.resolvedConfiguration.lenientConfiguration - val resolved = lenient.getFirstLevelModuleDependencies(SATISFIES_ALL) + val resolved = lenient.firstLevelModuleDependencies for (dependency in resolved) { val coordinate = Coordinate.from(dependency.module.id, declared) coordinates[coordinate.key] = coordinate