Skip to content

Commit

Permalink
style: Apply ktfmt formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
grodin committed Jan 19, 2024
1 parent 2bb9bbf commit 95d214a
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 22 deletions.
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
import io.gitlab.arturbosch.detekt.Detekt
import io.gitlab.arturbosch.detekt.DetektPlugin
import io.gitlab.arturbosch.detekt.extensions.DetektExtension
import io.gitlab.arturbosch.detekt.Detekt
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.withType
import java.io.File

internal class DetektConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
pluginManager.apply(DetektPlugin::class)
configure<DetektExtension> {
config.setFrom(rootProject.files(DETEKT_CONFIG_FILE))
}
configure<DetektExtension> { config.setFrom(rootProject.files(DETEKT_CONFIG_FILE)) }
tasks.withType<Detekt>().configureEach { task ->
task.reports.html {
it.required.set(true)
it.outputLocation.set(rootProject.layout.buildDirectory.file("reports/detekt.html"))
it.outputLocation.set(
rootProject.layout.buildDirectory.file("reports/detekt.html")
)
}
}
}
Expand Down
31 changes: 15 additions & 16 deletions build-logic/convention-plugins/src/main/kotlin/RootProjectPlugin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,22 @@ public class RootProjectPlugin : Plugin<Project> {
val input = rootDir.absolutePath
val config = DetektConventionPlugin.DETEKT_CONFIG_FILE
val excludes: String =
listOf("build", "resources", "tools", "scripts").joinToString(
separator = ","
) { "**/$it/*" }
val reports =
"txt:${rootProject.layout.buildDirectory.get()}/reports/detektAll.txt"
listOf("build", "resources", "tools", "scripts").joinToString(separator = ",") {
"**/$it/*"
}
val reports = "txt:${rootProject.layout.buildDirectory.get()}/reports/detektAll.txt"
val params =
listOf(
"--input",
input,
"--config",
config,
"--excludes",
excludes,
"--report",
reports,
"--debug"
)
listOf(
"--input",
input,
"--config",
config,
"--excludes",
excludes,
"--report",
reports,
"--debug"
)
args = params
doFirst { logger.lifecycle("Running detekt cli tool with parameters: $params") }
}
Expand Down

0 comments on commit 95d214a

Please sign in to comment.