Workaround issue with Indentation rule

See this bug in ktlint: pinterest/ktlint#1971
3flex · Apr 23, 2023 · c0ad40e · c0ad40e
1 parent b81fca3
commit c0ad40e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/...-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidSpec.kt b/...-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidSpec.kt
@@ -51,7 +51,7 @@ class DetektAndroidSpec {
             )
         }
         val gradleRunner = createGradleRunnerAndSetupProject(projectLayout).also {
-            it.writeProjectFile("app/src/main/AndroidManifest.xml", manifestContent())
+            it.writeProjectFile("app/src/main/AndroidManifest.xml", manifestContent)
         }
 
         @Test
@@ -127,7 +127,7 @@ class DetektAndroidSpec {
         }
         val gradleRunner = createGradleRunnerAndSetupProject(projectLayout).also {
             it.writeProjectFile("gradle.properties", "detekt.android.disabled=true")
-            it.writeProjectFile("app/src/main/AndroidManifest.xml", manifestContent())
+            it.writeProjectFile("app/src/main/AndroidManifest.xml", manifestContent)
         }
 
         @Test
@@ -177,7 +177,7 @@ class DetektAndroidSpec {
             )
         }
         val gradleRunner = createGradleRunnerAndSetupProject(projectLayout).also {
-            it.writeProjectFile("lib/src/main/AndroidManifest.xml", manifestContent())
+            it.writeProjectFile("lib/src/main/AndroidManifest.xml", manifestContent)
         }
 
         @Test
@@ -271,7 +271,7 @@ class DetektAndroidSpec {
             )
         }
         val gradleRunner = createGradleRunnerAndSetupProject(projectLayout).also {
-            it.writeProjectFile("android_lib/src/main/AndroidManifest.xml", manifestContent())
+            it.writeProjectFile("android_lib/src/main/AndroidManifest.xml", manifestContent)
         }
 
         @Test
@@ -338,7 +338,7 @@ class DetektAndroidSpec {
             )
         }
         val gradleRunner = createGradleRunnerAndSetupProject(projectLayout).also {
-            it.writeProjectFile("lib/src/main/AndroidManifest.xml", manifestContent())
+            it.writeProjectFile("lib/src/main/AndroidManifest.xml", manifestContent)
         }
 
         @Test
@@ -393,7 +393,7 @@ class DetektAndroidSpec {
             )
         }
         val gradleRunner = createGradleRunnerAndSetupProject(projectLayout).also {
-            it.writeProjectFile("lib/src/main/AndroidManifest.xml", manifestContent())
+            it.writeProjectFile("lib/src/main/AndroidManifest.xml", manifestContent)
         }
 
         @Test
@@ -450,7 +450,7 @@ class DetektAndroidSpec {
             )
         }
         val gradleRunner = createGradleRunnerAndSetupProject(projectLayout).also {
-            it.writeProjectFile("lib/src/main/AndroidManifest.xml", manifestContent())
+            it.writeProjectFile("lib/src/main/AndroidManifest.xml", manifestContent)
         }
 
         @Test
@@ -507,7 +507,7 @@ class DetektAndroidSpec {
             )
         }
         val gradleRunner = createGradleRunnerAndSetupProject(projectLayout).also {
-            it.writeProjectFile("lib/src/main/AndroidManifest.xml", manifestContent())
+            it.writeProjectFile("lib/src/main/AndroidManifest.xml", manifestContent)
         }
 
         @Test
@@ -561,7 +561,7 @@ class DetektAndroidSpec {
             val gradleRunner = createGradleRunnerAndSetupProject(projectLayout, dryRun = false).also {
                 it.projectFile("app/src/main/java").mkdirs()
                 it.projectFile("app/src/main/res/layout").mkdirs()
-                it.writeProjectFile("app/src/main/AndroidManifest.xml", manifestContent())
+                it.writeProjectFile("app/src/main/AndroidManifest.xml", manifestContent)
                 it.writeProjectFile("app/src/main/res/layout/activity_sample.xml", SAMPLE_ACTIVITY_LAYOUT)
                 it.writeProjectFile("app/src/main/java/SampleActivity.kt", SAMPLE_ACTIVITY_USING_VIEW_BINDING)
             }
@@ -593,7 +593,7 @@ internal fun isAndroidSdkInstalled() =
     System.getenv("ANDROID_SDK_ROOT") != null || System.getenv("ANDROID_HOME") != null
 
 @Language("xml")
-internal fun manifestContent() = """
+internal val manifestContent = """
     <!--suppress XmlUnusedNamespaceDeclaration -->
     <manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
 """.trimIndent()

diff --git a/...e-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt b/...e-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt
@@ -362,9 +362,9 @@ private fun setupProject(projectLayoutAction: ProjectLayout.() -> Unit): DslGrad
 
 private fun setupAndroidProject(projectLayoutAction: ProjectLayout.() -> Unit): DslGradleRunner {
     val gradleRunner = setupProject { projectLayoutAction() }
-    gradleRunner.writeProjectFile("shared/src/androidMain/AndroidManifest.xml", manifestContent())
-    gradleRunner.writeProjectFile("shared/src/debug/AndroidManifest.xml", manifestContent())
-    gradleRunner.writeProjectFile("shared/src/release/AndroidManifest.xml", manifestContent())
+    gradleRunner.writeProjectFile("shared/src/androidMain/AndroidManifest.xml", manifestContent)
+    gradleRunner.writeProjectFile("shared/src/debug/AndroidManifest.xml", manifestContent)
+    gradleRunner.writeProjectFile("shared/src/release/AndroidManifest.xml", manifestContent)
     return gradleRunner
 }
 

diff --git a/...le-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/report/ReportMergeSpec.kt b/...le-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/report/ReportMergeSpec.kt
@@ -193,8 +193,8 @@ class ReportMergeSpec {
         )
 
         gradleRunner.setupProject()
-        gradleRunner.writeProjectFile("app/src/main/AndroidManifest.xml", manifestContent())
-        gradleRunner.writeProjectFile("lib/src/main/AndroidManifest.xml", manifestContent())
+        gradleRunner.writeProjectFile("app/src/main/AndroidManifest.xml", manifestContent)
+        gradleRunner.writeProjectFile("lib/src/main/AndroidManifest.xml", manifestContent)
         gradleRunner.runTasksAndCheckResult("detektMain", "reportMerge", "--continue") { result ->
             projectLayout.submodules.forEach { submodule ->
                 assertThat(result.task(":${submodule.name}:detektMain")?.outcome).isEqualTo(TaskOutcome.SUCCESS)

diff --git a/...dle-plugin/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/testkit/DslGradleRunner.kt b/...dle-plugin/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/testkit/DslGradleRunner.kt
@@ -1,3 +1,5 @@
+@file:Suppress("Indentation") // https://github.com/pinterest/ktlint/issues/1971
+
 package io.gitlab.arturbosch.detekt.testkit
 
 import org.gradle.api.Project