Skip to content

Commit 3a765d5

Browse files
RBusarowkodiakhq[bot]
RBusarow
authored and
kodiakhq[bot]
committed
Use Mordant for table outputs
1 parent 925be15 commit 3a765d5

49 files changed

Lines changed: 1455 additions & 947 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build-logic/conventions/src/main/kotlin/modulecheck/builds/TestConventionPlugin.kt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ abstract class TestConventionPlugin : Plugin<Project> {
2727

2828
override fun apply(target: Project) {
2929
target.tasks.withType(Test::class.java).configureEach { task ->
30-
task.maxHeapSize = "1g"
30+
3131
task.useJUnitPlatform()
3232

3333
task.testLogging {
@@ -50,7 +50,7 @@ abstract class TestConventionPlugin : Plugin<Project> {
5050
val ci = System.getenv("CI")?.toBoolean() == true
5151
if (ci) {
5252
// defaults to 512m.
53-
// task.maxHeapSize = "512m"
53+
task.maxHeapSize = "1g"
5454
// Allow JUnit4 tests to run in parallel
5555
task.maxParallelForks = Runtime.getRuntime().availableProcessors() / 2
5656
} else {
@@ -66,9 +66,6 @@ abstract class TestConventionPlugin : Plugin<Project> {
6666
"junit.jupiter.displayname.generator.default" to
6767
"org.junit.jupiter.api.DisplayNameGenerator\$Simple",
6868

69-
// single class instance for all tests
70-
"junit.jupiter.testinstance.lifecycle.default" to "per_class",
71-
7269
// https://junit.org/junit5/docs/snapshot/user-guide/#writing-tests-parallel-execution-config-properties
7370
// Allow unit tests to run in parallel
7471
"junit.jupiter.execution.parallel.enabled" to true,

‎dependency-guard-aggregate.txt‎

Lines changed: 231 additions & 30 deletions
Large diffs are not rendered by default.

‎detekt/detekt-baseline.xml‎

Lines changed: 0 additions & 70 deletions
Large diffs are not rendered by default.

‎gradle/libs.versions.toml‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,10 @@ kotlin = "1.8.22"
99
google-ksp = "1.8.22-1.0.11"
1010
square-anvil = "2.4.6"
1111

12-
androidTools = "8.0.2"
12+
ajalt-clikt = "4.0.0"
13+
ajalt-mordant = "2.0.0"
1314

14-
androidx-compose = "1.1.0-alpha04"
15-
androidx-fragment = "1.3.6"
16-
androidx-lifecycle = "2.3.1"
17-
androidx-navigation = "2.4.0-alpha09"
18-
androidx-paging = "3.0.1"
19-
androidx-room = "2.4.0-alpha04"
20-
androidx-startup = "1.1.0"
21-
androidx-test-espresso = "3.4.0"
22-
androidx-test = "1.4.0"
23-
androidx-work = "2.6.0"
15+
androidTools = "8.0.2"
2416

2517
antlr = "4.13.0"
2618
autoManifest = "2.0"
@@ -30,7 +22,6 @@ benManes-versions = "0.47.0"
3022
buildconfig = "4.1.1"
3123
changeTracker = "0.7.4"
3224
classgraph = "4.8.161"
33-
clikt = "4.0.0"
3425
commons-io = "2.13.0"
3526
dependencyAnalysis = "1.20.0"
3627
detekt = "1.23.0"
@@ -131,7 +122,9 @@ buildconfig = { module = "com.github.gmazzo.buildconfig:plugin", version.ref = "
131122

132123
classgraph = { module = "io.github.classgraph:classgraph", version.ref = "classgraph" }
133124

134-
clikt = { module = "com.github.ajalt.clikt:clikt", version.ref = "clikt" }
125+
ajalt-clikt = { module = "com.github.ajalt.clikt:clikt", version.ref = "ajalt-clikt" }
126+
127+
ajalt-mordant = { module = "com.github.ajalt.mordant:mordant", version.ref = "ajalt-mordant" }
135128

136129
commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }
137130

‎modulecheck-core/src/test/kotlin/modulecheck/core/ConsoleReportingTest.kt‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ internal class ConsoleReportingTest : RunnerTest() {
6161
logger.collectReport()
6262
.joinToString()
6363
.clean()
64-
.remove("\u200B") shouldBe """
65-
:lib1
66-
configuration dependency name source build file
67-
X com.google.dagger:dagger-compiler use-anvil-factory-generation /lib1/build.gradle.kts:
68-
69-
ModuleCheck found 1 issue
70-
"""
64+
.remove("\u200B") shouldBeNoTrimIndent """
65+
| :lib1
66+
| configuration dependency name source build file
67+
| X com.google.dagger:dagger-compiler use-anvil-factory-generation /lib1/build.gradle.kts:
68+
|
69+
|ModuleCheck found 1 issue
70+
""".trimMargin()
7171
}
7272

7373
@Test
@@ -94,17 +94,17 @@ internal class ConsoleReportingTest : RunnerTest() {
9494
logger.collectReport()
9595
.joinToString()
9696
.clean()
97-
.remove("\u200B") shouldBe """
98-
:lib1
99-
configuration dependency name source build file
100-
X com.google.dagger:dagger-compiler use-anvil-factory-generation /lib1/build.gradle.kts:
101-
102-
:lib2
103-
configuration dependency name source build file
104-
X com.google.dagger:dagger-compiler use-anvil-factory-generation /lib2/build.gradle.kts:
105-
106-
ModuleCheck found 2 issues
107-
"""
97+
.remove("\u200B") shouldBeNoTrimIndent """
98+
| :lib1
99+
| configuration dependency name source build file
100+
| X com.google.dagger:dagger-compiler use-anvil-factory-generation /lib1/build.gradle.kts:
101+
|
102+
| :lib2
103+
| configuration dependency name source build file
104+
| X com.google.dagger:dagger-compiler use-anvil-factory-generation /lib2/build.gradle.kts:
105+
|
106+
|ModuleCheck found 2 issues
107+
""".trimMargin()
108108
}
109109

110110
@Test

‎modulecheck-core/src/test/kotlin/modulecheck/core/TextReportingTest.kt‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import modulecheck.finding.FindingName
2222
import modulecheck.model.dependency.ProjectPath.StringProjectPath
2323
import modulecheck.runtime.test.RunnerTest
2424
import modulecheck.runtime.test.RunnerTestEnvironment
25-
import modulecheck.utils.remove
2625
import org.junit.jupiter.api.Test
2726
import java.io.File
2827

@@ -108,11 +107,10 @@ internal class TextReportingTest : RunnerTest() {
108107
).isSuccess shouldBe true
109108

110109
outputFile.readText()
111-
.clean()
112-
.remove("\u200B") shouldBe """
113-
:dependentPath
114-
configuration dependency name source build file
115-
✔ configurationName dependencyIdentifier use-anvil-factory-generation sourceOrNull buildFile: (1, 2):
116-
"""
110+
.clean() shouldBeNoTrimIndent """
111+
| :dependentPath
112+
| configuration dependency name source build file
113+
| ✔ configurationName dependencyIdentifier use-anvil-factory-generation sourceOrNull buildFile: (1, 2):
114+
""".trimMargin()
117115
}
118116
}

‎modulecheck-dagger/src/main/kotlin/modulecheck/dagger/typealias.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@ typealias DaggerSet<T> = Set<@JvmSuppressWildcards T>
2828
* @since 0.12.0
2929
*/
3030
typealias DaggerList<T> = List<@JvmSuppressWildcards T>
31+
32+
/** shorthand for `dagger.Lazy<@JvmSuppressWildcards T>` */
33+
typealias DaggerLazy<T> = dagger.Lazy<@JvmSuppressWildcards T>

‎modulecheck-finding/name/src/main/kotlin/modulecheck/finding/FindingName.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ data class FindingName(
107107
}
108108

109109
if (migrated != null) {
110-
logger.printWarningLine(
110+
logger.warning(
111111
"The suppressed issue `$legacyID` is using a deprecated ID. " +
112112
"The new name for this issue is `$migrated`."
113113
)

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,28 +93,20 @@ public final class modulecheck/gradle/ChecksExtension_Factory : dagger/internal/
9393
}
9494

9595
public final class modulecheck/gradle/GradleMcLogger : modulecheck/reporting/logging/McLogger {
96-
public fun <init> (Lorg/gradle/api/Project;)V
97-
public fun printFailure (Ljava/lang/String;)V
98-
public fun printFailureHeader (Ljava/lang/String;)V
99-
public fun printFailureLine (Ljava/lang/String;)V
100-
public fun printHeader (Ljava/lang/String;)V
101-
public fun printHeaderLine (Ljava/lang/String;)V
102-
public fun printInfo (Ljava/lang/String;)V
103-
public fun printInfoLine (Ljava/lang/String;)V
96+
public fun <init> (Lcom/github/ajalt/mordant/terminal/Terminal;)V
97+
public fun failure (Ljava/lang/String;)V
98+
public fun info (Ljava/lang/String;)V
10499
public fun printReport (Lmodulecheck/reporting/logging/Report;)V
105-
public fun printSuccess (Ljava/lang/String;)V
106-
public fun printSuccessHeader (Ljava/lang/String;)V
107-
public fun printSuccessLine (Ljava/lang/String;)V
108-
public fun printWarning (Ljava/lang/String;)V
109-
public fun printWarningLine (Ljava/lang/String;)V
100+
public fun success (Ljava/lang/String;)V
101+
public fun warning (Ljava/lang/String;)V
110102
}
111103

112104
public final class modulecheck/gradle/GradleMcLogger_Factory : dagger/internal/Factory {
113105
public fun <init> (Ljavax/inject/Provider;)V
114106
public static fun create (Ljavax/inject/Provider;)Lmodulecheck/gradle/GradleMcLogger_Factory;
115107
public synthetic fun get ()Ljava/lang/Object;
116108
public fun get ()Lmodulecheck/gradle/GradleMcLogger;
117-
public static fun newInstance (Lorg/gradle/api/Project;)Lmodulecheck/gradle/GradleMcLogger;
109+
public static fun newInstance (Lcom/github/ajalt/mordant/terminal/Terminal;)Lmodulecheck/gradle/GradleMcLogger;
118110
}
119111

120112
public class modulecheck/gradle/ModuleCheckExtension : modulecheck/config/ModuleCheckSettings {

‎modulecheck-gradle/plugin/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ dependencies {
118118
compileOnly(libs.kotlin.gradle.plugin.api)
119119
compileOnly(libs.square.anvil.gradle)
120120

121+
implementation(libs.ajalt.mordant)
121122
implementation(libs.google.dagger.api)
122123
implementation(libs.semVer)
123124

@@ -146,6 +147,7 @@ dependencies {
146147
"integrationTestImplementation"(project(path = ":modulecheck-parsing:gradle:model:impl-typesafe"))
147148
"integrationTestImplementation"(project(path = ":modulecheck-parsing:kotlin-compiler:impl"))
148149
"integrationTestImplementation"(project(path = ":modulecheck-parsing:wiring"))
150+
"integrationTestImplementation"(project(path = ":modulecheck-reporting:logging:api"))
149151
"integrationTestImplementation"(project(path = ":modulecheck-rule:api"))
150152
"integrationTestImplementation"(project(path = ":modulecheck-rule:impl"))
151153
"integrationTestImplementation"(project(path = ":modulecheck-rule:impl-factory"))

0 commit comments

Comments
 (0)