Skip to content

Commit c26c080

Browse files
RBusarowRBusarow
committed
fix report clipping with new Mordant version
1 parent 2819c75 commit c26c080

File tree

6 files changed

+484
-330
lines changed

6 files changed

+484
-330
lines changed

‎dependency-guard-aggregate.txt‎

Lines changed: 429 additions & 280 deletions
Large diffs are not rendered by default.

‎modulecheck-gradle/plugin/api/plugin.api‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public class modulecheck/gradle/ChecksExtension : modulecheck/config/ChecksSetti
5656
public final class modulecheck/gradle/ChecksExtension_Factory : dagger/internal/Factory {
5757
public fun <init> (Ldagger/internal/Provider;)V
5858
public static fun create (Ldagger/internal/Provider;)Lmodulecheck/gradle/ChecksExtension_Factory;
59-
public static fun create (Ljavax/inject/Provider;)Lmodulecheck/gradle/ChecksExtension_Factory;
6059
public synthetic fun get ()Ljava/lang/Object;
6160
public fun get ()Lmodulecheck/gradle/ChecksExtension;
6261
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
7473
public final class modulecheck/gradle/GradleMcLogger_Factory : dagger/internal/Factory {
7574
public fun <init> (Ldagger/internal/Provider;)V
7675
public static fun create (Ldagger/internal/Provider;)Lmodulecheck/gradle/GradleMcLogger_Factory;
77-
public static fun create (Ljavax/inject/Provider;)Lmodulecheck/gradle/GradleMcLogger_Factory;
7876
public synthetic fun get ()Ljava/lang/Object;
7977
public fun get ()Lmodulecheck/gradle/GradleMcLogger;
8078
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
111109
public final class modulecheck/gradle/ModuleCheckExtension_Factory : dagger/internal/Factory {
112110
public fun <init> (Ldagger/internal/Provider;Ldagger/internal/Provider;)V
113111
public static fun create (Ldagger/internal/Provider;Ldagger/internal/Provider;)Lmodulecheck/gradle/ModuleCheckExtension_Factory;
114-
public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;)Lmodulecheck/gradle/ModuleCheckExtension_Factory;
115112
public synthetic fun get ()Ljava/lang/Object;
116113
public fun get ()Lmodulecheck/gradle/ModuleCheckExtension;
117114
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
161158
public final class modulecheck/gradle/ReportsExtension_Factory : dagger/internal/Factory {
162159
public fun <init> (Ldagger/internal/Provider;Ldagger/internal/Provider;)V
163160
public static fun create (Ldagger/internal/Provider;Ldagger/internal/Provider;)Lmodulecheck/gradle/ReportsExtension_Factory;
164-
public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;)Lmodulecheck/gradle/ReportsExtension_Factory;
165161
public synthetic fun get ()Ljava/lang/Object;
166162
public fun get ()Lmodulecheck/gradle/ReportsExtension;
167163
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
178174
public final class modulecheck/gradle/SortExtension_Factory : dagger/internal/Factory {
179175
public fun <init> (Ldagger/internal/Provider;)V
180176
public static fun create (Ldagger/internal/Provider;)Lmodulecheck/gradle/SortExtension_Factory;
181-
public static fun create (Ljavax/inject/Provider;)Lmodulecheck/gradle/SortExtension_Factory;
182177
public synthetic fun get ()Ljava/lang/Object;
183178
public fun get ()Lmodulecheck/gradle/SortExtension;
184179
public static fun newInstance (Lorg/gradle/api/model/ObjectFactory;)Lmodulecheck/gradle/SortExtension;
@@ -200,7 +195,6 @@ public final class modulecheck/gradle/internal/GradleProjectProvider$Companion {
200195
public final class modulecheck/gradle/internal/GradleProjectProvider_Factory : dagger/internal/Factory {
201196
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
202197
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;
203-
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;
204198
public synthetic fun get ()Ljava/lang/Object;
205199
public fun get ()Lmodulecheck/gradle/internal/GradleProjectProvider;
206200
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
284278
public final class modulecheck/gradle/task/MultiRuleModuleCheckTask_Factory : dagger/internal/Factory {
285279
public fun <init> (Ldagger/internal/Provider;Ldagger/internal/Provider;)V
286280
public static fun create (Ldagger/internal/Provider;Ldagger/internal/Provider;)Lmodulecheck/gradle/task/MultiRuleModuleCheckTask_Factory;
287-
public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;)Lmodulecheck/gradle/task/MultiRuleModuleCheckTask_Factory;
288281
public synthetic fun get ()Ljava/lang/Object;
289282
public fun get ()Lmodulecheck/gradle/task/MultiRuleModuleCheckTask;
290283
public static fun newInstance (ZZ)Lmodulecheck/gradle/task/MultiRuleModuleCheckTask;
@@ -298,7 +291,6 @@ public class modulecheck/gradle/task/SingleRuleModuleCheckTask : modulecheck/gra
298291
public final class modulecheck/gradle/task/SingleRuleModuleCheckTask_Factory : dagger/internal/Factory {
299292
public fun <init> (Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;)V
300293
public static fun create (Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;)Lmodulecheck/gradle/task/SingleRuleModuleCheckTask_Factory;
301-
public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)Lmodulecheck/gradle/task/SingleRuleModuleCheckTask_Factory;
302294
public synthetic fun get ()Ljava/lang/Object;
303295
public fun get ()Lmodulecheck/gradle/task/SingleRuleModuleCheckTask;
304296
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
323315
public final class modulecheck/parsing/groovy/antlr/GroovyDependenciesBlockParser_Factory : dagger/internal/Factory {
324316
public fun <init> (Ldagger/internal/Provider;Ldagger/internal/Provider;)V
325317
public static fun create (Ldagger/internal/Provider;Ldagger/internal/Provider;)Lmodulecheck/parsing/groovy/antlr/GroovyDependenciesBlockParser_Factory;
326-
public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;)Lmodulecheck/parsing/groovy/antlr/GroovyDependenciesBlockParser_Factory;
327318
public synthetic fun get ()Ljava/lang/Object;
328319
public fun get ()Lmodulecheck/parsing/groovy/antlr/GroovyDependenciesBlockParser;
329320
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
332323
public final class modulecheck/parsing/groovy/antlr/GroovyPluginsBlockParser_Factory : dagger/internal/Factory {
333324
public fun <init> (Ldagger/internal/Provider;)V
334325
public static fun create (Ldagger/internal/Provider;)Lmodulecheck/parsing/groovy/antlr/GroovyPluginsBlockParser_Factory;
335-
public static fun create (Ljavax/inject/Provider;)Lmodulecheck/parsing/groovy/antlr/GroovyPluginsBlockParser_Factory;
336326
public synthetic fun get ()Ljava/lang/Object;
337327
public fun get ()Lmodulecheck/parsing/groovy/antlr/GroovyPluginsBlockParser;
338328
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
349339
public final class modulecheck/parsing/psi/KotlinAndroidGradleParser_Factory : dagger/internal/Factory {
350340
public fun <init> (Ldagger/internal/Provider;)V
351341
public static fun create (Ldagger/internal/Provider;)Lmodulecheck/parsing/psi/KotlinAndroidGradleParser_Factory;
352-
public static fun create (Ljavax/inject/Provider;)Lmodulecheck/parsing/psi/KotlinAndroidGradleParser_Factory;
353342
public synthetic fun get ()Ljava/lang/Object;
354343
public fun get ()Lmodulecheck/parsing/psi/KotlinAndroidGradleParser;
355344
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
358347
public final class modulecheck/parsing/psi/KotlinDependenciesBlockParser_Factory : dagger/internal/Factory {
359348
public fun <init> (Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;)V
360349
public static fun create (Ldagger/internal/Provider;Ldagger/internal/Provider;Ldagger/internal/Provider;)Lmodulecheck/parsing/psi/KotlinDependenciesBlockParser_Factory;
361-
public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)Lmodulecheck/parsing/psi/KotlinDependenciesBlockParser_Factory;
362350
public synthetic fun get ()Ljava/lang/Object;
363351
public fun get ()Lmodulecheck/parsing/psi/KotlinDependenciesBlockParser;
364352
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
367355
public final class modulecheck/parsing/psi/KotlinPluginsBlockParser_Factory : dagger/internal/Factory {
368356
public fun <init> (Ldagger/internal/Provider;)V
369357
public static fun create (Ldagger/internal/Provider;)Lmodulecheck/parsing/psi/KotlinPluginsBlockParser_Factory;
370-
public static fun create (Ljavax/inject/Provider;)Lmodulecheck/parsing/psi/KotlinPluginsBlockParser_Factory;
371358
public synthetic fun get ()Ljava/lang/Object;
372359
public fun get ()Lmodulecheck/parsing/psi/KotlinPluginsBlockParser;
373360
public static fun newInstance (Lmodulecheck/reporting/logging/McLogger;)Lmodulecheck/parsing/psi/KotlinPluginsBlockParser;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021-2023 Rick Busarow
2+
* Copyright (C) 2021-2025 Rick Busarow
33
* Licensed under the Apache License, Version 2.0 (the "License");
44
* you may not use this file except in compliance with the License.
55
* You may obtain a copy of the License at
@@ -38,6 +38,7 @@ sealed interface ConfiguredDependency : Dependency {
3838
*/
3939
val isTestFixture: Boolean
4040

41+
/** */
4142
companion object {
4243

4344
inline fun <reified T : ConfiguredDependency> T.copy(
@@ -84,6 +85,7 @@ sealed interface Dependency
8485
data class PluginDependency(
8586
val accessor: PluginAccessor
8687
) : Dependency {
88+
/** */
8789
companion object {
8890
/**
8991
* @return a [PluginDependency] wrapping the [PluginAccessor] receiver

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021-2023 Rick Busarow
2+
* Copyright (C) 2021-2025 Rick Busarow
33
* Licensed under the Apache License, Version 2.0 (the "License");
44
* you may not use this file except in compliance with the License.
55
* You may obtain a copy of the License at
@@ -50,18 +50,18 @@ sealed interface SourceSetDependency : HasIdentifier {
5050

5151
fun ConfiguredDependency.toSourceSetDependency(
5252
sourceSetName: SourceSetName = configurationName.toSourceSetName()
53-
): SourceSetDependency = when (this) {
53+
): SourceSetDependency = when (val dep = this@toSourceSetDependency as ConfiguredDependency) {
5454
is ExternalDependency -> SourceSetExternalDependency(
5555
sourceSetName = sourceSetName,
56-
group = group,
57-
moduleName = moduleName,
58-
version = version,
56+
group = dep.group,
57+
moduleName = dep.moduleName,
58+
version = dep.version,
5959
isTestFixture = isTestFixture
6060
)
6161

6262
is ProjectDependency -> SourceSetProjectDependency(
6363
sourceSetName = sourceSetName,
64-
projectPath = projectPath,
64+
projectPath = dep.projectPath,
6565
isTestFixture = isTestFixture
6666
)
6767
}

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

Lines changed: 43 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021-2023 Rick Busarow
2+
* Copyright (C) 2021-2025 Rick Busarow
33
* Licensed under the Apache License, Version 2.0 (the "License");
44
* you may not use this file except in compliance with the License.
55
* You may obtain a copy of the License at
@@ -18,6 +18,7 @@ package modulecheck.reporting.console
1818
import com.github.ajalt.mordant.rendering.OverflowWrap
1919
import com.github.ajalt.mordant.rendering.TextAlign
2020
import com.github.ajalt.mordant.rendering.Whitespace
21+
import com.github.ajalt.mordant.table.Borders
2122
import com.github.ajalt.mordant.table.grid
2223
import com.github.ajalt.mordant.terminal.Terminal
2324
import modulecheck.finding.Finding
@@ -53,35 +54,54 @@ class ReportFactory @Inject constructor(private val terminal: Terminal) {
5354
val values = entry.value
5455
val path = values.first().dependentPath
5556

57+
val sortedValues = values.sortedWith(
58+
compareBy(
59+
{ !it.fixed },
60+
{ it.dependencyIdentifier },
61+
{ it.positionOrNull },
62+
{ it.findingName.id },
63+
{ it.configurationName },
64+
{ it.sourceOrNull },
65+
{ it.toString() }
66+
)
67+
)
68+
5669
appendLine(" ${path.value}")
5770
val grid = grid {
5871

59-
whitespace = Whitespace.NORMAL
72+
cellBorders = Borders.NONE
73+
// borderType = BorderType.DOUBLE
74+
75+
whitespace = Whitespace.PRE
6076
overflowWrap = OverflowWrap.NORMAL
61-
align = TextAlign.NONE
62-
padding { left = PADDING }
6377

64-
row(" ", "configuration", "dependency", "name", "source", "build file") {
65-
align = TextAlign.LEFT
78+
padding {
79+
left = PADDING
80+
right = 1
81+
}
82+
83+
row(" ", "configuration", "dependency", "name", "source", "build file")
84+
85+
column(0) {
86+
align = TextAlign.RIGHT
87+
padding {
88+
right = 0
89+
}
6690
}
67-
column(0) { align = TextAlign.RIGHT }
68-
column(0) { padding { left = PADDING_START } }
69-
column(1) { padding { left = 1 } }
70-
71-
values.sortedWith(
72-
compareBy(
73-
{ !it.fixed },
74-
{ it.dependencyIdentifier },
75-
{ it.positionOrNull },
76-
{ it.findingName.id },
77-
{ it.configurationName },
78-
{ it.sourceOrNull },
79-
{ it.toString() }
80-
)
81-
).forEach { result ->
91+
column(1) {
92+
padding {
93+
left = 2
94+
right = 1
95+
}
96+
}
97+
98+
align = TextAlign.LEFT
8299

100+
for (result in sortedValues) {
83101
val icon = if (result.fixed) theme.success(FIXED) else theme.danger(ERROR)
84102

103+
val rowColor = if (result.fixed) theme.warning.color else theme.danger.color
104+
85105
row(
86106
icon,
87107
result.configurationName,
@@ -90,12 +110,12 @@ class ReportFactory @Inject constructor(private val terminal: Terminal) {
90110
result.sourceOrNull.orEmpty(),
91111
result.filePathString
92112
) {
93-
style(color = if (result.fixed) theme.warning.color else theme.danger.color)
113+
style(color = rowColor)
94114
}
95115
}
96116
}
97117

98-
appendLine(terminal.render(grid))
118+
appendLine(terminal.render(grid).prependIndent(" "))
99119

100120
if (entry != entries.last()) {
101121
appendLine()
@@ -112,8 +132,5 @@ class ReportFactory @Inject constructor(private val terminal: Terminal) {
112132

113133
/** */
114134
const val PADDING: Int = 3
115-
116-
/** */
117-
private const val PADDING_START = 8
118135
}
119136
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021-2023 Rick Busarow
2+
* Copyright (C) 2021-2025 Rick Busarow
33
* Licensed under the Apache License, Version 2.0 (the "License");
44
* you may not use this file except in compliance with the License.
55
* You may obtain a copy of the License at
@@ -43,7 +43,6 @@ object TerminalModule {
4343
)
4444
)
4545
}
46-
).also {
47-
it.info.updateTerminalSize()
48-
}
46+
)
47+
.also { it.updateSize() }
4948
}

0 commit comments

Comments
 (0)