Allow overriding a capability with a different capability version

gradlex-org · May 17, 2024 · 847f328 · 847f328
1 parent 1b7c505
commit 847f328
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/...in/java/org/gradlex/jvm/dependency/conflict/detection/rules/CapabilityDefinitionRule.java b/...in/java/org/gradlex/jvm/dependency/conflict/detection/rules/CapabilityDefinitionRule.java
@@ -38,9 +38,16 @@ public CapabilityDefinitionRule(CapabilityDefinition definition) {
     public final void execute(ComponentMetadataContext context) {
         if (shouldApply(context.getDetails().getId())) {
             context.getDetails().allVariants(variant -> {
-                variant.withCapabilities(capabilities -> capabilities.addCapability(
-                        definition.getGroup(), definition.getCapabilityName(), getVersion(context.getDetails().getId())
-                ));
+                variant.withCapabilities(capabilities -> {
+                    // remove capability if it already exists so that it can be added back
+                    // with a potentially different version
+                    capabilities.removeCapability(
+                            definition.getGroup(), definition.getCapabilityName()
+                    );
+                    capabilities.addCapability(
+                            definition.getGroup(), definition.getCapabilityName(), getVersion(context.getDetails().getId())
+                    );
+                });
                 additionalAdjustments(variant);
             });
         }