Fix setup of ModuleDependencyReport task

Fixes #104

Author: jjohannes

src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesPlugin.java

@@ -132,29 +132,16 @@ private void setupDirectivesDSL(Project project, JavaModuleDependenciesExtension
 
     private void setupModuleDependenciesTask(Project project) {
         SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
-        TaskProvider<ModuleDependencyReport> moduleDependencies = project.getTasks().register("moduleDependencies", ModuleDependencyReport.class, t -> {
-            t.setGroup(HELP_GROUP);
-            if (t.isConfigurationSetByUser()) {
-                Configuration conf = t.getConfigurations().iterator().next();
-                t.getModuleArtifacts().add(project.provider(() -> conf.getIncoming().getArtifacts()));
-            }
-        });
+        TaskProvider<ModuleDependencyReport> moduleDependencies = project.getTasks().register("moduleDependencies", ModuleDependencyReport.class, t -> t.setGroup(HELP_GROUP));
         sourceSets.all(sourceSet -> {
             moduleDependencies.configure(t -> {
-                if (!t.isConfigurationSetByUser()) {
-                    HashSet<Configuration> reportConfigurations = new HashSet<>();
-                    if (t.getConfigurations() != null) {
-                        reportConfigurations.addAll(t.getConfigurations());
-                    }
-                    Configuration cpClasspath = project.getConfigurations().getByName(sourceSet.getCompileClasspathConfigurationName());
-                    Configuration rtClasspath = project.getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName());
-                    reportConfigurations.add(cpClasspath);
-                    reportConfigurations.add(rtClasspath);
-                    t.setConfigurations(reportConfigurations);
-
-                    t.getModuleArtifacts().add(project.provider(() -> cpClasspath.getIncoming().getArtifacts()));
-                    t.getModuleArtifacts().add(project.provider(() -> rtClasspath.getIncoming().getArtifacts()));
+                HashSet<Configuration> joined = new HashSet<>();
+                if (t.getConfigurations() != null) {
+                    joined.addAll(t.getConfigurations());
                 }
+                joined.add(project.getConfigurations().getByName(sourceSet.getCompileClasspathConfigurationName()));
+                joined.add(project.getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName()));
+                t.setConfigurations(joined);
             });
         });
     }

src/main/java/org/gradlex/javamodule/dependencies/internal/diagnostics/AsciiModuleDependencyReportRenderer.java

@@ -31,18 +31,17 @@
 import org.gradle.internal.logging.text.StyledTextOutput;
 
 import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Map;
 
 import static java.util.Objects.requireNonNull;
 
 @NonNullApi
 public class AsciiModuleDependencyReportRenderer extends AsciiDependencyReportRenderer {
 
     private DependencyGraphsRenderer dependencyGraphRenderer;
-    private final Provider<List<ArtifactCollection>> resolvedJars;
+    private final Provider<Map<String, ArtifactCollection>> resolvedJars;
 
-    public AsciiModuleDependencyReportRenderer(Provider<List<ArtifactCollection>> resolvedJars) {
+    public AsciiModuleDependencyReportRenderer(Provider<Map<String, ArtifactCollection>> resolvedJars) {
         this.resolvedJars = resolvedJars;
     }
 
@@ -57,7 +56,7 @@ public void startProject(ProjectDetails project) {
     public void render(ConfigurationDetails configuration) {
         if (configuration.isCanBeResolved()) {
             ResolvedComponentResult result = requireNonNull(configuration.getResolutionResultRoot()).get();
-            RenderableModuleResult root = new RenderableJavaModuleResult(result, resolvedJars.get().stream().flatMap(c -> c.getArtifacts().stream()).collect(Collectors.toSet()));
+            RenderableModuleResult root = new RenderableJavaModuleResult(result, resolvedJars.get().get(configuration.getName()).getArtifacts());
             renderNow(root);
         } else {
             renderNow(requireNonNull(configuration.getUnresolvableResult()));

src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleDependencyReport.java

@@ -18,18 +18,33 @@
 
 import org.gradle.api.NonNullApi;
 import org.gradle.api.artifacts.ArtifactCollection;
-import org.gradle.api.provider.ListProperty;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.file.ConfigurableFileCollection;
+import org.gradle.api.provider.MapProperty;
+import org.gradle.api.provider.ProviderFactory;
+import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.diagnostics.DependencyReportTask;
 import org.gradlex.javamodule.dependencies.internal.diagnostics.AsciiModuleDependencyReportRenderer;
 
+import javax.inject.Inject;
+import java.util.Set;
+
 @NonNullApi
 public abstract class ModuleDependencyReport extends DependencyReportTask {
 
-    private boolean configurationSetByUser = false;
-
     @Internal
-    public abstract ListProperty<ArtifactCollection> getModuleArtifacts();
+    public abstract MapProperty<String, ArtifactCollection> getModuleArtifacts();
+
+    /**
+     * Required to track all Jar files as input of the task.
+     * Although they are only accessed through getModuleArtifacts().
+     */
+    @Classpath
+    public abstract ConfigurableFileCollection getModulePath();
+
+    @Inject
+    protected abstract ProviderFactory getProviders();
 
     public ModuleDependencyReport() {
         setRenderer(new AsciiModuleDependencyReportRenderer(getModuleArtifacts()));
@@ -38,11 +53,21 @@ public ModuleDependencyReport() {
     @Override
     public void setConfiguration(String configurationName) {
         super.setConfiguration(configurationName);
-        configurationSetByUser = true;
+        configurationsChanged();
     }
 
-    @Internal
-    public boolean isConfigurationSetByUser() {
-        return configurationSetByUser;
+    @Override
+    public void setConfigurations(Set<Configuration> configurations) {
+        super.setConfigurations(configurations);
+        configurationsChanged();
+    }
+
+    private void configurationsChanged() {
+        getModulePath().setFrom();
+        getModuleArtifacts().unset();
+        for (Configuration conf : getConfigurations()) {
+            getModulePath().from(conf);
+            getModuleArtifacts().put(conf.getName(), getProviders().provider(() -> conf.getIncoming().getArtifacts()));
+        }
     }
 }