Skip to content

Commit 284dfc3

Browse files
committed
Lazily configure Configurations: replace 'all' with 'configureEach'
1 parent 2632202 commit 284dfc3

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/docs/asciidoc/parts/detection.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ This is best done in the place where you applied this plugin (e.g. one of your c
6767

6868
[source,groovy]
6969
----
70-
configurations.all {
70+
configurations.configureEach {
7171
resolutionStrategy.capabilitiesResolution {
7272
withCapability("javax.mail:mail") { // Capability for which to make the decision
7373
select("com.sun.mail:jakarta.mail:0") // The component to select

src/main/java/org/gradlex/jvm/dependency/conflict/resolution/ConflictResolution.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ private void selectLenient(String capability, String module) {
7575
}
7676

7777
private void doSelectHighestVersion(String capability) {
78-
getConfigurations().all(conf -> conf.getResolutionStrategy().getCapabilitiesResolution().withCapability(capability,
78+
getConfigurations().configureEach(conf -> conf.getResolutionStrategy().getCapabilitiesResolution().withCapability(capability,
7979
CapabilityResolutionDetails::selectHighestVersion));
8080
}
8181

8282
private void doSelect(String capability, String module, boolean lenient) {
8383
String group = module.split(":")[0];
8484
String name = module.split(":")[1];
85-
getConfigurations().all(conf -> conf.getResolutionStrategy().getCapabilitiesResolution().withCapability(capability, c -> {
85+
getConfigurations().configureEach(conf -> conf.getResolutionStrategy().getCapabilitiesResolution().withCapability(capability, c -> {
8686
for (ComponentVariantIdentifier candidate : c.getCandidates()) {
8787
ComponentIdentifier id = candidate.getId();
8888
if (id instanceof ModuleComponentIdentifier

src/main/java/org/gradlex/jvm/dependency/conflict/resolution/JvmDependencyConflictResolutionPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void apply(Project project) {
5454
}
5555

5656
private void configureResolutionStrategies(ConfigurationContainer configurations, JvmDependencyConflictsExtension jvmDependencyConflicts) {
57-
configurations.all(configuration -> {
57+
configurations.configureEach(configuration -> {
5858
for (CapabilityDefinition definition : CapabilityDefinition.values()) {
5959
defineStrategy(definition, configuration, jvmDependencyConflicts);
6060
}

src/main/java/org/gradlex/jvm/dependency/conflict/resolution/Logging.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ private void enforceSlf4JImplementation() {
420420
selectSlf4JLog4J2Interaction(LoggingModuleIdentifiers.LOG4J_TO_SLF4J.moduleId);
421421
selectLog4J2Implementation(LoggingModuleIdentifiers.LOG4J_TO_SLF4J.moduleId);
422422

423-
getConfigurations().all(new Slf4JEnforcementSubstitutionsUsing());
423+
getConfigurations().configureEach(new Slf4JEnforcementSubstitutionsUsing());
424424
}
425425

426426
private void enforceSlf4JImplementation(String configurationName) {
@@ -430,7 +430,7 @@ private void enforceSlf4JImplementation(String configurationName) {
430430
selectSlf4JLog4J2Interaction(configurationName, LoggingModuleIdentifiers.LOG4J_TO_SLF4J.moduleId);
431431
selectLog4J2Implementation(configurationName, LoggingModuleIdentifiers.LOG4J_TO_SLF4J.moduleId);
432432

433-
getConfigurations().matching(conf -> conf.getName().equals(configurationName)).all(new Slf4JEnforcementSubstitutionsUsing());
433+
getConfigurations().matching(conf -> conf.getName().equals(configurationName)).configureEach(new Slf4JEnforcementSubstitutionsUsing());
434434
}
435435

436436
private ExternalDependency validateNotation(Object dependencyNotation) {
@@ -443,11 +443,11 @@ private ExternalDependency validateNotation(Object dependencyNotation) {
443443
}
444444

445445
private void selectCapabilityConflict(String configuration, String capabilityId, ExternalDependency target, String because) {
446-
getConfigurations().matching(conf -> conf.getName().equals(configuration)).all(conf -> conf.getResolutionStrategy().capabilitiesResolution(getCapabilitiesResolutionAction(capabilityId, target, because)));
446+
getConfigurations().matching(conf -> conf.getName().equals(configuration)).configureEach(conf -> conf.getResolutionStrategy().capabilitiesResolution(getCapabilitiesResolutionAction(capabilityId, target, because)));
447447
}
448448

449449
private void selectCapabilityConflict(String capabilityId, ExternalDependency target, String because) {
450-
getConfigurations().all(conf -> conf.getResolutionStrategy().capabilitiesResolution(getCapabilitiesResolutionAction(capabilityId, target, because)));
450+
getConfigurations().configureEach(conf -> conf.getResolutionStrategy().capabilitiesResolution(getCapabilitiesResolutionAction(capabilityId, target, because)));
451451
}
452452

453453
private Action<CapabilitiesResolution> getCapabilitiesResolutionAction(String capabilityId, ExternalDependency target, String because) {

0 commit comments

Comments
 (0)