more

Author: aloubyansky

devtools/gradle/gradle-extension-plugin/src/main/java/io/quarkus/extension/gradle/QuarkusExtensionPlugin.java

@@ -122,10 +122,10 @@ private void exportDeploymentClasspath(Project project) {
         DeploymentClasspathBuilder deploymentClasspathBuilder = new DeploymentClasspathBuilder(project);
         project.getConfigurations().getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).getIncoming()
                 .beforeResolve((dependencies) -> deploymentClasspathBuilder
-                        .exportDeploymentClasspath(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME));
+                        .exportDeploymentClasspath(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME, LaunchMode.NORMAL));
         project.getConfigurations().getByName(JavaPlugin.TEST_COMPILE_CLASSPATH_CONFIGURATION_NAME).getIncoming()
                 .beforeResolve((testDependencies) -> deploymentClasspathBuilder
-                        .exportDeploymentClasspath(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME));
+                        .exportDeploymentClasspath(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME, LaunchMode.TEST));
 
     }
 

devtools/gradle/gradle-extension-plugin/src/main/java/io/quarkus/extension/gradle/dependency/DeploymentClasspathBuilder.java

@@ -12,9 +12,12 @@
 import org.gradle.api.artifacts.ResolvedDependency;
 import org.gradle.api.artifacts.dsl.DependencyHandler;
 
+import io.quarkus.gradle.dependency.ConditionalDependencyResolver;
+import io.quarkus.gradle.dependency.DeploymentConfigurationResolver;
 import io.quarkus.gradle.tooling.ToolingUtils;
 import io.quarkus.gradle.tooling.dependency.DependencyUtils;
 import io.quarkus.gradle.tooling.dependency.ExtensionDependency;
+import io.quarkus.runtime.LaunchMode;
 
 public class DeploymentClasspathBuilder {
 
@@ -25,12 +28,15 @@ public DeploymentClasspathBuilder(Project project) {
         this.project = project;
     }
 
-    public void exportDeploymentClasspath(String configurationName) {
+    public void exportDeploymentClasspath(String configurationName, LaunchMode mode) {
 
         String deploymentConfigurationName = ToolingUtils.toDeploymentConfigurationName(configurationName);
         project.getConfigurations().create(deploymentConfigurationName, config -> {
             Configuration configuration = DependencyUtils.duplicateConfiguration(project,
                     project.getConfigurations().getByName(configurationName));
+            DeploymentConfigurationResolver.setDeploymentAttributes(configuration.getAttributes(), project.getName(), mode);
+            ConditionalDependencyResolver.setConditionalAttributes(configuration.getAttributes(), project.getName(), mode);
+
             Set<ExtensionDependency<?>> extensionDependencies = collectFirstMetQuarkusExtensions(configuration);
 
             DependencyHandler dependencies = project.getDependencies();
@@ -43,6 +49,8 @@ public void exportDeploymentClasspath(String configurationName) {
                 dependencies.add(deploymentConfigurationName,
                         DependencyUtils.createDeploymentDependency(dependencies, extension));
             }
+            DeploymentConfigurationResolver.setDeploymentAttributes(config.getAttributes(), project.getName(), mode);
+            ConditionalDependencyResolver.setConditionalAttributes(config.getAttributes(), project.getName(), mode);
         });
     }
 

devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/dependency/ApplicationDeploymentClasspathBuilder.java

@@ -40,6 +40,7 @@
 public class ApplicationDeploymentClasspathBuilder {
 
     public static final String QUARKUS_BOOTSTRAP_RESOLVER_CONFIGURATION = "quarkusBootstrapResolverConfiguration";
+    private static final String ON = "on";
 
     public static String getLaunchModeAlias(LaunchMode mode) {
         if (mode == LaunchMode.DEVELOPMENT) {
@@ -86,15 +87,15 @@ public static void initConfigurations(Project project) {
                     config.extendsFrom(configContainer.getByName(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME));
                     config.setCanBeConsumed(false);
                     config.attributes(attrs -> attrs.attribute(ConditionalDependencyResolver
-                            .getQuarkusConditionalDependencyAttribute(project.getName(), LaunchMode.TEST), "on"));
+                            .getQuarkusConditionalDependencyAttribute(project.getName(), LaunchMode.TEST), ON));
                 });
 
         configContainer
                 .register(ApplicationDeploymentClasspathBuilder.getBaseRuntimeConfigName(LaunchMode.NORMAL), config -> {
                     config.extendsFrom(configContainer.getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME));
                     config.setCanBeConsumed(false);
                     config.attributes(attrs -> attrs.attribute(ConditionalDependencyResolver
-                            .getQuarkusConditionalDependencyAttribute(project.getName(), LaunchMode.NORMAL), "on"));
+                            .getQuarkusConditionalDependencyAttribute(project.getName(), LaunchMode.NORMAL), ON));
                 });
 
         configContainer
@@ -105,36 +106,8 @@ public static void initConfigurations(Project project) {
                             configContainer.getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME));
                     config.setCanBeConsumed(false);
                     config.attributes(attrs -> attrs.attribute(ConditionalDependencyResolver
-                            .getQuarkusConditionalDependencyAttribute(project.getName(), LaunchMode.DEVELOPMENT), "on"));
+                            .getQuarkusConditionalDependencyAttribute(project.getName(), LaunchMode.DEVELOPMENT), ON));
                 });
-        /* @formatter:off
-        var quarkusDepsAttr = Attribute.of("quarkus.deps", String.class);
-        project.getDependencies().getComponents().all(compDetails -> {
-            if (compDetails.getId().getName().equals("xercesImpl")) {
-                System.out.println("Component: " + compDetails.getId());
-                compDetails.addVariant("custom", "compile", variant -> {
-                    variant.attributes(attrs -> {
-                        attrs.attribute(quarkusDepsAttr, "custom");
-                    });
-                    variant.withDependencies(directDeps -> {
-                        for (var directDep : directDeps) {
-                            System.out.println("- " + directDep.getModule());
-                        }
-                        directDeps.add("ai.active:webhook-sdk:1.0.7");
-                    });
-                });
-            }
-        });
-        configContainer.register("quarkusWip", config -> {
-            config.withDependencies(deps -> {
-                deps.add(project.getDependencies().create("xom:xom:1.3.9"));
-            });
-            config.attributes(attrs -> {
-                attrs.attribute(quarkusDepsAttr, "custom");
-            });
-        });
-        @formatter:on
- */
     }
 
     private static Configuration[] getOriginalRuntimeClasspaths(Project project, LaunchMode mode) {