Skip to content

Commit

Permalink
Bundle slf4j-nop in detekt-formatting JAR
Browse files Browse the repository at this point in the history
Fixes #4811
  • Loading branch information
3flex committed Jul 31, 2022
1 parent 90d7da2 commit c6c82fe
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions detekt-formatting/build.gradle.kts
Expand Up @@ -2,6 +2,8 @@ plugins {
id("module")
}

val extraDepsToPackage: Configuration by configurations.creating

dependencies {
compileOnly(projects.detektApi)
implementation(libs.ktlint.rulesetStandard) {
Expand All @@ -13,10 +15,11 @@ dependencies {
implementation(libs.ktlint.rulesetExperimental) {
exclude(group = "org.jetbrains.kotlin")
}
runtimeOnly(libs.slf4j.nop)

testImplementation(projects.detektTest)
testImplementation(libs.assertj)

extraDepsToPackage(libs.slf4j.nop)
}

tasks.build { finalizedBy(":detekt-generator:generateDocumentation") }
Expand All @@ -25,15 +28,15 @@ val depsToPackage = setOf(
"org.ec4j.core",
"com.pinterest.ktlint",
"io.github.microutils",
"org.slf4j",
)

tasks.jar {
duplicatesStrategy = DuplicatesStrategy.INCLUDE // allow duplicates
dependsOn(configurations.runtimeClasspath)
from({
dependsOn(configurations.runtimeClasspath, extraDepsToPackage)
from(
configurations.runtimeClasspath.get()
.filter { dependency -> depsToPackage.any { it in dependency.toString() } }
.map { if (it.isDirectory) it else zipTree(it) }
})
.map { if (it.isDirectory) it else zipTree(it) },
extraDepsToPackage.map { zipTree(it) },
)
}

0 comments on commit c6c82fe

Please sign in to comment.