Merge pull request #41329 from aloubyansky/conditional-deps-named-config

Resolve conditional dependencies using named configurations instead of detached ones
quarkusio · Jun 20, 2024 · cf2b3c0 · cf2b3c0
2 parents 81f30f1 + fe3d00d
commit cf2b3c0
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/...adle-model/src/main/java/io/quarkus/gradle/dependency/ConditionalDependenciesEnabler.java b/...adle-model/src/main/java/io/quarkus/gradle/dependency/ConditionalDependenciesEnabler.java
@@ -168,11 +168,20 @@ private void queueConditionalDependency(ExtensionDependency<?> extension, Depend
     }
 
     private Configuration createConditionalDependenciesConfiguration(Project project, Dependency conditionalDep) {
-        Configuration conditionalDepConfiguration = project.getConfigurations()
-                .detachedConfiguration()
-                .extendsFrom(enforcedPlatforms);
-        conditionalDepConfiguration.getDependencies().add(conditionalDep);
-        return conditionalDepConfiguration;
+        // previously we used a detached configuration here but apparently extendsFrom(enforcedPlatforms)
+        // wouldn't actually enforce platforms on a detached configuration
+        final String name = conditionalDep.getGroup() + ":" + conditionalDep.getName() + ":" + conditionalDep.getVersion()
+                + "Configuration";
+        var config = project.getConfigurations().findByName(name);
+        if (config == null) {
+            project.getConfigurations().register(name, configuration -> {
+                configuration.setCanBeConsumed(false);
+                configuration.extendsFrom(enforcedPlatforms);
+                configuration.getDependencies().add(conditionalDep);
+            });
+            config = project.getConfigurations().getByName(name);
+        }
+        return config;
     }
 
     private void enableConditionalDependency(ModuleVersionIdentifier dependency) {