Enhance output of 'moduleDependencies' task

gradlex-org · Apr 4, 2024 · e1c7a75 · e1c7a75
1 parent 21d1947
commit e1c7a75
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Java Module Dependencies Gradle Plugin - Changelog
 
+## Version 1.6.4
+* Enhance output of 'moduleDependencies' task
+* Update 'org.ow2.asm:asm' to 9.7
+
 ## Version 1.6.3
 * Update module name mappings
 

diff --git a/...radlex/javamodule/dependencies/internal/diagnostics/RenderableModuleDependencyResult.java b/...radlex/javamodule/dependencies/internal/diagnostics/RenderableModuleDependencyResult.java
@@ -18,7 +18,9 @@
 
 import org.gradle.api.NonNullApi;
 import org.gradle.api.artifacts.component.ComponentIdentifier;
+import org.gradle.api.artifacts.component.ComponentSelector;
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.artifacts.component.ModuleComponentSelector;
 import org.gradle.api.artifacts.result.DependencyResult;
 import org.gradle.api.artifacts.result.ResolvedArtifactResult;
 import org.gradle.api.artifacts.result.ResolvedDependencyResult;
@@ -65,6 +67,7 @@ public Set<RenderableDependency> getChildren() {
 
     @Override
     public String getName() {
+        ComponentSelector requested = getRequested();
         ComponentIdentifier selected = getActual();
         ResolvedArtifactResult artifact = resolvedJars.stream().filter(a ->
                 a.getId().getComponentIdentifier().equals(selected)).findFirst().orElse(null);
@@ -78,15 +81,30 @@ public String getName() {
                     return "[CLASSPATH] " + selected.getDisplayName();
                 } else {
                     String version = "";
+                    String coordinates =  selected.getDisplayName();
+                    String jarName = artifact.getFile().getName();
                     if (selected instanceof ModuleComponentIdentifier) {
-                        version = " (" + ((ModuleComponentIdentifier) selected).getVersion() + ")";
+                        String selectedVersion = ((ModuleComponentIdentifier) selected).getVersion();
+                        version = " (" + selectedVersion + ")";
+                        if (requested instanceof ModuleComponentSelector) {
+                            String requestedVersion = ((ModuleComponentSelector) requested).getVersion();
+                            if (!requestedVersion.isEmpty() && !selectedVersion.equals(requestedVersion)) {
+                                version = " (" + requestedVersion + " -> " + selectedVersion + ")";
+                            }
+                        }
+                        coordinates = ((ModuleComponentIdentifier) selected).getModuleIdentifier().toString();
                     }
                     String auto = isRealModule(artifact.getFile()) ? "" : "[AUTO] ";
-                    return auto + actualModuleName + version;
+                    return auto + actualModuleName + version + " | " + coordinates +
+                            (isConstraint() ? "" : " | " + jarName);
                 }
             }
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
     }
+
+    private boolean isConstraint() {
+        return getResolutionState() == ResolutionState.RESOLVED_CONSTRAINT;
+    }
 }
diff --git a/...ain/java/org/gradlex/javamodule/dependencies/internal/diagnostics/StyledNodeRenderer.java b/...ain/java/org/gradlex/javamodule/dependencies/internal/diagnostics/StyledNodeRenderer.java
@@ -36,7 +36,8 @@ public void renderNode(StyledTextOutput output, RenderableDependency node, boole
         } else if (name.startsWith("[CLASSPATH]")) {
             output.withStyle(Failure).text(name);
         } else {
-            output.text(name);
+            int idx = name.indexOf('|');
+            output.text(name.substring(0, idx)).withStyle(Description).text(name.substring(idx));
         }
         switch (node.getResolutionState()) {
             case FAILED: