diff --git a/build-logic/mcbuild/src/main/kotlin/mcbuild.ktlint.gradle.kts b/build-logic/mcbuild/src/main/kotlin/mcbuild.ktlint.gradle.kts index 5e104d7dfe..a2bdd7894e 100644 --- a/build-logic/mcbuild/src/main/kotlin/mcbuild.ktlint.gradle.kts +++ b/build-logic/mcbuild/src/main/kotlin/mcbuild.ktlint.gradle.kts @@ -21,7 +21,7 @@ plugins { extensions.configure(KtlintExtension::class.java) { debug.set(false) - version.set("0.43.2") + version.set("0.44.0") outputToConsole.set(true) disabledRules.set( setOf( diff --git a/modulecheck-api/src/main/kotlin/modulecheck/api/KaptMatcher.kt b/modulecheck-api/src/main/kotlin/modulecheck/api/KaptMatcher.kt index 9b91265196..e48e5cfe75 100644 --- a/modulecheck-api/src/main/kotlin/modulecheck/api/KaptMatcher.kt +++ b/modulecheck-api/src/main/kotlin/modulecheck/api/KaptMatcher.kt @@ -39,7 +39,8 @@ data class KaptMatcher( | name='$name', | processor='$processor', | annotationImports=${annotationImports.joinToString("\n ", "\n ")} - |)""".trimMargin() + |) + """.trimMargin() } } diff --git a/modulecheck-core/src/main/kotlin/modulecheck/core/MustBeApiFinding.kt b/modulecheck-core/src/main/kotlin/modulecheck/core/MustBeApiFinding.kt index d3fdf56454..fe9165ab1e 100644 --- a/modulecheck-core/src/main/kotlin/modulecheck/core/MustBeApiFinding.kt +++ b/modulecheck-core/src/main/kotlin/modulecheck/core/MustBeApiFinding.kt @@ -80,6 +80,7 @@ data class MustBeApiFinding( | configurationName=$configurationName, | source=$source, | dependencyIdentifier='$dependencyIdentifier' - |)""".trimMargin() + |) + """.trimMargin() } } diff --git a/modulecheck-core/src/test/kotlin/modulecheck/core/CheckstyleReportingTest.kt b/modulecheck-core/src/test/kotlin/modulecheck/core/CheckstyleReportingTest.kt index 84be7c8f5b..a025ff169a 100644 --- a/modulecheck-core/src/test/kotlin/modulecheck/core/CheckstyleReportingTest.kt +++ b/modulecheck-core/src/test/kotlin/modulecheck/core/CheckstyleReportingTest.kt @@ -114,6 +114,6 @@ internal class CheckstyleReportingTest : RunnerTest() { -""" + """ } } diff --git a/modulecheck-core/src/test/kotlin/modulecheck/core/DepthOutputTest.kt b/modulecheck-core/src/test/kotlin/modulecheck/core/DepthOutputTest.kt index dd393c481a..25a1d364fe 100644 --- a/modulecheck-core/src/test/kotlin/modulecheck/core/DepthOutputTest.kt +++ b/modulecheck-core/src/test/kotlin/modulecheck/core/DepthOutputTest.kt @@ -60,7 +60,7 @@ internal class DepthOutputTest : RunnerTest() { 2 [:app] ModuleCheck found 0 issues - """ + """ } @Test @@ -108,7 +108,7 @@ internal class DepthOutputTest : RunnerTest() { 0 [:lib1, :lib2] ModuleCheck found 1 issue - """ + """ } @Test @@ -144,7 +144,7 @@ internal class DepthOutputTest : RunnerTest() { 2 [:app] ModuleCheck found 0 issues - """ + """ } @Test @@ -184,6 +184,6 @@ internal class DepthOutputTest : RunnerTest() { 2 [:app, :debug2] ModuleCheck found 0 issues - """ + """ } } diff --git a/modulecheck-core/src/test/kotlin/modulecheck/core/DepthReportTest.kt b/modulecheck-core/src/test/kotlin/modulecheck/core/DepthReportTest.kt index 3935abd453..ea4f28fbc2 100644 --- a/modulecheck-core/src/test/kotlin/modulecheck/core/DepthReportTest.kt +++ b/modulecheck-core/src/test/kotlin/modulecheck/core/DepthReportTest.kt @@ -105,7 +105,7 @@ internal class DepthReportTest : RunnerTest() { source set depth most expensive dependencies main 1 [:lib1] - """ + """ } @Test @@ -156,7 +156,7 @@ internal class DepthReportTest : RunnerTest() { source set depth most expensive dependencies main 1 [:lib1] - """ + """ } @Test @@ -197,7 +197,7 @@ internal class DepthReportTest : RunnerTest() { source set depth most expensive dependencies main 1 [:lib1] - """ + """ } @Test @@ -244,7 +244,7 @@ internal class DepthReportTest : RunnerTest() { source set depth most expensive dependencies main 1 [:lib1] - """ + """ } @Test @@ -333,7 +333,7 @@ internal class DepthReportTest : RunnerTest() { 1 [:app] ModuleCheck found 1 issue - """ + """ outputFile.readText() shouldBe """ -- ModuleCheck Depth results -- @@ -350,7 +350,7 @@ internal class DepthReportTest : RunnerTest() { source set depth most expensive dependencies main 0 [] - """ + """ } @Test @@ -407,6 +407,6 @@ internal class DepthReportTest : RunnerTest() { source set depth most expensive dependencies main 1 [:lib1] - """ + """ } } diff --git a/modulecheck-core/src/test/kotlin/modulecheck/core/DisableAndroidResourcesTest.kt b/modulecheck-core/src/test/kotlin/modulecheck/core/DisableAndroidResourcesTest.kt index 2d9bb1f017..a0f1baf044 100644 --- a/modulecheck-core/src/test/kotlin/modulecheck/core/DisableAndroidResourcesTest.kt +++ b/modulecheck-core/src/test/kotlin/modulecheck/core/DisableAndroidResourcesTest.kt @@ -59,7 +59,7 @@ class DisableAndroidResourcesTest : RunnerTest() { """ | MyApp | - """.trimMargin() + """.trimMargin() ) addSource( "com/modulecheck/lib1/Source.kt", @@ -76,7 +76,8 @@ class DisableAndroidResourcesTest : RunnerTest() { lib1.buildFile.readText() shouldBe """plugins { id("com.android.library") kotlin("android") -}""" +} + """ logger.collectReport() .joinToString() @@ -109,7 +110,7 @@ class DisableAndroidResourcesTest : RunnerTest() { """ | MyApp | - """.trimMargin() + """.trimMargin() ) } @@ -137,7 +138,8 @@ class DisableAndroidResourcesTest : RunnerTest() { android { buildFeatures.viewBinding = true - }""" + } + """ logger.collectReport() .joinToString() @@ -170,7 +172,7 @@ class DisableAndroidResourcesTest : RunnerTest() { id("com.android.library") kotlin("android") } - """ + """ logger.collectReport() .joinToString() @@ -180,7 +182,7 @@ class DisableAndroidResourcesTest : RunnerTest() { X disableAndroidResources /lib1/build.gradle.kts: ModuleCheck found 1 issue - """ + """ } @Test @@ -213,7 +215,8 @@ class DisableAndroidResourcesTest : RunnerTest() { } android { buildFeatures.androidResources = false -}""" +} + """ logger.collectReport() .joinToString() @@ -223,7 +226,7 @@ android { ✔ disableAndroidResources /lib1/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -260,7 +263,8 @@ android { android { mindSdk(21) buildFeatures.androidResources = false - }""" + } + """ logger.collectReport() .joinToString() @@ -270,7 +274,7 @@ android { ✔ disableAndroidResources /lib1/build.gradle.kts: ModuleCheck found 1 issue - """ + """ } @Test @@ -304,7 +308,8 @@ android { buildFeatures { androidResources = false } - }""" + } + """ logger.collectReport() .joinToString() @@ -314,7 +319,7 @@ android { ✔ disableAndroidResources /lib1/build.gradle.kts: ModuleCheck found 1 issue - """ + """ } @Test @@ -351,7 +356,7 @@ android { dependencies { } - """ + """ logger.collectReport() .joinToString() @@ -361,7 +366,7 @@ android { ✔ disableAndroidResources /lib1/build.gradle.kts: ModuleCheck found 1 issue - """ + """ } @Test @@ -392,7 +397,7 @@ android { kotlin("android") } android.buildFeatures.androidResources = false - """ + """ logger.collectReport() .joinToString() @@ -402,7 +407,7 @@ android { ✔ disableAndroidResources /lib1/build.gradle.kts: (5, 1): ModuleCheck found 1 issue - """ + """ } @Test @@ -437,7 +442,7 @@ android { android.buildFeatures { androidResources = false } - """ + """ logger.collectReport() .joinToString() @@ -447,7 +452,7 @@ android { ✔ disableAndroidResources /lib1/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -486,7 +491,7 @@ android { androidResources = false } } - """ + """ logger.collectReport() .joinToString() @@ -526,7 +531,7 @@ android { id("com.android.library") kotlin("android") } - """ + """ logger.collectReport() .joinToString() @@ -558,7 +563,8 @@ android { lib1.buildFile.readText() shouldBe """plugins { id("com.android.library") kotlin("android") -}""" +} + """ logger.collectReport() .joinToString() diff --git a/modulecheck-core/src/test/kotlin/modulecheck/core/DisableViewBindingTest.kt b/modulecheck-core/src/test/kotlin/modulecheck/core/DisableViewBindingTest.kt index 811f2e8f95..e3123f12be 100644 --- a/modulecheck-core/src/test/kotlin/modulecheck/core/DisableViewBindingTest.kt +++ b/modulecheck-core/src/test/kotlin/modulecheck/core/DisableViewBindingTest.kt @@ -72,7 +72,8 @@ class DisableViewBindingTest : RunnerTest() { android:layout_height="match_parent" /> - """ + + """ ) } @@ -102,7 +103,8 @@ class DisableViewBindingTest : RunnerTest() { android { buildFeatures.viewBinding = true - }""" + } + """ logger.collectReport() .joinToString() @@ -145,7 +147,8 @@ class DisableViewBindingTest : RunnerTest() { android:layout_height="match_parent" /> - """ + + """ ) addSource( @@ -170,7 +173,8 @@ class DisableViewBindingTest : RunnerTest() { android { buildFeatures.viewBinding = true - }""" + } + """ logger.collectReport() .joinToString() @@ -215,7 +219,8 @@ class DisableViewBindingTest : RunnerTest() { android:layout_height="match_parent" /> - """ + + """ ) } @@ -229,7 +234,8 @@ class DisableViewBindingTest : RunnerTest() { android { buildFeatures.viewBinding = true - }""" + } + """ logger.collectReport() .joinToString() @@ -272,7 +278,8 @@ class DisableViewBindingTest : RunnerTest() { android:layout_height="match_parent" /> - """ + + """ ) } @@ -286,7 +293,8 @@ class DisableViewBindingTest : RunnerTest() { android { buildFeatures.viewBinding = true - }""" + } + """ logger.collectReport() .joinToString() @@ -332,7 +340,8 @@ class DisableViewBindingTest : RunnerTest() { android { buildFeatures.viewBinding = false - }""" + } + """ logger.collectReport() .joinToString() @@ -342,7 +351,7 @@ class DisableViewBindingTest : RunnerTest() { ✔ disableViewBinding /lib1/build.gradle.kts: (7, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -379,7 +388,8 @@ class DisableViewBindingTest : RunnerTest() { android { mindSdk(21) buildFeatures.viewBinding = false - }""" + } + """ logger.collectReport() .joinToString() @@ -389,7 +399,7 @@ class DisableViewBindingTest : RunnerTest() { ✔ disableViewBinding /lib1/build.gradle.kts: ModuleCheck found 1 issue - """ + """ } @Test @@ -423,7 +433,8 @@ class DisableViewBindingTest : RunnerTest() { buildFeatures { viewBinding = false } - }""" + } + """ logger.collectReport() .joinToString() @@ -433,7 +444,7 @@ class DisableViewBindingTest : RunnerTest() { ✔ disableViewBinding /lib1/build.gradle.kts: ModuleCheck found 1 issue - """ + """ } @Test @@ -470,7 +481,7 @@ class DisableViewBindingTest : RunnerTest() { dependencies { } - """ + """ logger.collectReport() .joinToString() @@ -480,7 +491,7 @@ class DisableViewBindingTest : RunnerTest() { ✔ disableViewBinding /lib1/build.gradle.kts: ModuleCheck found 1 issue - """ + """ } @Test @@ -517,7 +528,8 @@ class DisableViewBindingTest : RunnerTest() { android:layout_height="match_parent" /> - """ + + """ ) } @@ -529,7 +541,8 @@ class DisableViewBindingTest : RunnerTest() { kotlin("android") } - android.buildFeatures.viewBinding = false""" + android.buildFeatures.viewBinding = false + """ logger.collectReport() .joinToString() @@ -539,7 +552,7 @@ class DisableViewBindingTest : RunnerTest() { ✔ disableViewBinding /lib1/build.gradle.kts: (6, 1): ModuleCheck found 1 issue - """ + """ } @Test @@ -580,7 +593,8 @@ class DisableViewBindingTest : RunnerTest() { android:layout_height="match_parent" /> - """ + + """ ) } @@ -596,7 +610,8 @@ class DisableViewBindingTest : RunnerTest() { buildFeatures { viewBinding = false } - }""" + } + """ logger.collectReport() .joinToString() @@ -606,7 +621,7 @@ class DisableViewBindingTest : RunnerTest() { ✔ disableViewBinding /lib1/build.gradle.kts: (8, 5): ModuleCheck found 1 issue - """ + """ } @Test @@ -645,7 +660,8 @@ class DisableViewBindingTest : RunnerTest() { android:layout_height="match_parent" /> - """ + + """ ) } @@ -659,7 +675,8 @@ class DisableViewBindingTest : RunnerTest() { android.buildFeatures { viewBinding = false - }""" + } + """ logger.collectReport() .joinToString() @@ -669,6 +686,6 @@ class DisableViewBindingTest : RunnerTest() { ✔ disableViewBinding /lib1/build.gradle.kts: (7, 3): ModuleCheck found 1 issue - """ + """ } } diff --git a/modulecheck-core/src/test/kotlin/modulecheck/core/GraphVizReportTest.kt b/modulecheck-core/src/test/kotlin/modulecheck/core/GraphVizReportTest.kt index 173b7b5ccf..9d26ddc9f3 100644 --- a/modulecheck-core/src/test/kotlin/modulecheck/core/GraphVizReportTest.kt +++ b/modulecheck-core/src/test/kotlin/modulecheck/core/GraphVizReportTest.kt @@ -112,7 +112,7 @@ internal class GraphVizReportTest : RunnerTest() { {rank = same; ":lib2";} {rank = same; ":app";} } - """ + """ } @Test @@ -148,7 +148,7 @@ internal class GraphVizReportTest : RunnerTest() { {rank = same; ":lib1";} } - """ + """ } @Test @@ -225,7 +225,7 @@ internal class GraphVizReportTest : RunnerTest() { {rank = same; ":lib2";} {rank = same; ":app";} } - """ + """ app.graphFile("test").readText() shouldBe """ strict digraph DependencyGraph { @@ -249,7 +249,7 @@ internal class GraphVizReportTest : RunnerTest() { {rank = same; ":test1";} {rank = same; ":app";} } - """ + """ lib1.graphFile("test").readText() shouldBe """ strict digraph DependencyGraph { @@ -266,7 +266,7 @@ internal class GraphVizReportTest : RunnerTest() { {rank = same; ":lib2";} {rank = same; ":lib1";} } - """ + """ } @Test @@ -321,7 +321,7 @@ internal class GraphVizReportTest : RunnerTest() { {rank = same; ":lib2";} {rank = same; ":app";} } - """ + """ app.graphFile("debug").readText() shouldBe """ strict digraph DependencyGraph { @@ -349,6 +349,6 @@ internal class GraphVizReportTest : RunnerTest() { {rank = same; ":debug2";} {rank = same; ":app";} } - """ + """ } } diff --git a/modulecheck-core/src/test/kotlin/modulecheck/core/InheritedDependenciesTest.kt b/modulecheck-core/src/test/kotlin/modulecheck/core/InheritedDependenciesTest.kt index 0a5ed7cc3e..b79e829067 100644 --- a/modulecheck-core/src/test/kotlin/modulecheck/core/InheritedDependenciesTest.kt +++ b/modulecheck-core/src/test/kotlin/modulecheck/core/InheritedDependenciesTest.kt @@ -117,7 +117,7 @@ class InheritedDependenciesTest : RunnerTest() { dependencies { api(project(path = ":lib2")) } - """ + """ logger.collectReport() .joinToString() @@ -127,7 +127,7 @@ class InheritedDependenciesTest : RunnerTest() { X :lib1 inheritedDependency :lib2 /lib3/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -222,7 +222,7 @@ class InheritedDependenciesTest : RunnerTest() { dependencies { api(project(path = ":lib2")) } - """ + """ } @Test @@ -297,7 +297,7 @@ class InheritedDependenciesTest : RunnerTest() { dependencies { testImplementation(project(path = ":lib1")) } - """ + """ } @Test @@ -384,7 +384,7 @@ class InheritedDependenciesTest : RunnerTest() { api(project(path = ":lib1")) api(project(path = ":lib2")) } - """ + """ logger.collectReport() .joinToString() @@ -394,7 +394,7 @@ class InheritedDependenciesTest : RunnerTest() { ✔ :lib1 inheritedDependency :lib2 /lib3/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -482,7 +482,7 @@ class InheritedDependenciesTest : RunnerTest() { "internalImplementation"(project(path = ":lib1")) "internalApi"(project(path = ":lib2")) } - """ + """ logger.collectReport() .joinToString() @@ -492,7 +492,7 @@ class InheritedDependenciesTest : RunnerTest() { ✔ :lib1 inheritedDependency :lib2 /lib3/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -590,7 +590,7 @@ class InheritedDependenciesTest : RunnerTest() { api(project(path = ":lib1")) api(project(path = ":lib2")) } - """ + """ logger.collectReport() .joinToString() @@ -600,7 +600,7 @@ class InheritedDependenciesTest : RunnerTest() { ✔ :lib1 inheritedDependency :lib2 /lib3/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -697,7 +697,7 @@ class InheritedDependenciesTest : RunnerTest() { "internalImplementation"(project(path = ":lib1")) api(project(path = ":lib2")) } - """ + """ logger.collectReport() .joinToString() @@ -707,7 +707,7 @@ class InheritedDependenciesTest : RunnerTest() { ✔ :lib1 inheritedDependency :lib2 /lib3/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -795,7 +795,7 @@ class InheritedDependenciesTest : RunnerTest() { internalImplementation(project(path = ":lib1")) internalImplementation(project(path = ":lib2")) } - """ + """ logger.collectReport() .joinToString() @@ -805,7 +805,7 @@ class InheritedDependenciesTest : RunnerTest() { ✔ :lib1 inheritedDependency :lib2 /lib3/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -893,7 +893,7 @@ class InheritedDependenciesTest : RunnerTest() { dependencies { implementation(project(path = ":lib2")) } - """ + """ lib2.buildFile.readText() shouldBe """ plugins { @@ -903,7 +903,7 @@ class InheritedDependenciesTest : RunnerTest() { dependencies { testApi(project(path = ":lib1")) } - """ + """ } @Test @@ -990,7 +990,7 @@ class InheritedDependenciesTest : RunnerTest() { implementation(project(path = ":lib1")) implementation(project(path = ":lib2")) } - """ + """ logger.collectReport() .joinToString() @@ -1000,7 +1000,7 @@ class InheritedDependenciesTest : RunnerTest() { ✔ :lib1 inheritedDependency :lib2 /lib3/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -1087,7 +1087,7 @@ class InheritedDependenciesTest : RunnerTest() { api(project(path = ":lib1")) implementation(project(path = ":lib2")) } - """ + """ logger.collectReport() .joinToString() @@ -1097,7 +1097,7 @@ class InheritedDependenciesTest : RunnerTest() { ✔ :lib1 inheritedDependency :lib2 /lib3/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -1214,7 +1214,7 @@ class InheritedDependenciesTest : RunnerTest() { testImplementation(project(path = ":lib2")) testImplementation(project(path = ":lib3")) } - """ + """ logger.collectReport() .joinToString() @@ -1230,7 +1230,7 @@ class InheritedDependenciesTest : RunnerTest() { ✔ :lib2 inheritedDependency :lib3 /lib4/build.gradle.kts: (6, 3): ModuleCheck found 4 issues - """ + """ } @Test @@ -1331,7 +1331,7 @@ class InheritedDependenciesTest : RunnerTest() { testImplementation(testFixtures(project(path = ":lib1"))) testImplementation(testFixtures(project(path = ":lib2"))) } - """ + """ logger.collectReport() .joinToString() @@ -1341,7 +1341,7 @@ class InheritedDependenciesTest : RunnerTest() { ✔ :lib1 inheritedDependency :lib2 /lib3/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -1431,7 +1431,7 @@ class InheritedDependenciesTest : RunnerTest() { testImplementation(testFixtures(project(path = ":lib1"))) testImplementation(testFixtures(project(path = ":lib2"))) } - """ + """ logger.collectReport() .joinToString() @@ -1441,7 +1441,7 @@ class InheritedDependenciesTest : RunnerTest() { ✔ :lib1 inheritedDependency :lib2 /lib3/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -1531,7 +1531,7 @@ class InheritedDependenciesTest : RunnerTest() { testImplementation(testFixtures(project(path = ":lib1"))) testImplementation(testFixtures(project(path = ":lib2"))) } - """ + """ logger.collectReport() .joinToString() @@ -1546,7 +1546,7 @@ class InheritedDependenciesTest : RunnerTest() { ✔ :lib1 inheritedDependency :lib2 /lib3/build.gradle.kts: (6, 3): ModuleCheck found 3 issues - """ + """ } @Test @@ -1635,7 +1635,7 @@ class InheritedDependenciesTest : RunnerTest() { testImplementation(project(path = ":lib1")) testImplementation(testFixtures(project(path = ":lib2"))) } - """ + """ logger.collectReport() .joinToString() @@ -1645,7 +1645,7 @@ class InheritedDependenciesTest : RunnerTest() { ✔ :lib1 inheritedDependency :lib2 /lib3/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -1718,7 +1718,7 @@ class InheritedDependenciesTest : RunnerTest() { testImplementation(project(path = ":lib1")) testImplementation(testFixtures(project(path = ":lib1"))) } - """ + """ logger.collectReport() .joinToString() @@ -1728,7 +1728,7 @@ class InheritedDependenciesTest : RunnerTest() { ✔ :lib1 inheritedDependency /lib2/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -1801,7 +1801,7 @@ class InheritedDependenciesTest : RunnerTest() { api(project(path = ":lib1")) api(testFixtures(project(path = ":lib1"))) } - """ + """ logger.collectReport() .joinToString() @@ -1812,7 +1812,7 @@ class InheritedDependenciesTest : RunnerTest() { ✔ :lib1 mustBeApi /lib2/build.gradle.kts: (6, 3): ModuleCheck found 2 issues - """ + """ } @Test @@ -1872,7 +1872,7 @@ class InheritedDependenciesTest : RunnerTest() { dependencies { testImplementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -1967,7 +1967,7 @@ class InheritedDependenciesTest : RunnerTest() { testImplementation(project(path = ":lib1")) testImplementation(project(path = ":lib2")) } - """ + """ logger.collectReport() .joinToString() diff --git a/modulecheck-core/src/test/kotlin/modulecheck/core/MustBeApiTest.kt b/modulecheck-core/src/test/kotlin/modulecheck/core/MustBeApiTest.kt index 425e7ca84e..7b93cb7a30 100644 --- a/modulecheck-core/src/test/kotlin/modulecheck/core/MustBeApiTest.kt +++ b/modulecheck-core/src/test/kotlin/modulecheck/core/MustBeApiTest.kt @@ -89,7 +89,7 @@ class MustBeApiTest : RunnerTest() { dependencies { implementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -99,7 +99,7 @@ class MustBeApiTest : RunnerTest() { X :lib1 mustBeApi /lib2/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -158,7 +158,7 @@ class MustBeApiTest : RunnerTest() { dependencies { implementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -168,7 +168,7 @@ class MustBeApiTest : RunnerTest() { X :lib1 mustBeApi /lib2/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -227,7 +227,7 @@ class MustBeApiTest : RunnerTest() { dependencies { api(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -237,7 +237,7 @@ class MustBeApiTest : RunnerTest() { ✔ :lib1 mustBeApi /lib2/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -296,7 +296,7 @@ class MustBeApiTest : RunnerTest() { dependencies { implementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -361,7 +361,7 @@ class MustBeApiTest : RunnerTest() { dependencies { implementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -424,7 +424,7 @@ class MustBeApiTest : RunnerTest() { dependencies { implementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -488,7 +488,7 @@ class MustBeApiTest : RunnerTest() { dependencies { testImplementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -553,7 +553,7 @@ class MustBeApiTest : RunnerTest() { dependencies { implementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -616,7 +616,7 @@ class MustBeApiTest : RunnerTest() { dependencies { api(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -626,7 +626,7 @@ class MustBeApiTest : RunnerTest() { ✔ :lib1 mustBeApi /lib2/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -689,7 +689,7 @@ class MustBeApiTest : RunnerTest() { // implementation can be the beginning of the comment api(project(path = ":implementation")) // it's an implementation } - """ + """ logger.collectReport() .joinToString() @@ -699,7 +699,7 @@ class MustBeApiTest : RunnerTest() { ✔ :implementation mustBeApi /lib2/build.gradle.kts: (8, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -758,7 +758,7 @@ class MustBeApiTest : RunnerTest() { dependencies { implementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -821,7 +821,7 @@ class MustBeApiTest : RunnerTest() { dependencies { api(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -831,7 +831,7 @@ class MustBeApiTest : RunnerTest() { ✔ :lib1 mustBeApi /lib2/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -890,7 +890,7 @@ class MustBeApiTest : RunnerTest() { dependencies { implementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -953,7 +953,7 @@ class MustBeApiTest : RunnerTest() { dependencies { api(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -963,7 +963,7 @@ class MustBeApiTest : RunnerTest() { ✔ :lib1 mustBeApi /lib2/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -1022,7 +1022,7 @@ class MustBeApiTest : RunnerTest() { dependencies { api(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -1032,7 +1032,7 @@ class MustBeApiTest : RunnerTest() { ✔ :lib1 mustBeApi /lib2/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -1091,7 +1091,7 @@ class MustBeApiTest : RunnerTest() { dependencies { api(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -1101,7 +1101,7 @@ class MustBeApiTest : RunnerTest() { ✔ :lib1 mustBeApi /lib2/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -1158,7 +1158,7 @@ class MustBeApiTest : RunnerTest() { dependencies { api(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -1168,7 +1168,7 @@ class MustBeApiTest : RunnerTest() { ✔ :lib1 mustBeApi /lib2/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -1243,7 +1243,7 @@ class MustBeApiTest : RunnerTest() { api(project(path = ":lib1")) api(project(path = ":lib3")) } - """ + """ logger.collectReport() .joinToString() @@ -1254,7 +1254,7 @@ class MustBeApiTest : RunnerTest() { ✔ :lib3 mustBeApi /lib2/build.gradle.kts: (7, 3): ModuleCheck found 2 issues - """ + """ } @Test @@ -1328,7 +1328,7 @@ class MustBeApiTest : RunnerTest() { api(project(path = ":lib1")) api(project(path = ":lib3")) } - """ + """ logger.collectReport() .joinToString() @@ -1339,7 +1339,7 @@ class MustBeApiTest : RunnerTest() { ✔ :lib3 mustBeApi /lib2/build.gradle.kts: (7, 3): ModuleCheck found 2 issues - """ + """ } @Test @@ -1414,7 +1414,7 @@ class MustBeApiTest : RunnerTest() { api(project(path = ":lib1")) api(project(path = ":lib3")) } - """ + """ logger.collectReport() .joinToString() @@ -1425,7 +1425,7 @@ class MustBeApiTest : RunnerTest() { ✔ :lib3 mustBeApi /lib2/build.gradle.kts: (7, 3): ModuleCheck found 2 issues - """ + """ } @Test @@ -1500,7 +1500,7 @@ class MustBeApiTest : RunnerTest() { api(project(path = ":lib1")) api(project(path = ":lib3")) } - """ + """ logger.collectReport() .joinToString() @@ -1511,7 +1511,7 @@ class MustBeApiTest : RunnerTest() { ✔ :lib3 mustBeApi /lib2/build.gradle.kts: (7, 3): ModuleCheck found 2 issues - """ + """ } @Test @@ -1585,7 +1585,7 @@ class MustBeApiTest : RunnerTest() { api(project(path = ":lib1")) api(project(path = ":lib3")) } - """ + """ logger.collectReport() .joinToString() @@ -1596,7 +1596,7 @@ class MustBeApiTest : RunnerTest() { ✔ :lib3 mustBeApi /lib2/build.gradle.kts: (7, 3): ModuleCheck found 2 issues - """ + """ } @Test @@ -1670,7 +1670,7 @@ class MustBeApiTest : RunnerTest() { api(project(path = ":lib1")) api(project(path = ":lib3")) } - """ + """ logger.collectReport() .joinToString() @@ -1681,6 +1681,6 @@ class MustBeApiTest : RunnerTest() { ✔ :lib3 mustBeApi /lib2/build.gradle.kts: (7, 3): ModuleCheck found 2 issues - """ + """ } } diff --git a/modulecheck-core/src/test/kotlin/modulecheck/core/OverShotDependenciesTest.kt b/modulecheck-core/src/test/kotlin/modulecheck/core/OverShotDependenciesTest.kt index 15c8bbfb1a..50af20ca62 100644 --- a/modulecheck-core/src/test/kotlin/modulecheck/core/OverShotDependenciesTest.kt +++ b/modulecheck-core/src/test/kotlin/modulecheck/core/OverShotDependenciesTest.kt @@ -89,7 +89,7 @@ class OverShotDependenciesTest : RunnerTest() { dependencies { api(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -100,7 +100,7 @@ class OverShotDependenciesTest : RunnerTest() { X :lib1 unusedDependency /lib2/build.gradle.kts: (6, 3): ModuleCheck found 2 issues - """ + """ } @Test @@ -159,7 +159,7 @@ class OverShotDependenciesTest : RunnerTest() { dependencies { implementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -170,7 +170,7 @@ class OverShotDependenciesTest : RunnerTest() { X :lib1 unusedDependency /lib2/build.gradle.kts: (6, 3): ModuleCheck found 2 issues - """ + """ } @Test @@ -230,7 +230,7 @@ class OverShotDependenciesTest : RunnerTest() { // api(project(path = ":lib1")) // ModuleCheck finding [unusedDependency] testImplementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -241,7 +241,7 @@ class OverShotDependenciesTest : RunnerTest() { ✔ :lib1 unusedDependency /lib2/build.gradle.kts: (6, 3): ModuleCheck found 2 issues - """ + """ } @Test @@ -301,7 +301,7 @@ class OverShotDependenciesTest : RunnerTest() { // implementation(project(path = ":lib1")) // ModuleCheck finding [unusedDependency] debugImplementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -312,7 +312,7 @@ class OverShotDependenciesTest : RunnerTest() { ✔ :lib1 unusedDependency /lib2/build.gradle.kts: (6, 3): ModuleCheck found 2 issues - """ + """ } @Test @@ -372,7 +372,7 @@ class OverShotDependenciesTest : RunnerTest() { // implementation(project(path = ":lib1")) // ModuleCheck finding [unusedDependency] "debugImplementation"(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -383,7 +383,7 @@ class OverShotDependenciesTest : RunnerTest() { ✔ :lib1 unusedDependency /lib2/build.gradle.kts: (6, 3): ModuleCheck found 2 issues - """ + """ } @Test @@ -464,7 +464,7 @@ class OverShotDependenciesTest : RunnerTest() { testImplementation(testFixtures(project(path = ":lib2"))) testImplementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -475,7 +475,7 @@ class OverShotDependenciesTest : RunnerTest() { ✔ :lib1 unusedDependency /lib3/build.gradle.kts: (6, 3): ModuleCheck found 2 issues - """ + """ } @Test @@ -564,7 +564,7 @@ class OverShotDependenciesTest : RunnerTest() { because("this is a test") } } - """ + """ logger.collectReport() .joinToString() @@ -575,7 +575,7 @@ class OverShotDependenciesTest : RunnerTest() { ✔ :lib1 unusedDependency /lib3/build.gradle.kts: (7, 3): ModuleCheck found 2 issues - """ + """ } @Test @@ -657,7 +657,7 @@ class OverShotDependenciesTest : RunnerTest() { testImplementation(testFixtures(project(path = ":lib2"))) testImplementation(testFixtures(project(path = ":lib1"))) } - """ + """ logger.collectReport() .joinToString() @@ -668,6 +668,6 @@ class OverShotDependenciesTest : RunnerTest() { ✔ :lib1 unusedDependency /lib3/build.gradle.kts: (6, 3): ModuleCheck found 2 issues - """ + """ } } diff --git a/modulecheck-core/src/test/kotlin/modulecheck/core/SortDependenciesTest.kt b/modulecheck-core/src/test/kotlin/modulecheck/core/SortDependenciesTest.kt index 86c143ff26..c07ba5774a 100644 --- a/modulecheck-core/src/test/kotlin/modulecheck/core/SortDependenciesTest.kt +++ b/modulecheck-core/src/test/kotlin/modulecheck/core/SortDependenciesTest.kt @@ -69,7 +69,7 @@ class SortDependenciesTest : RunnerTest() { implementation(project(path = "lib-9")) api("com.squareup:kotlinpoet:1.7.2") } - """ + """ ) } @@ -102,7 +102,7 @@ class SortDependenciesTest : RunnerTest() { testImplementation(project(path = "lib-5")) testImplementation(project(path = "lib-8")) } - """ + """ logger.collectReport() .joinToString() @@ -138,7 +138,7 @@ class SortDependenciesTest : RunnerTest() { runtimeOnly(project(path = "lib-1")) api(project(path = "lib-3")) } - """ + """ ) } @@ -158,7 +158,7 @@ class SortDependenciesTest : RunnerTest() { */ runtimeOnly(project(path = "lib-1")) } - """ + """ logger.collectReport() .joinToString() @@ -194,7 +194,7 @@ class SortDependenciesTest : RunnerTest() { runtimeOnly(project(path = "lib-1")) api(project(path = "lib-3")) } - """ + """ ) } @@ -214,7 +214,7 @@ class SortDependenciesTest : RunnerTest() { */ runtimeOnly(project(path = "lib-1")) } - """ + """ logger.collectReport() .joinToString() @@ -248,7 +248,7 @@ class SortDependenciesTest : RunnerTest() { runtimeOnly(project(path = "lib-1")) api(project(path = "lib-3")) } - """ + """ ) } @@ -266,7 +266,7 @@ class SortDependenciesTest : RunnerTest() { // preceding comment runtimeOnly(project(path = "lib-1")) } - """ + """ logger.collectReport() .joinToString() @@ -299,7 +299,7 @@ class SortDependenciesTest : RunnerTest() { runtimeOnly(project(path = "lib-1")) // trailing comment api(project(path = "lib-3")) } - """ + """ ) } @@ -316,7 +316,7 @@ class SortDependenciesTest : RunnerTest() { runtimeOnly(project(path = "lib-1")) // trailing comment } - """ + """ logger.collectReport() .joinToString() @@ -359,7 +359,7 @@ class SortDependenciesTest : RunnerTest() { implementation(project(path = "lib-9")) api("com.squareup:kotlinpoet:1.7.2") } - """ + """ ) } @@ -392,7 +392,7 @@ class SortDependenciesTest : RunnerTest() { testImplementation(project(path = "lib-5")) testImplementation(project(path = "lib-8")) } - """ + """ logger.collectReport() .joinToString() @@ -434,7 +434,7 @@ class SortDependenciesTest : RunnerTest() { testImplementation(project(path = "lib-5")) testImplementation(project(path = "lib-8")) } - """ + """ logger.collectReport() .joinToString() @@ -475,7 +475,7 @@ class SortDependenciesTest : RunnerTest() { implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2' api 'com.squareup:kotlinpoet:1.7.2' } - """ + """ ) } @@ -508,7 +508,7 @@ class SortDependenciesTest : RunnerTest() { testImplementation project(path = "lib-5") testImplementation project(path = "lib-8") } - """ + """ logger.collectReport() .joinToString() @@ -546,7 +546,7 @@ class SortDependenciesTest : RunnerTest() { runtimeOnly project(path = "lib-1") api project(path = "lib-3") } - """ + """ ) } @@ -566,7 +566,7 @@ class SortDependenciesTest : RunnerTest() { */ runtimeOnly project(path = "lib-1") } - """ + """ logger.collectReport() .joinToString() @@ -604,7 +604,7 @@ class SortDependenciesTest : RunnerTest() { runtimeOnly project(path = "lib-1") api project(path = "lib-3") } - """ + """ ) } @@ -624,7 +624,7 @@ class SortDependenciesTest : RunnerTest() { */ runtimeOnly project(path = "lib-1") } - """ + """ logger.collectReport() .joinToString() @@ -660,7 +660,7 @@ class SortDependenciesTest : RunnerTest() { runtimeOnly project(path = "lib-1") api project(path = "lib-3") } - """ + """ ) } @@ -678,7 +678,7 @@ class SortDependenciesTest : RunnerTest() { // preceding comment runtimeOnly project(path = "lib-1") } - """ + """ logger.collectReport() .joinToString() @@ -713,7 +713,7 @@ class SortDependenciesTest : RunnerTest() { runtimeOnly project(path = "lib-1") // trailing comment api project(path = "lib-3") } - """ + """ ) } @@ -730,7 +730,7 @@ class SortDependenciesTest : RunnerTest() { runtimeOnly project(path = "lib-1") // trailing comment } - """ + """ logger.collectReport() .joinToString() @@ -778,7 +778,7 @@ class SortDependenciesTest : RunnerTest() { implementation project(path = "lib-2") testImplementation project(path = "lib-8") } - """ + """ ) } @@ -811,7 +811,7 @@ class SortDependenciesTest : RunnerTest() { testImplementation project(path = "lib-5") testImplementation project(path = "lib-8") } - """ + """ logger.collectReport() .joinToString() @@ -853,7 +853,7 @@ class SortDependenciesTest : RunnerTest() { testImplementation project(path = "lib-5") testImplementation project(path = "lib-8") } - """ + """ logger.collectReport() .joinToString() diff --git a/modulecheck-core/src/test/kotlin/modulecheck/core/SortPluginsTest.kt b/modulecheck-core/src/test/kotlin/modulecheck/core/SortPluginsTest.kt index f990e399ac..a714dc18bf 100644 --- a/modulecheck-core/src/test/kotlin/modulecheck/core/SortPluginsTest.kt +++ b/modulecheck-core/src/test/kotlin/modulecheck/core/SortPluginsTest.kt @@ -53,7 +53,7 @@ class SortPluginsTest : RunnerTest() { javaLibrary kotlin("jvm") } - """ + """ ) } @@ -65,7 +65,7 @@ class SortPluginsTest : RunnerTest() { javaLibrary id("io.gitlab.arturbosch.detekt") version "1.15.0" } - """ + """ logger.collectReport() .joinToString() @@ -94,7 +94,7 @@ class SortPluginsTest : RunnerTest() { javaLibrary kotlin("jvm") } - """ + """ ) } @@ -106,7 +106,7 @@ class SortPluginsTest : RunnerTest() { javaLibrary id("io.gitlab.arturbosch.detekt") version "1.15.0" } - """ + """ logger.collectReport() .joinToString() @@ -127,7 +127,7 @@ class SortPluginsTest : RunnerTest() { javaLibrary id("io.gitlab.arturbosch.detekt") version "1.15.0" } - """ + """ logger.collectReport() .joinToString() @@ -152,7 +152,7 @@ class SortPluginsTest : RunnerTest() { javaLibrary id 'org.jetbrains.kotlin.jvm' } - """ + """ ) } @@ -164,7 +164,7 @@ class SortPluginsTest : RunnerTest() { id 'io.gitlab.arturbosch.detekt' version '1.15.0' id 'org.jetbrains.kotlin.jvm' } - """ + """ logger.collectReport() .joinToString() @@ -195,7 +195,7 @@ class SortPluginsTest : RunnerTest() { javaLibrary id 'org.jetbrains.kotlin.jvm' } - """ + """ ) } @@ -207,7 +207,7 @@ class SortPluginsTest : RunnerTest() { id 'io.gitlab.arturbosch.detekt' version '1.15.0' id 'org.jetbrains.kotlin.jvm' } - """ + """ logger.collectReport() .joinToString() @@ -228,7 +228,7 @@ class SortPluginsTest : RunnerTest() { id 'io.gitlab.arturbosch.detekt' version '1.15.0' id 'org.jetbrains.kotlin.jvm' } - """ + """ logger.collectReport() .joinToString() diff --git a/modulecheck-core/src/test/kotlin/modulecheck/core/TextReportingTest.kt b/modulecheck-core/src/test/kotlin/modulecheck/core/TextReportingTest.kt index 028818bf8f..c70443b1f7 100644 --- a/modulecheck-core/src/test/kotlin/modulecheck/core/TextReportingTest.kt +++ b/modulecheck-core/src/test/kotlin/modulecheck/core/TextReportingTest.kt @@ -112,6 +112,6 @@ internal class TextReportingTest : RunnerTest() { dependentPath dependency name source build file ✔ dependencyPath problemName sourceOrNull buildFile: (1, 2): - """ + """ } } diff --git a/modulecheck-core/src/test/kotlin/modulecheck/core/UnusedDependenciesTest.kt b/modulecheck-core/src/test/kotlin/modulecheck/core/UnusedDependenciesTest.kt index 56c982dff4..8b83465314 100644 --- a/modulecheck-core/src/test/kotlin/modulecheck/core/UnusedDependenciesTest.kt +++ b/modulecheck-core/src/test/kotlin/modulecheck/core/UnusedDependenciesTest.kt @@ -71,7 +71,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { implementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -81,7 +81,7 @@ class UnusedDependenciesTest : RunnerTest() { X :lib1 unusedDependency /lib2/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -120,7 +120,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { // implementation(project(path = ":lib1")) // ModuleCheck finding [unusedDependency] } - """ + """ logger.collectReport() .joinToString() @@ -130,7 +130,7 @@ class UnusedDependenciesTest : RunnerTest() { ✔ :lib1 unusedDependency /lib2/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -170,7 +170,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { } - """ + """ logger.collectReport() .joinToString() @@ -180,7 +180,7 @@ class UnusedDependenciesTest : RunnerTest() { ✔ :lib1 unusedDependency /lib2/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -223,7 +223,7 @@ class UnusedDependenciesTest : RunnerTest() { @Suppress("unusedDependency") implementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -270,7 +270,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { implementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -316,7 +316,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { api(libs.javax.inject) } - """ + """ logger.collectReport() .joinToString() @@ -326,7 +326,7 @@ class UnusedDependenciesTest : RunnerTest() { ✔ :lib1 unusedDependency /lib2/build.gradle.kts: (7, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -366,7 +366,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { } - """ + """ logger.collectReport() .joinToString() @@ -376,7 +376,7 @@ class UnusedDependenciesTest : RunnerTest() { ✔ :lib1 unusedDependency /lib2/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -417,7 +417,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { "implementation"(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -427,7 +427,7 @@ class UnusedDependenciesTest : RunnerTest() { X :lib1 unusedDependency /lib2/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -471,7 +471,7 @@ class UnusedDependenciesTest : RunnerTest() { api(libs.javax.inject) { } } - """ + """ logger.collectReport() .joinToString() @@ -481,7 +481,7 @@ class UnusedDependenciesTest : RunnerTest() { ✔ :lib1 unusedDependency /lib2/build.gradle.kts: (8, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -526,7 +526,7 @@ class UnusedDependenciesTest : RunnerTest() { } // implementation(project(path = ":lib1")) // ModuleCheck finding [unusedDependency] } - """ + """ logger.collectReport() .joinToString() @@ -536,7 +536,7 @@ class UnusedDependenciesTest : RunnerTest() { ✔ :lib1 unusedDependency /lib2/build.gradle.kts: (8, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -583,7 +583,7 @@ class UnusedDependenciesTest : RunnerTest() { fakeConfig(project(path = ":lib1")) // implementation(project(path = ":lib1")) // ModuleCheck finding [unusedDependency] } - """ + """ logger.collectReport() .joinToString() @@ -593,7 +593,7 @@ class UnusedDependenciesTest : RunnerTest() { ✔ :lib1 unusedDependency /lib2/build.gradle.kts: (9, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -655,7 +655,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { testImplementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -723,7 +723,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { androidTestImplementation(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -782,7 +782,8 @@ class UnusedDependenciesTest : RunnerTest() { android:layout_height="match_parent" /> - """ + + """ ) } @@ -797,7 +798,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { api(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -865,7 +866,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { api(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -930,7 +931,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { api(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -997,7 +998,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { testImplementation(testFixtures(project(path = ":lib1"))) } - """ + """ logger.collectReport() .joinToString() @@ -1052,7 +1053,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { // testImplementation(testFixtures(project(path = ":lib1"))) // ModuleCheck finding [unusedDependency] } - """ + """ logger.collectReport() .joinToString() @@ -1062,7 +1063,7 @@ class UnusedDependenciesTest : RunnerTest() { ✔ :lib1 unusedDependency /lib2/build.gradle.kts: (6, 3): ModuleCheck found 1 issue - """ + """ } @Test @@ -1127,7 +1128,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { api(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -1193,7 +1194,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { api(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -1255,7 +1256,7 @@ class UnusedDependenciesTest : RunnerTest() { android:theme="@style/AppTheme" /> - """ + """ ) } @@ -1270,7 +1271,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { api(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() @@ -1342,7 +1343,7 @@ class UnusedDependenciesTest : RunnerTest() { dependencies { api(project(path = ":lib1")) } - """ + """ logger.collectReport() .joinToString() diff --git a/modulecheck-core/src/test/kotlin/modulecheck/core/UnusedKaptProcessorTest.kt b/modulecheck-core/src/test/kotlin/modulecheck/core/UnusedKaptProcessorTest.kt index 75185882fc..d2d317d48d 100644 --- a/modulecheck-core/src/test/kotlin/modulecheck/core/UnusedKaptProcessorTest.kt +++ b/modulecheck-core/src/test/kotlin/modulecheck/core/UnusedKaptProcessorTest.kt @@ -74,7 +74,7 @@ class UnusedKaptProcessorTest : RunnerTest() { dependencies { kapt("$dagger") } - """ + """ logger.collectReport() .joinToString() @@ -85,7 +85,7 @@ class UnusedKaptProcessorTest : RunnerTest() { X com.google.dagger:dagger-compiler unusedKaptProcessor (kapt) /app/build.gradle.kts: (7, 3): ModuleCheck found 2 issues - """ + """ } @Test @@ -126,7 +126,7 @@ class UnusedKaptProcessorTest : RunnerTest() { dependencies { api("$dagger") } - """ + """ logger.collectReport() .joinToString() @@ -181,7 +181,7 @@ class UnusedKaptProcessorTest : RunnerTest() { dependencies { kapt("$dagger") } - """ + """ logger.collectReport() .joinToString() @@ -237,7 +237,7 @@ class UnusedKaptProcessorTest : RunnerTest() { dependencies { kaptTest("$dagger") } - """ + """ logger.collectReport() .joinToString() @@ -282,7 +282,7 @@ class UnusedKaptProcessorTest : RunnerTest() { dependencies { // kapt("com.google.dagger:dagger-compiler:2.40.5") // ModuleCheck finding [unusedKaptProcessor (kapt)] } - """ + """ logger.collectReport() .joinToString() @@ -293,6 +293,6 @@ class UnusedKaptProcessorTest : RunnerTest() { ✔ com.google.dagger:dagger-compiler unusedKaptProcessor (kapt) /app/build.gradle.kts: (7, 3): ModuleCheck found 2 issues - """ + """ } } diff --git a/modulecheck-parsing/groovy-antlr/src/main/kotlin/modulecheck/parsing/groovy/antlr/EverythingPrinter.kt b/modulecheck-parsing/groovy-antlr/src/main/kotlin/modulecheck/parsing/groovy/antlr/EverythingPrinter.kt index e73268b930..02d3b37dc4 100644 --- a/modulecheck-parsing/groovy-antlr/src/main/kotlin/modulecheck/parsing/groovy/antlr/EverythingPrinter.kt +++ b/modulecheck-parsing/groovy-antlr/src/main/kotlin/modulecheck/parsing/groovy/antlr/EverythingPrinter.kt @@ -33,7 +33,7 @@ internal class EverythingPrinter : GroovyParserBaseVisitor() { | |`${tree.text}` | - """.trimMargin() + """.trimMargin() ) super.visit(tree) } @@ -47,7 +47,7 @@ internal class EverythingPrinter : GroovyParserBaseVisitor() { | |`${node.text}` | - """.trimMargin() + """.trimMargin() ) super.visitChildren(node) } @@ -61,7 +61,7 @@ internal class EverythingPrinter : GroovyParserBaseVisitor() { | |`${ctx.text}` | - """.trimMargin() + """.trimMargin() ) super.visitExpression(ctx) } diff --git a/modulecheck-parsing/groovy-antlr/src/test/kotlin/modulecheck/parsing/groovy/antlr/GroovyDependencyBlockParserTest.kt b/modulecheck-parsing/groovy-antlr/src/test/kotlin/modulecheck/parsing/groovy/antlr/GroovyDependencyBlockParserTest.kt index a8df819682..0dda840fc1 100644 --- a/modulecheck-parsing/groovy-antlr/src/test/kotlin/modulecheck/parsing/groovy/antlr/GroovyDependencyBlockParserTest.kt +++ b/modulecheck-parsing/groovy-antlr/src/test/kotlin/modulecheck/parsing/groovy/antlr/GroovyDependencyBlockParserTest.kt @@ -370,7 +370,8 @@ internal class GroovyDependencyBlockParserTest { declarationText = """implementation project(':core:android')""", statementWithSurroundingText = """ // single-line comment - implementation project(':core:android')""" + implementation project(':core:android') + """ ) ) } @@ -401,7 +402,8 @@ internal class GroovyDependencyBlockParserTest { /* block comment */ - implementation project(':core:android')""" + implementation project(':core:android') + """ ) ) } @@ -514,7 +516,8 @@ internal class GroovyDependencyBlockParserTest { |dependencies { | api libs.ktlint |} - |""".trimMargin() + | + """.trimMargin() ).single() block.lambdaContent shouldBe " api libs.ktlint\n" diff --git a/modulecheck-parsing/groovy-antlr/src/test/kotlin/modulecheck/parsing/groovy/antlr/GroovyPluginsBlockParserTest.kt b/modulecheck-parsing/groovy-antlr/src/test/kotlin/modulecheck/parsing/groovy/antlr/GroovyPluginsBlockParserTest.kt index d881ec44fc..5999339fcf 100644 --- a/modulecheck-parsing/groovy-antlr/src/test/kotlin/modulecheck/parsing/groovy/antlr/GroovyPluginsBlockParserTest.kt +++ b/modulecheck-parsing/groovy-antlr/src/test/kotlin/modulecheck/parsing/groovy/antlr/GroovyPluginsBlockParserTest.kt @@ -42,7 +42,8 @@ internal class GroovyPluginsBlockParserTest { PluginDeclaration( declarationText = """id 'com.squareup.anvil' version '2.34.0'""", statementWithSurroundingText = """ // comment - | id 'com.squareup.anvil' version '2.34.0'""".trimMargin() + | id 'com.squareup.anvil' version '2.34.0' + """.trimMargin() ), ) } diff --git a/modulecheck-parsing/java/src/main/kotlin/modulecheck/parsing/java/JavaEverythingPrinter.kt b/modulecheck-parsing/java/src/main/kotlin/modulecheck/parsing/java/JavaEverythingPrinter.kt index 67e9405aa4..94442d826f 100644 --- a/modulecheck-parsing/java/src/main/kotlin/modulecheck/parsing/java/JavaEverythingPrinter.kt +++ b/modulecheck-parsing/java/src/main/kotlin/modulecheck/parsing/java/JavaEverythingPrinter.kt @@ -31,7 +31,7 @@ internal class JavaEverythingPrinter { """ ******************************** -- $thisName -- parent: $parentName |$node |_________________________________________________________________________________ - """.trimMargin() + """.trimMargin() ) node.childNodes.forEach { child -> diff --git a/modulecheck-parsing/java/src/test/kotlin/modulecheck/parsing/java/JavaFileTest.kt b/modulecheck-parsing/java/src/test/kotlin/modulecheck/parsing/java/JavaFileTest.kt index 235500f7df..69b7f9b159 100644 --- a/modulecheck-parsing/java/src/test/kotlin/modulecheck/parsing/java/JavaFileTest.kt +++ b/modulecheck-parsing/java/src/test/kotlin/modulecheck/parsing/java/JavaFileTest.kt @@ -40,7 +40,7 @@ internal class JavaFileTest : package com.test; public enum Color { RED, BLUE } - """ + """ ) file shouldBe javaFile( @@ -62,7 +62,7 @@ internal class JavaFileTest : public class Constants { public enum Color { RED, BLUE } } - """ + """ ) file shouldBe javaFile( @@ -86,7 +86,7 @@ internal class JavaFileTest : public static final int MY_VALUE = 250; } - """ + """ ) file shouldBe javaFile( @@ -112,7 +112,7 @@ internal class JavaFileTest : public static final int MY_VALUE = 250; } } - """ + """ ) file shouldBe javaFile( @@ -135,7 +135,7 @@ internal class JavaFileTest : public static void foo() {} } - """ + """ ) file shouldBe javaFile( @@ -155,7 +155,7 @@ internal class JavaFileTest : import com.lib1.Lib1Class; public static record MyRecord(Lib1Class lib1Class) {} - """, + """, javaVersion = JavaVersion.VERSION_16 ) @@ -182,7 +182,7 @@ internal class JavaFileTest : public Lib1Class foo() { return Lib1Class(); } } - """ + """ ) file shouldBe javaFile( @@ -205,7 +205,7 @@ internal class JavaFileTest : private Lib1Class foo() { return Lib1Class(); } } - """ + """ ) file shouldBe javaFile( @@ -227,7 +227,7 @@ internal class JavaFileTest : Lib1Class foo() { return Lib1Class(); } } - """ + """ ) file shouldBe javaFile( @@ -249,7 +249,7 @@ internal class JavaFileTest : public Lib1Class foo() { return Lib1Class(); } } - """ + """ ) file shouldBe javaFile( @@ -275,7 +275,7 @@ internal class JavaFileTest : public com.lib1.Lib1Class foo() { return Lib1Class(); } } - """ + """ ) file shouldBe javaFile( @@ -303,7 +303,7 @@ internal class JavaFileTest : public List foo() { return null; } } - """ + """ ) file shouldBe javaFile( @@ -326,7 +326,7 @@ internal class JavaFileTest : public List foo() { return null; } } - """ + """ ) file shouldBe javaFile( @@ -350,7 +350,7 @@ internal class JavaFileTest : public List foo() { return null; } } - """ + """ ) file shouldBe javaFile( @@ -373,7 +373,7 @@ internal class JavaFileTest : public List foo() { return null; } } - """ + """ ) file shouldBe javaFile( @@ -397,7 +397,7 @@ internal class JavaFileTest : public List foo(String name) { return null; } } - """ + """ ) file shouldBe javaFile( @@ -421,7 +421,7 @@ internal class JavaFileTest : public Lib1Class lib1Class; } - """ + """ ) file shouldBe javaFile( @@ -458,7 +458,7 @@ internal class JavaFileTest : public Lib1Class lib1Class; } - """ + """ ) file shouldBe javaFile( @@ -483,7 +483,7 @@ internal class JavaFileTest : public List lib1Classes; } - """ + """ ) file shouldBe javaFile( diff --git a/modulecheck-parsing/psi/src/main/kotlin/modulecheck/parsing/psi/PsiEverythingPrinter.kt b/modulecheck-parsing/psi/src/main/kotlin/modulecheck/parsing/psi/PsiEverythingPrinter.kt index a91eb3c779..c2c7ea4d0e 100644 --- a/modulecheck-parsing/psi/src/main/kotlin/modulecheck/parsing/psi/PsiEverythingPrinter.kt +++ b/modulecheck-parsing/psi/src/main/kotlin/modulecheck/parsing/psi/PsiEverythingPrinter.kt @@ -31,7 +31,7 @@ internal fun everythingPrinter() = object : KtTreeVisitorVoid() { """ ******************************** -- $thisName -- parent: $parentName |${element.text} |_________________________________________________________________________________ - """.trimMargin() + """.trimMargin() ) super.visitElement(element) } diff --git a/modulecheck-parsing/psi/src/test/kotlin/modulecheck/parsing/psi/KotlinDependencyBlockParserTest.kt b/modulecheck-parsing/psi/src/test/kotlin/modulecheck/parsing/psi/KotlinDependencyBlockParserTest.kt index a6028e66d0..9b5c74d04c 100644 --- a/modulecheck-parsing/psi/src/test/kotlin/modulecheck/parsing/psi/KotlinDependencyBlockParserTest.kt +++ b/modulecheck-parsing/psi/src/test/kotlin/modulecheck/parsing/psi/KotlinDependencyBlockParserTest.kt @@ -396,7 +396,8 @@ internal class KotlinDependencyBlockParserTest : ProjectTest() { declarationText = """implementation(project(":core:android"))""", statementWithSurroundingText = """ // single-line comment - implementation(project(":core:android"))""" + implementation(project(":core:android")) + """ ) ) } @@ -427,7 +428,8 @@ internal class KotlinDependencyBlockParserTest : ProjectTest() { /* block comment */ - implementation(project(":core:android"))""" + implementation(project(":core:android")) + """ ) ) } @@ -540,7 +542,8 @@ internal class KotlinDependencyBlockParserTest : ProjectTest() { |dependencies { | api(libs.ktlint) |} - |""".trimMargin() + | + """.trimMargin() ).single() block.settings shouldBe listOf( diff --git a/modulecheck-parsing/psi/src/test/kotlin/modulecheck/parsing/psi/KotlinFileTest.kt b/modulecheck-parsing/psi/src/test/kotlin/modulecheck/parsing/psi/KotlinFileTest.kt index b1a4094198..25c5549043 100644 --- a/modulecheck-parsing/psi/src/test/kotlin/modulecheck/parsing/psi/KotlinFileTest.kt +++ b/modulecheck-parsing/psi/src/test/kotlin/modulecheck/parsing/psi/KotlinFileTest.kt @@ -43,7 +43,7 @@ internal class KotlinFileTest : ProjectTest() { class InjectClass @javax.inject.Inject constructor( val lib1Class: Lib1Class ) - """ + """ ) file.constructorInjectedParams.await() shouldBe listOf( @@ -68,7 +68,7 @@ internal class KotlinFileTest : ProjectTest() { this.lib1Class = lib1Class } } - """ + """ ) file.constructorInjectedParams.await() shouldBe listOf( @@ -89,7 +89,7 @@ internal class KotlinFileTest : ProjectTest() { class InjectClass @Inject constructor( val lib1Class: Lib1Class ) - """ + """ ) file.constructorInjectedParams.await() shouldBe listOf( @@ -110,7 +110,7 @@ internal class KotlinFileTest : ProjectTest() { class InjectClass @Inject constructor( val lib1Class: Lib1Class ) - """ + """ ) file.constructorInjectedParams.await() shouldContainExactlyInAnyOrder listOf( @@ -156,7 +156,7 @@ internal class KotlinFileTest : ProjectTest() { this.lib1Class = lib1Class } } - """ + """ ) file.constructorInjectedParams.await() shouldBe listOf( @@ -181,7 +181,7 @@ internal class KotlinFileTest : ProjectTest() { constructor(lib1Class: Lib1Class, other: FqName) : this(lib1Class) } - """ + """ ) file.constructorInjectedParams.await() shouldBe listOf( @@ -205,7 +205,7 @@ internal class KotlinFileTest : ProjectTest() { viewEffect(resourceProvider.getString(R.string.playstore_url)) } } - """ + """ ) file.apiReferences.await() shouldBe listOf("androidx.lifecycle.ViewModel") @@ -227,7 +227,7 @@ internal class KotlinFileTest : ProjectTest() { googleApiKey = getString(R.string.google_places_api_key), ) } - """ + """ ) file.apiReferences.await() shouldBe listOf("com.lib.Config") @@ -247,7 +247,7 @@ internal class KotlinFileTest : ProjectTest() { googleApiKey = getString(R.string.google_places_api_key), ) } - """ + """ ) file.apiReferences.await() shouldBe listOf("com.lib.Config", "com.test.com.lib.Config") @@ -269,7 +269,7 @@ internal class KotlinFileTest : ProjectTest() { googleApiKey = getString(R.string.google_places_api_key), ) } - """ + """ ) file.apiReferences.await() shouldBe setOf() @@ -291,7 +291,7 @@ internal class KotlinFileTest : ProjectTest() { googleApiKey = getString(R.string.google_places_api_key), ) } - """ + """ ) file.apiReferences.await() shouldBe listOf("com.lib.Config") diff --git a/modulecheck-parsing/psi/src/test/kotlin/modulecheck/parsing/psi/KotlinPluginsBlockParserTest.kt b/modulecheck-parsing/psi/src/test/kotlin/modulecheck/parsing/psi/KotlinPluginsBlockParserTest.kt index e56251262d..2044015a49 100644 --- a/modulecheck-parsing/psi/src/test/kotlin/modulecheck/parsing/psi/KotlinPluginsBlockParserTest.kt +++ b/modulecheck-parsing/psi/src/test/kotlin/modulecheck/parsing/psi/KotlinPluginsBlockParserTest.kt @@ -47,7 +47,8 @@ internal class KotlinPluginsBlockParserTest { PluginDeclaration( declarationText = """javaLibrary""", statementWithSurroundingText = """ // comment - | javaLibrary""".trimMargin() + | javaLibrary + """.trimMargin() ), PluginDeclaration( declarationText = """id("io.gitlab.arturbosch.detekt") version "1.15.0"""", diff --git a/modulecheck-plugin/src/main/kotlin/modulecheck/gradle/GradleProjectProvider.kt b/modulecheck-plugin/src/main/kotlin/modulecheck/gradle/GradleProjectProvider.kt index 9d505b9915..78fae9a55e 100644 --- a/modulecheck-plugin/src/main/kotlin/modulecheck/gradle/GradleProjectProvider.kt +++ b/modulecheck-plugin/src/main/kotlin/modulecheck/gradle/GradleProjectProvider.kt @@ -323,7 +323,7 @@ class GradleProjectProvider @AssistedInject constructor( """ModuleCheck only supports a single base package. The following packages are present for module `$path`: | |${it.joinToString("\n")} - """.trimMargin() + """.trimMargin() } } ?.single() diff --git a/modulecheck-plugin/src/test/kotlin/modulecheck/gradle/AnvilScopesTest.kt b/modulecheck-plugin/src/test/kotlin/modulecheck/gradle/AnvilScopesTest.kt index 542798a438..de7a21cc60 100644 --- a/modulecheck-plugin/src/test/kotlin/modulecheck/gradle/AnvilScopesTest.kt +++ b/modulecheck-plugin/src/test/kotlin/modulecheck/gradle/AnvilScopesTest.kt @@ -70,7 +70,8 @@ class AnvilScopesTest : BasePluginTest() { |public class Lib2FooImpl : Foo | |interface Foo - |""".trimMargin() + | + """.trimMargin() ) } ) @@ -97,7 +98,8 @@ class AnvilScopesTest : BasePluginTest() { | |@MergeComponent(Lib1Class::class) |public interface AppComponent - |""".trimMargin() + | + """.trimMargin() ) } ) @@ -135,7 +137,8 @@ class AnvilScopesTest : BasePluginTest() { |public class Lib2FooImpl : Foo | |interface Foo - |""".trimMargin() + | + """.trimMargin() ) } ) @@ -161,7 +164,8 @@ class AnvilScopesTest : BasePluginTest() { | |@MergeComponent(Lib1Class::class) |public interface AppComponent - |""".trimMargin() + | + """.trimMargin() ) } ) @@ -398,6 +402,7 @@ class AnvilScopesTest : BasePluginTest() { dependency name source build file X :lib-2 unusedDependency /app/build.gradle.kts: (8, 3): -ModuleCheck found 1 issue""" +ModuleCheck found 1 issue + """ } } diff --git a/modulecheck-plugin/src/test/kotlin/modulecheck/gradle/DepthReportTaskTest.kt b/modulecheck-plugin/src/test/kotlin/modulecheck/gradle/DepthReportTaskTest.kt index a4d1cab24b..40037aae6a 100644 --- a/modulecheck-plugin/src/test/kotlin/modulecheck/gradle/DepthReportTaskTest.kt +++ b/modulecheck-plugin/src/test/kotlin/modulecheck/gradle/DepthReportTaskTest.kt @@ -118,6 +118,6 @@ internal class DepthReportTaskTest : BasePluginTest() { source set depth most expensive dependencies main 1 [:lib1] - """ + """ } } diff --git a/modulecheck-plugin/src/test/kotlin/modulecheck/gradle/GraphReportTaskTest.kt b/modulecheck-plugin/src/test/kotlin/modulecheck/gradle/GraphReportTaskTest.kt index 07633091f4..7de162e9dd 100644 --- a/modulecheck-plugin/src/test/kotlin/modulecheck/gradle/GraphReportTaskTest.kt +++ b/modulecheck-plugin/src/test/kotlin/modulecheck/gradle/GraphReportTaskTest.kt @@ -125,6 +125,6 @@ internal class GraphReportTaskTest : BasePluginTest() { {rank = same; ":lib2";} {rank = same; ":app";} } - """ + """ } } diff --git a/modulecheck-plugin/src/test/kotlin/modulecheck/gradle/UnusedDependenciesPluginTest.kt b/modulecheck-plugin/src/test/kotlin/modulecheck/gradle/UnusedDependenciesPluginTest.kt index b8aba4ed51..8388ed489c 100644 --- a/modulecheck-plugin/src/test/kotlin/modulecheck/gradle/UnusedDependenciesPluginTest.kt +++ b/modulecheck-plugin/src/test/kotlin/modulecheck/gradle/UnusedDependenciesPluginTest.kt @@ -165,7 +165,7 @@ class UnusedDependenciesPluginTest : BasePluginTest() { RawFile( "AndroidManifest.xml", """ - """.trimMargin() + """.trimMargin() ) ) } @@ -185,7 +185,7 @@ class UnusedDependenciesPluginTest : BasePluginTest() { """ | MyApp | - """.trimMargin() + """.trimMargin() ) ) } @@ -234,7 +234,7 @@ class UnusedDependenciesPluginTest : BasePluginTest() { | .configureEach { dependsOn(makeFile)} | |} - """.trimMargin() + """.trimMargin() ) } ) diff --git a/modulecheck-project/api/src/main/kotlin/modulecheck/project/ConfiguredProjectDependency.kt b/modulecheck-project/api/src/main/kotlin/modulecheck/project/ConfiguredProjectDependency.kt index 4c7a2f7c7d..96c15de5ff 100644 --- a/modulecheck-project/api/src/main/kotlin/modulecheck/project/ConfiguredProjectDependency.kt +++ b/modulecheck-project/api/src/main/kotlin/modulecheck/project/ConfiguredProjectDependency.kt @@ -52,6 +52,7 @@ data class TransitiveProjectDependency( return """TransitiveProjectDependency( | source=$source | contributed=$contributed - |)""".trimMargin() + |) + """.trimMargin() } } diff --git a/modulecheck-reporting/checkstyle/src/test/kotlin/modulecheck/reporting/checkstyle/CheckstyleReporterTest.kt b/modulecheck-reporting/checkstyle/src/test/kotlin/modulecheck/reporting/checkstyle/CheckstyleReporterTest.kt index e10ab1d1aa..6f6a102808 100644 --- a/modulecheck-reporting/checkstyle/src/test/kotlin/modulecheck/reporting/checkstyle/CheckstyleReporterTest.kt +++ b/modulecheck-reporting/checkstyle/src/test/kotlin/modulecheck/reporting/checkstyle/CheckstyleReporterTest.kt @@ -33,7 +33,7 @@ internal class CheckstyleReporterTest { result shouldBe """ -""" + """ } @Test @@ -62,7 +62,7 @@ internal class CheckstyleReporterTest { -""" + """ } @Test @@ -91,7 +91,7 @@ internal class CheckstyleReporterTest { -""" + """ } @Test @@ -144,6 +144,6 @@ internal class CheckstyleReporterTest { -""" + """ } } diff --git a/modulecheck-specs/src/main/kotlin/modulecheck/specs/ProjectBuildSpec.kt b/modulecheck-specs/src/main/kotlin/modulecheck/specs/ProjectBuildSpec.kt index 468d9253a9..15691b0454 100644 --- a/modulecheck-specs/src/main/kotlin/modulecheck/specs/ProjectBuildSpec.kt +++ b/modulecheck-specs/src/main/kotlin/modulecheck/specs/ProjectBuildSpec.kt @@ -123,7 +123,8 @@ public data class ProjectBuildSpec( | } | |} - |""".trimMargin() + | + """.trimMargin() private fun androidBlock() = if (!android) "" else """android { | compileSdkVersion(30) @@ -140,7 +141,8 @@ public data class ProjectBuildSpec( | } |} | - |""".trimMargin() + | + """.trimMargin() private fun dependenciesBlock() = if (dependencies.isEmpty()) "" else buildString { appendLine("dependencies {") diff --git a/modulecheck-specs/src/main/kotlin/modulecheck/specs/ProjectSettingsSpec.kt b/modulecheck-specs/src/main/kotlin/modulecheck/specs/ProjectSettingsSpec.kt index 7314863464..200a5582a0 100644 --- a/modulecheck-specs/src/main/kotlin/modulecheck/specs/ProjectSettingsSpec.kt +++ b/modulecheck-specs/src/main/kotlin/modulecheck/specs/ProjectSettingsSpec.kt @@ -58,7 +58,8 @@ public data class ProjectSettingsSpec( | } |} | - |""".trimMargin() + | + """.trimMargin() private fun typeSafe() = """ |enableFeaturePreview("VERSION_CATALOGS")