Update detekt config, remove kotlin-dsl.

Author: ychescale9

android/foundation/designsystem/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/foundation/designsystem/preview/PreviewKStreamlined.kt

@@ -12,7 +12,7 @@ public annotation class PreviewKStreamlined
 
 @Composable
 public fun KSThemeWithSurface(
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     KSTheme {
         Surface {

build-logic/cocoon/cocoon-compiler-plugin/build.gradle.kts

@@ -1,4 +1,4 @@
-import io.gitlab.arturbosch.detekt.Detekt
+import dev.detekt.gradle.Detekt
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -31,23 +31,21 @@ detekt {
     source.from(files("src/"))
     config.from(files("$rootDir/../detekt.yml"))
     buildUponDefaultConfig = true
-    allRules = true
     parallel = true
 }
 
 tasks.withType<Detekt>().configureEach {
     jvmTarget = JvmTarget.JVM_11.target
     reports {
         xml.required.set(false)
-        txt.required.set(false)
         sarif.required.set(false)
         md.required.set(false)
     }
 }
 
 dependencies {
     // enable Ktlint formatting
-    add("detektPlugins", libs.plugin.detektFormatting)
+    detektPlugins(libs.plugin.detektKtlintWrapper)
 
     compileOnly(libs.kotlin.compiler)
     compileOnly(libs.kotlin.stblib)

build-logic/cocoon/cocoon-compiler-plugin/src/main/kotlin/io/github/reactivecircus/cocoon/compiler/CocoonCommandLineProcessor.kt

@@ -7,7 +7,6 @@ import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.CompilerConfigurationKey
 
 public class CocoonCommandLineProcessor : CommandLineProcessor {
-
     override val pluginId: String = "io.github.reactivecircus.cocoon.compiler"
 
     @Suppress("MaxLineLength")

build-logic/cocoon/cocoon-compiler-plugin/src/main/kotlin/io/github/reactivecircus/cocoon/compiler/CocoonCompilerPluginRegistrar.kt

@@ -7,31 +7,30 @@ import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.config.CompilerConfiguration
 
 public class CocoonCompilerPluginRegistrar : CompilerPluginRegistrar() {
-
     override val supportsK2: Boolean = true
 
     override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {
         val annotationString = requireNotNull(
-            configuration.get(CocoonCommandLineProcessor.CompilerOptions.Annotation)
+            configuration.get(CocoonCommandLineProcessor.CompilerOptions.Annotation),
         )
         val annotationClassId = annotationString.toClassId()
 
         val wrappingFunctionString = requireNotNull(
-            configuration.get(CocoonCommandLineProcessor.CompilerOptions.WrappingFunction)
+            configuration.get(CocoonCommandLineProcessor.CompilerOptions.WrappingFunction),
         )
         val wrappingFunctionCallableId = wrappingFunctionString.toCallableId()
 
         val messageCollector = configuration.get(
             CommonConfigurationKeys.MESSAGE_COLLECTOR_KEY,
-            MessageCollector.NONE
+            MessageCollector.NONE,
         )
 
         IrGenerationExtension.registerExtension(
             extension = CocoonIrGenerationExtension(
                 annotationName = annotationClassId,
                 wrappingFunctionName = wrappingFunctionCallableId,
                 messageCollector = messageCollector,
-            )
+            ),
         )
     }
 }

build-logic/cocoon/cocoon-compiler-plugin/src/main/kotlin/io/github/reactivecircus/cocoon/compiler/CocoonFunctionTransformer.kt

@@ -33,7 +33,6 @@ internal class CocoonFunctionTransformer(
     private val annotation: ClassId,
     private val wrappingFunction: CallableId,
 ) : IrElementTransformerVoidWithContext() {
-
     @OptIn(UnsafeDuringIrConstructionAPI::class)
     override fun visitFunctionNew(declaration: IrFunction): IrStatement {
         if (!declaration.hasAnnotation(annotation) || declaration.body == null) {
@@ -72,7 +71,7 @@ internal class CocoonFunctionTransformer(
                         }
                         arguments[wrappingFunctionParameters.size - 1] = lambdaExpression
                     }
-                }
+                },
             )
         }
 

build-logic/cocoon/cocoon-gradle-plugin/build.gradle.kts

@@ -1,10 +1,11 @@
-import io.gitlab.arturbosch.detekt.Detekt
+import dev.detekt.gradle.Detekt
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    `kotlin-dsl`
+    `java-gradle-plugin`
+    alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.detekt)
 }
 
@@ -36,23 +37,21 @@ detekt {
     source.from(files("src/"))
     config.from(files("$rootDir/../detekt.yml"))
     buildUponDefaultConfig = true
-    allRules = true
     parallel = true
 }
 
 tasks.withType<Detekt>().configureEach {
     jvmTarget = JvmTarget.JVM_11.target
     reports {
         xml.required.set(false)
-        txt.required.set(false)
         sarif.required.set(false)
         md.required.set(false)
     }
 }
 
 dependencies {
     // enable Ktlint formatting
-    add("detektPlugins", libs.plugin.detektFormatting)
+    detektPlugins(libs.plugin.detektKtlintWrapper)
 
     compileOnly(libs.plugin.kotlin)
 }

build-logic/cocoon/cocoon-gradle-plugin/src/main/kotlin/io/github/reactivecircus/cocoon/gradle/CocoonExtension.kt

@@ -2,9 +2,8 @@ package io.github.reactivecircus.cocoon.gradle
 
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Property
-import org.gradle.kotlin.dsl.property
 
 public abstract class CocoonExtension internal constructor(objects: ObjectFactory) {
-    public val annotation: Property<String> = objects.property<String>()
-    public val wrappingFunction: Property<String> = objects.property<String>()
+    public val annotation: Property<String> = objects.property(String::class.java)
+    public val wrappingFunction: Property<String> = objects.property(String::class.java)
 }

build-logic/cocoon/cocoon-gradle-plugin/src/main/kotlin/io/github/reactivecircus/cocoon/gradle/CocoonPlugin.kt

@@ -2,21 +2,19 @@ package io.github.reactivecircus.cocoon.gradle
 
 import org.gradle.api.Project
 import org.gradle.api.provider.Provider
-import org.gradle.kotlin.dsl.getByType
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerPluginSupportPlugin
 import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact
 import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
 
 public class CocoonPlugin : KotlinCompilerPluginSupportPlugin {
-
     override fun apply(target: Project) {
         target.extensions.create("cocoon", CocoonExtension::class.java)
     }
 
     override fun applyToCompilation(kotlinCompilation: KotlinCompilation<*>): Provider<List<SubpluginOption>> {
         val project = kotlinCompilation.target.project
-        val extension = project.extensions.getByType<CocoonExtension>()
+        val extension = project.extensions.getByType(CocoonExtension::class.java)
         return project.provider {
             listOf(
                 SubpluginOption(