Fix ktlint

5 files changed, 85 insertions, 75 deletions

diff --git a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspConfigurations.kt b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspConfigurations.kt
index 5423a534..b597afb4 100644
--- a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspConfigurations.kt
+++ b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspConfigurations.kt
@@ -15,7 +15,6 @@ class KspConfigurations(private val project: Project) {
         private const val PREFIX = "ksp"
     }
 
-
     // Store all ksp configurations for quick retrieval.
     private val kotlinConfigurations = mutableMapOf<KotlinSourceSet, Configuration>()
     private val androidConfigurations = mutableMapOf<String, Configuration>()
diff --git a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt
index 78ac68dd..9c30f220 100644
--- a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt
+++ b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt
@@ -208,7 +208,6 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool
             kspTask.apOptions.value(kspExtension.arguments).disallowChanges()
             kspTask.kspCacheDir.fileValue(getKspCachesDir(project, sourceSetName)).disallowChanges()
 
-
             if (kspExtension.blockOtherCompilerPlugins) {
                 // FIXME: ask upstream to provide an API to make this not implementation-dependent.
                 val cfg = project.configurations.getByName(kotlinCompilation.pluginConfigurationName)
diff --git a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/GradleCompilationTest.kt b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/GradleCompilationTest.kt
index 35351331..70b59246 100644
--- a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/GradleCompilationTest.kt
+++ b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/GradleCompilationTest.kt
@@ -111,7 +111,7 @@ class GradleCompilationTest {
 
         testRule.runner()
             .withDebug(true)
-            .withArguments("app:assemble", "--stacktrace")
+            .withArguments("app:assemble")
             .forwardOutput()
             .build()
     }
diff --git a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/ProcessorClasspathConfigurationsTest.kt b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/ProcessorClasspathConfigurationsTest.kt
index a1216f1e..d51322fa 100644
--- a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/ProcessorClasspathConfigurationsTest.kt
+++ b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/ProcessorClasspathConfigurationsTest.kt
@@ -40,22 +40,24 @@ class ProcessorClasspathConfigurationsTest {
     fun testConfigurationsForSinglePlatformApp() {
         testRule.setupAppAsJvmApp()
         testRule.appModule.addSource("Foo.kt", "class Foo")
-        testRule.appModule.buildFileAdditions.add("""
-            $kspConfigs.all {
-                // Make sure ksp configs are not empty.
-                project.dependencies.add(name, "androidx.room:room-compiler:2.3.0")
-            }
-            tasks.register("testConfigurations") {
-                // Resolve all tasks to trigger classpath config creation
-                dependsOn(tasks["tasks"])
-                doLast {
-                    val main = configurations["kspKotlinProcessorClasspath"]
-                    val test = configurations["kspTestKotlinProcessorClasspath"]
-                    require(main.extendsFrom.map { it.name } == listOf("ksp"))
-                    require(test.extendsFrom.map { it.name } == listOf("kspTest"))
+        testRule.appModule.buildFileAdditions.add(
+            """
+                $kspConfigs.all {
+                    // Make sure ksp configs are not empty.
+                    project.dependencies.add(name, "androidx.room:room-compiler:2.3.0")
                 }
-            }
-        """.trimIndent())
+                tasks.register("testConfigurations") {
+                    // Resolve all tasks to trigger classpath config creation
+                    dependsOn(tasks["tasks"])
+                    doLast {
+                        val main = configurations["kspKotlinProcessorClasspath"]
+                        val test = configurations["kspTestKotlinProcessorClasspath"]
+                        require(main.extendsFrom.map { it.name } == listOf("ksp"))
+                        require(test.extendsFrom.map { it.name } == listOf("kspTest"))
+                    }
+                }
+            """.trimIndent()
+        )
         testRule.runner()
             .withArguments(":app:testConfigurations")
             .build()
@@ -63,33 +65,37 @@ class ProcessorClasspathConfigurationsTest {
 
     @Test
     fun testConfigurationsForMultiPlatformApp() {
-        testRule.setupAppAsMultiplatformApp("""
-            kotlin {
-                jvm { }
-                js { browser() }
-            }
-        """.trimIndent())
+        testRule.setupAppAsMultiplatformApp(
+            """
+                kotlin {
+                    jvm { }
+                    js { browser() }
+                }
+            """.trimIndent()
+        )
         testRule.appModule.addMultiplatformSource("commonMain", "Foo.kt", "class Foo")
-        testRule.appModule.buildFileAdditions.add("""
-            $kspConfigs.matching { it.name != "ksp" }.all {
-                // Make sure ksp configs are not empty.
-                project.dependencies.add(name, "androidx.room:room-compiler:2.3.0")
-            }
-            tasks.register("testConfigurations") {
-                // Resolve all tasks to trigger classpath config creation
-                dependsOn(tasks["tasks"])
-                doLast {
-                    val jvmMain = configurations["kspKotlinJvmProcessorClasspath"]
-                    val jvmTest = configurations["kspTestKotlinJvmProcessorClasspath"]
-                    val jsMain = configurations["kspKotlinJsProcessorClasspath"]
-                    val jsTest = configurations["kspTestKotlinJsProcessorClasspath"]
-                    require(jvmMain.extendsFrom.map { it.name } == listOf("kspJvm"))
-                    require(jvmTest.extendsFrom.map { it.name } == listOf("kspJvmTest"))
-                    require(jsMain.extendsFrom.map { it.name } == listOf("kspJs"))
-                    require(jsTest.extendsFrom.map { it.name } == listOf("kspJsTest"))
+        testRule.appModule.buildFileAdditions.add(
+            """
+                $kspConfigs.matching { it.name != "ksp" }.all {
+                    // Make sure ksp configs are not empty.
+                    project.dependencies.add(name, "androidx.room:room-compiler:2.3.0")
+                }
+                tasks.register("testConfigurations") {
+                    // Resolve all tasks to trigger classpath config creation
+                    dependsOn(tasks["tasks"])
+                    doLast {
+                        val jvmMain = configurations["kspKotlinJvmProcessorClasspath"]
+                        val jvmTest = configurations["kspTestKotlinJvmProcessorClasspath"]
+                        val jsMain = configurations["kspKotlinJsProcessorClasspath"]
+                        val jsTest = configurations["kspTestKotlinJsProcessorClasspath"]
+                        require(jvmMain.extendsFrom.map { it.name } == listOf("kspJvm"))
+                        require(jvmTest.extendsFrom.map { it.name } == listOf("kspJvmTest"))
+                        require(jsMain.extendsFrom.map { it.name } == listOf("kspJs"))
+                        require(jsTest.extendsFrom.map { it.name } == listOf("kspJsTest"))
+                    }
                 }
-            }
-        """.trimIndent())
+            """.trimIndent()
+        )
         testRule.runner()
             .withArguments(":app:testConfigurations")
             .build()
diff --git a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/SourceSetConfigurationsTest.kt b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/SourceSetConfigurationsTest.kt
index b7549301..6ed6dc49 100644
--- a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/SourceSetConfigurationsTest.kt
+++ b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/SourceSetConfigurationsTest.kt
@@ -76,15 +76,17 @@ class SourceSetConfigurationsTest {
 
     @Test
     fun configurationsForMultiplatformApp() {
-        testRule.setupAppAsMultiplatformApp("""
-            kotlin {
-                jvm { }
-                android(name = "foo") { }
-                js { browser() }
-                androidNativeX86 { }
-                androidNativeX64(name = "bar") { }
-            }
-        """.trimIndent())
+        testRule.setupAppAsMultiplatformApp(
+            """
+                kotlin {
+                    jvm { }
+                    android(name = "foo") { }
+                    js { browser() }
+                    androidNativeX86 { }
+                    androidNativeX64(name = "bar") { }
+                }
+            """.trimIndent()
+        )
         testRule.appModule.addMultiplatformSource("commonMain", "Foo.kt", "class Foo")
         val result = testRule.runner()
             .withArguments(":app:dependencies")
@@ -122,32 +124,36 @@ class SourceSetConfigurationsTest {
         // Adding a ksp dependency on jvmParent should not leak into jvmChild compilation,
         // even if the source sets depend on each other. This works because we use
         // KotlinCompilation.kotlinSourceSets instead of KotlinCompilation.allKotlinSourceSets
-        testRule.setupAppAsMultiplatformApp("""
-            kotlin {
-                jvm("jvmParent") { }
-                jvm("jvmChild") { }
-            }
-        """.trimIndent())
+        testRule.setupAppAsMultiplatformApp(
+            """
+                kotlin {
+                    jvm("jvmParent") { }
+                    jvm("jvmChild") { }
+                }
+            """.trimIndent()
+        )
         testRule.appModule.addMultiplatformSource("commonMain", "Foo.kt", "class Foo")
-        testRule.appModule.buildFileAdditions.add("""
-            kotlin {
-                sourceSets {
-                    this["jvmChildMain"].dependsOn(this["jvmParentMain"])
+        testRule.appModule.buildFileAdditions.add(
+            """
+                kotlin {
+                    sourceSets {
+                        this["jvmChildMain"].dependsOn(this["jvmParentMain"])
+                    }
                 }
-            }
-            dependencies {
-                add("kspJvmParent", "androidx.room:room-compiler:2.3.0")
-            }
-            tasks.register("checkConfigurations") {
-                doLast {
-                    // child has no dependencies, so task is not created.
-                    val parent = tasks.findByName("kspKotlinJvmParent")
-                    val child = tasks.findByName("kspKotlinJvmChild")
-                    require(parent != null)
-                    require(child == null)
+                dependencies {
+                    add("kspJvmParent", "androidx.room:room-compiler:2.3.0")
                 }
-            }
-        """.trimIndent())
+                tasks.register("checkConfigurations") {
+                    doLast {
+                        // child has no dependencies, so task is not created.
+                        val parent = tasks.findByName("kspKotlinJvmParent")
+                        val child = tasks.findByName("kspKotlinJvmChild")
+                        require(parent != null)
+                        require(child == null)
+                    }
+                }
+            """.trimIndent()
+        )
         testRule.runner()
             .withArguments(":app:checkConfigurations")
             .build()