Skip to content

Commit 8b46236

Browse files
committed
Simplify code by making of us shouldResolveConsistentlyWith
Closes gh-46642
1 parent 4baa005 commit 8b46236

File tree

1 file changed

+1
-25
lines changed
  • spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin

1 file changed

+1
-25
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,12 @@
2020
import java.util.List;
2121
import java.util.Set;
2222
import java.util.concurrent.Callable;
23-
import java.util.stream.Stream;
2423

2524
import org.gradle.api.Action;
2625
import org.gradle.api.Plugin;
2726
import org.gradle.api.Project;
2827
import org.gradle.api.Task;
2928
import org.gradle.api.artifacts.Configuration;
30-
import org.gradle.api.artifacts.DependencyConstraint;
31-
import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
32-
import org.gradle.api.artifacts.dsl.DependencyConstraintHandler;
33-
import org.gradle.api.artifacts.result.ResolvedArtifactResult;
3429
import org.gradle.api.attributes.Attribute;
3530
import org.gradle.api.attributes.AttributeContainer;
3631
import org.gradle.api.file.FileCollection;
@@ -297,26 +292,7 @@ private void configureProductionRuntimeClasspathConfiguration(Project project) {
297292
productionRuntimeClasspath.setExtendsFrom(runtimeClasspath.getExtendsFrom());
298293
productionRuntimeClasspath.setCanBeResolved(runtimeClasspath.isCanBeResolved());
299294
productionRuntimeClasspath.setCanBeConsumed(runtimeClasspath.isCanBeConsumed());
300-
productionRuntimeClasspath.getDependencyConstraints()
301-
.addAllLater(project.getProviders().provider(() -> constraintsFrom(runtimeClasspath, project)));
302-
}
303-
304-
private Iterable<DependencyConstraint> constraintsFrom(Configuration configuration, Project project) {
305-
DependencyConstraintHandler constraints = project.getDependencies().getConstraints();
306-
return resolvedArtifactsOf(configuration).map((artifact) -> artifact.getId().getComponentIdentifier())
307-
.filter(ModuleComponentIdentifier.class::isInstance)
308-
.map(ModuleComponentIdentifier.class::cast)
309-
.map(this::asConstraintNotation)
310-
.map(constraints::create)
311-
.toList();
312-
}
313-
314-
private Stream<ResolvedArtifactResult> resolvedArtifactsOf(Configuration configuration) {
315-
return configuration.getIncoming().getArtifacts().getArtifacts().stream();
316-
}
317-
318-
private String asConstraintNotation(ModuleComponentIdentifier identifier) {
319-
return "%s:%s:%s".formatted(identifier.getGroup(), identifier.getModule(), identifier.getVersion());
295+
productionRuntimeClasspath.shouldResolveConsistentlyWith(runtimeClasspath);
320296
}
321297

322298
private void configureDevelopmentOnlyConfiguration(Project project) {

0 commit comments

Comments
 (0)