fix(deps): update dependency com.github.ajalt.mordant:mordant to v3

gradle/libs.versions.toml

@@ -11,7 +11,7 @@ google-ksp = "2.0.21-1.0.27"
 square-anvil = "2.5.1"
 
 ajalt-clikt = "5.0.3"
-ajalt-mordant = "2.1.0"
+ajalt-mordant = "3.0.1"
 
 androidTools = "8.1.0"
 

modulecheck-gradle/plugin/api/plugin.api

@@ -56,7 +56,6 @@ public class modulecheck/gradle/ChecksExtension : modulecheck/config/ChecksSetti
 public final class modulecheck/gradle/ChecksExtension_Factory : dagger/internal/Factory {
 	public fun <init> (Ldagger/internal/Provider;)V
 	public static fun create (Ldagger/internal/Provider;)Lmodulecheck/gradle/ChecksExtension_Factory;
-	public static fun create (Ljavax/inject/Provider;)Lmodulecheck/gradle/ChecksExtension_Factory;
 	public synthetic fun get ()Ljava/lang/Object;
 	public fun get ()Lmodulecheck/gradle/ChecksExtension;
 	public static fun newInstance (Lorg/gradle/api/model/ObjectFactory;)Lmodulecheck/gradle/ChecksExtension;
@@ -74,7 +73,6 @@ public final class modulecheck/gradle/GradleMcLogger : modulecheck/reporting/log
 public final class modulecheck/gradle/GradleMcLogger_Factory : dagger/internal/Factory {
 	public fun <init> (Ldagger/internal/Provider;)V
 	public static fun create (Ldagger/internal/Provider;)Lmodulecheck/gradle/GradleMcLogger_Factory;
-	public static fun create (Ljavax/inject/Provider;)Lmodulecheck/gradle/GradleMcLogger_Factory;
 	public synthetic fun get ()Ljava/lang/Object;
 	public fun get ()Lmodulecheck/gradle/GradleMcLogger;
 	public static fun newInstance (Lcom/github/ajalt/mordant/terminal/Terminal;)Lmodulecheck/gradle/GradleMcLogger;
@@ -111,7 +109,6 @@ public class modulecheck/gradle/ModuleCheckExtension : modulecheck/config/Module
 public final class modulecheck/gradle/ModuleCheckExtension_Factory : dagger/internal/Factory {
 	public fun <init> (Ldagger/internal/Provider;Ldagger/internal/Provider;)V
 	public static fun create (Ldagger/internal/Provider;Ldagger/internal/Provider;)Lmodulecheck/gradle/ModuleCheckExtension_Factory;
-	public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;)Lmodulecheck/gradle/ModuleCheckExtension_Factory;
 	public synthetic fun get ()Ljava/lang/Object;
 	public fun get ()Lmodulecheck/gradle/ModuleCheckExtension;
 	public static fun newInstance (Lorg/gradle/api/model/ObjectFactory;Lorg/gradle/api/file/ProjectLayout;)Lmodulecheck/gradle/ModuleCheckExtension;
@@ -161,7 +158,6 @@ public class modulecheck/gradle/ReportsExtension : modulecheck/config/ReportsSet
 public final class modulecheck/gradle/ReportsExtension_Factory : dagger/internal/Factory {
 	public fun <init> (Ldagger/internal/Provider;Ldagger/internal/Provider;)V
 	public static fun create (Ldagger/internal/Provider;Ldagger/internal/Provider;)Lmodulecheck/gradle/ReportsExtension_Factory;
-	public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;)Lmodulecheck/gradle/ReportsExtension_Factory;
 	public synthetic fun get ()Ljava/lang/Object;
 	public fun get ()Lmodulecheck/gradle/ReportsExtension;
 	public static fun newInstance (Lorg/gradle/api/model/ObjectFactory;Lorg/gradle/api/file/ProjectLayout;)Lmodulecheck/gradle/ReportsExtension;
@@ -178,7 +174,6 @@ public class modulecheck/gradle/SortExtension : modulecheck/config/SortSettings
 public final class modulecheck/gradle/SortExtension_Factory : dagger/internal/Factory {
 	public fun <init> (Ldagger/internal/Provider;)V
 	public static fun create (Ldagger/internal/Provider;)Lmodulecheck/gradle/SortExtension_Factory;
-	public static fun create (Ljavax/inject/Provider;)Lmodulecheck/gradle/SortExtension_Factory;
 	public synthetic fun get ()Ljava/lang/Object;
 	public fun get ()Lmodulecheck/gradle/SortExtension;
 	public static fun newInstance (Lorg/gradle/api/model/ObjectFactory;)Lmodulecheck/gradle/SortExtension;
@@ -200,7 +195,6 @@ public final class modulecheck/gradle/internal/GradleProjectProvider$Companion {
 public final class modulecheck/gradle/internal/GradleProjectProvider_Factory : dagger/internal/Factory {
 	public fun <init> (Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;)V
 	public static fun create (Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;)Lmodulecheck/gradle/internal/GradleProjectProvider_Factory;
-	public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)Lmodulecheck/gradle/internal/GradleProjectProvider_Factory;
 	public synthetic fun get ()Ljava/lang/Object;
 	public fun get ()Lmodulecheck/gradle/internal/GradleProjectProvider;
 	public static fun newInstance (Lorg/gradle/api/Project;Lmodulecheck/config/ModuleCheckSettings;Lmodulecheck/project/ProjectCache;Lmodulecheck/gradle/GradleMcLogger;Lmodulecheck/gradle/platforms/android/AgpApiAccess;Lmodulecheck/parsing/gradle/dsl/BuildFileParser$Factory;Lmodulecheck/parsing/wiring/RealJvmFileProvider$Factory;Lmodulecheck/gradle/platforms/android/AndroidPlatformPluginFactory;Lmodulecheck/gradle/platforms/JvmPlatformPluginFactory;Lmodulecheck/model/dependency/TypeSafeProjectPathResolver;Lmodulecheck/model/dependency/AllProjectPathsProvider;)Lmodulecheck/gradle/internal/GradleProjectProvider;
@@ -284,7 +278,6 @@ public class modulecheck/gradle/task/MultiRuleModuleCheckTask : modulecheck/grad
 public final class modulecheck/gradle/task/MultiRuleModuleCheckTask_Factory : dagger/internal/Factory {
 	public fun <init> (Ldagger/internal/Provider;Ldagger/internal/Provider;)V
 	public static fun create (Ldagger/internal/Provider;Ldagger/internal/Provider;)Lmodulecheck/gradle/task/MultiRuleModuleCheckTask_Factory;
-	public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;)Lmodulecheck/gradle/task/MultiRuleModuleCheckTask_Factory;
 	public synthetic fun get ()Ljava/lang/Object;
 	public fun get ()Lmodulecheck/gradle/task/MultiRuleModuleCheckTask;
 	public static fun newInstance (ZZ)Lmodulecheck/gradle/task/MultiRuleModuleCheckTask;
@@ -298,7 +291,6 @@ public class modulecheck/gradle/task/SingleRuleModuleCheckTask : modulecheck/gra
 public final class modulecheck/gradle/task/SingleRuleModuleCheckTask_Factory : dagger/internal/Factory {
 	public fun <init> (Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;)V
 	public static fun create (Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;)Lmodulecheck/gradle/task/SingleRuleModuleCheckTask_Factory;
-	public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)Lmodulecheck/gradle/task/SingleRuleModuleCheckTask_Factory;
 	public synthetic fun get ()Ljava/lang/Object;
 	public fun get ()Lmodulecheck/gradle/task/SingleRuleModuleCheckTask;
 	public static fun newInstance (Lmodulecheck/finding/FindingName;ZZ)Lmodulecheck/gradle/task/SingleRuleModuleCheckTask;
@@ -323,7 +315,6 @@ public final class modulecheck/parsing/groovy/antlr/GroovyAndroidGradleParser_Fa
 public final class modulecheck/parsing/groovy/antlr/GroovyDependenciesBlockParser_Factory : dagger/internal/Factory {
 	public fun <init> (Ldagger/internal/Provider;Ldagger/internal/Provider;)V
 	public static fun create (Ldagger/internal/Provider;Ldagger/internal/Provider;)Lmodulecheck/parsing/groovy/antlr/GroovyDependenciesBlockParser_Factory;
-	public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;)Lmodulecheck/parsing/groovy/antlr/GroovyDependenciesBlockParser_Factory;
 	public synthetic fun get ()Ljava/lang/Object;
 	public fun get ()Lmodulecheck/parsing/groovy/antlr/GroovyDependenciesBlockParser;
 	public static fun newInstance (Lmodulecheck/reporting/logging/McLogger;Lmodulecheck/model/dependency/ProjectDependency$Factory;)Lmodulecheck/parsing/groovy/antlr/GroovyDependenciesBlockParser;
@@ -332,7 +323,6 @@ public final class modulecheck/parsing/groovy/antlr/GroovyDependenciesBlockParse
 public final class modulecheck/parsing/groovy/antlr/GroovyPluginsBlockParser_Factory : dagger/internal/Factory {
 	public fun <init> (Ldagger/internal/Provider;)V
 	public static fun create (Ldagger/internal/Provider;)Lmodulecheck/parsing/groovy/antlr/GroovyPluginsBlockParser_Factory;
-	public static fun create (Ljavax/inject/Provider;)Lmodulecheck/parsing/groovy/antlr/GroovyPluginsBlockParser_Factory;
 	public synthetic fun get ()Ljava/lang/Object;
 	public fun get ()Lmodulecheck/parsing/groovy/antlr/GroovyPluginsBlockParser;
 	public static fun newInstance (Lmodulecheck/reporting/logging/McLogger;)Lmodulecheck/parsing/groovy/antlr/GroovyPluginsBlockParser;
@@ -349,7 +339,6 @@ public final class modulecheck/parsing/kotlin/compiler/NoContextPsiFileFactory_F
 public final class modulecheck/parsing/psi/KotlinAndroidGradleParser_Factory : dagger/internal/Factory {
 	public fun <init> (Ldagger/internal/Provider;)V
 	public static fun create (Ldagger/internal/Provider;)Lmodulecheck/parsing/psi/KotlinAndroidGradleParser_Factory;
-	public static fun create (Ljavax/inject/Provider;)Lmodulecheck/parsing/psi/KotlinAndroidGradleParser_Factory;
 	public synthetic fun get ()Ljava/lang/Object;
 	public fun get ()Lmodulecheck/parsing/psi/KotlinAndroidGradleParser;
 	public static fun newInstance (Lmodulecheck/parsing/kotlin/compiler/NoContextPsiFileFactory;)Lmodulecheck/parsing/psi/KotlinAndroidGradleParser;
@@ -358,7 +347,6 @@ public final class modulecheck/parsing/psi/KotlinAndroidGradleParser_Factory : d
 public final class modulecheck/parsing/psi/KotlinDependenciesBlockParser_Factory : dagger/internal/Factory {
 	public fun <init> (Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;)V
 	public static fun create (Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;)Lmodulecheck/parsing/psi/KotlinDependenciesBlockParser_Factory;
-	public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)Lmodulecheck/parsing/psi/KotlinDependenciesBlockParser_Factory;
 	public synthetic fun get ()Ljava/lang/Object;
 	public fun get ()Lmodulecheck/parsing/psi/KotlinDependenciesBlockParser;
 	public static fun newInstance (Lmodulecheck/reporting/logging/McLogger;Lmodulecheck/parsing/kotlin/compiler/NoContextPsiFileFactory;Lmodulecheck/model/dependency/ProjectDependency$Factory;)Lmodulecheck/parsing/psi/KotlinDependenciesBlockParser;
@@ -367,7 +355,6 @@ public final class modulecheck/parsing/psi/KotlinDependenciesBlockParser_Factory
 public final class modulecheck/parsing/psi/KotlinPluginsBlockParser_Factory : dagger/internal/Factory {
 	public fun <init> (Ldagger/internal/Provider;)V
 	public static fun create (Ldagger/internal/Provider;)Lmodulecheck/parsing/psi/KotlinPluginsBlockParser_Factory;
-	public static fun create (Ljavax/inject/Provider;)Lmodulecheck/parsing/psi/KotlinPluginsBlockParser_Factory;
 	public synthetic fun get ()Ljava/lang/Object;
 	public fun get ()Lmodulecheck/parsing/psi/KotlinPluginsBlockParser;
 	public static fun newInstance (Lmodulecheck/reporting/logging/McLogger;)Lmodulecheck/parsing/psi/KotlinPluginsBlockParser;

modulecheck-model/dependency/api/src/main/kotlin/modulecheck/model/dependency/ConfiguredDependency.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Rick Busarow
+ * Copyright (C) 2021-2025 Rick Busarow
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -38,6 +38,7 @@ sealed interface ConfiguredDependency : Dependency {
    */
   val isTestFixture: Boolean
 
+  /** */
   companion object {
 
     inline fun <reified T : ConfiguredDependency> T.copy(
@@ -84,6 +85,7 @@ sealed interface Dependency
 data class PluginDependency(
   val accessor: PluginAccessor
 ) : Dependency {
+  /** */
   companion object {
     /**
      * @return a [PluginDependency] wrapping the [PluginAccessor] receiver

modulecheck-model/dependency/api/src/main/kotlin/modulecheck/model/dependency/SourceSetDependency.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Rick Busarow
+ * Copyright (C) 2021-2025 Rick Busarow
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -50,18 +50,18 @@ sealed interface SourceSetDependency : HasIdentifier {
 
 fun ConfiguredDependency.toSourceSetDependency(
   sourceSetName: SourceSetName = configurationName.toSourceSetName()
-): SourceSetDependency = when (this) {
+): SourceSetDependency = when (val dep = this@toSourceSetDependency as ConfiguredDependency) {
   is ExternalDependency -> SourceSetExternalDependency(
     sourceSetName = sourceSetName,
-    group = group,
-    moduleName = moduleName,
-    version = version,
+    group = dep.group,
+    moduleName = dep.moduleName,
+    version = dep.version,
     isTestFixture = isTestFixture
   )
 
   is ProjectDependency -> SourceSetProjectDependency(
     sourceSetName = sourceSetName,
-    projectPath = projectPath,
+    projectPath = dep.projectPath,
     isTestFixture = isTestFixture
   )
 }

modulecheck-reporting/console/src/main/kotlin/modulecheck/reporting/console/ReportFactory.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Rick Busarow
+ * Copyright (C) 2021-2025 Rick Busarow
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -18,6 +18,7 @@ package modulecheck.reporting.console
 import com.github.ajalt.mordant.rendering.OverflowWrap
 import com.github.ajalt.mordant.rendering.TextAlign
 import com.github.ajalt.mordant.rendering.Whitespace
+import com.github.ajalt.mordant.table.Borders
 import com.github.ajalt.mordant.table.grid
 import com.github.ajalt.mordant.terminal.Terminal
 import modulecheck.finding.Finding
@@ -53,35 +54,54 @@ class ReportFactory @Inject constructor(private val terminal: Terminal) {
       val values = entry.value
       val path = values.first().dependentPath
 
+      val sortedValues = values.sortedWith(
+        compareBy(
+          { !it.fixed },
+          { it.dependencyIdentifier },
+          { it.positionOrNull },
+          { it.findingName.id },
+          { it.configurationName },
+          { it.sourceOrNull },
+          { it.toString() }
+        )
+      )
+
       appendLine("    ${path.value}")
       val grid = grid {
 
-        whitespace = Whitespace.NORMAL
+        cellBorders = Borders.NONE
+        // borderType = BorderType.DOUBLE
+
+        whitespace = Whitespace.PRE
         overflowWrap = OverflowWrap.NORMAL
-        align = TextAlign.NONE
-        padding { left = PADDING }
 
-        row("           ", "configuration", "dependency", "name", "source", "build file") {
-          align = TextAlign.LEFT
+        padding {
+          left = PADDING
+          right = 1
+        }
+
+        row("   ", "configuration", "dependency", "name", "source", "build file")
+
+        column(0) {
+          align = TextAlign.RIGHT
+          padding {
+            right = 0
+          }
         }
-        column(0) { align = TextAlign.RIGHT }
-        column(0) { padding { left = PADDING_START } }
-        column(1) { padding { left = 1 } }
-
-        values.sortedWith(
-          compareBy(
-            { !it.fixed },
-            { it.dependencyIdentifier },
-            { it.positionOrNull },
-            { it.findingName.id },
-            { it.configurationName },
-            { it.sourceOrNull },
-            { it.toString() }
-          )
-        ).forEach { result ->
+        column(1) {
+          padding {
+            left = 2
+            right = 1
+          }
+        }
+
+        align = TextAlign.LEFT
 
+        for (result in sortedValues) {
           val icon = if (result.fixed) theme.success(FIXED) else theme.danger(ERROR)
 
+          val rowColor = if (result.fixed) theme.warning.color else theme.danger.color
+
           row(
             icon,
             result.configurationName,
@@ -90,12 +110,12 @@ class ReportFactory @Inject constructor(private val terminal: Terminal) {
             result.sourceOrNull.orEmpty(),
             result.filePathString
           ) {
-            style(color = if (result.fixed) theme.warning.color else theme.danger.color)
+            style(color = rowColor)
           }
         }
       }
 
-      appendLine(terminal.render(grid))
+      appendLine(terminal.render(grid).prependIndent("      "))
 
       if (entry != entries.last()) {
         appendLine()
@@ -112,8 +132,5 @@ class ReportFactory @Inject constructor(private val terminal: Terminal) {
 
     /** */
     const val PADDING: Int = 3
-
-    /** */
-    private const val PADDING_START = 8
   }
 }

modulecheck-reporting/logging/api/src/main/kotlin/modulecheck/reporting/logging/TerminalModule.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Rick Busarow
+ * Copyright (C) 2021-2025 Rick Busarow
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -43,7 +43,6 @@ object TerminalModule {
         )
       )
     }
-  ).also {
-    it.info.updateTerminalSize()
-  }
+  )
+    .also { it.updateSize() }
 }