Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid spec-accepting overload of getFirstLevelModuleDependencies #856

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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
Expand Down