Skip to content

Commit

Permalink
Revert "Revert "Remove workaround for KT-60813 (#6646)""
Browse files Browse the repository at this point in the history
This reverts commit 84483a4.
  • Loading branch information
3flex committed Dec 20, 2023
1 parent a85ecb9 commit 615f1bd
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions detekt-formatting/build.gradle.kts
Expand Up @@ -12,14 +12,7 @@ dependencies {

runtimeOnly(libs.slf4j.api)

testImplementation(projects.detektTest) {
/* Workaround for https://youtrack.jetbrains.com/issue/KT-60813. Required due to detekt-main-kts embedding an
old version of SLF4J which conflicts with the version used in detekt-formatting. This dependency isn't required
for formatting tests as ktlint only requires the AST for its analysis and doesn't need to be compiled.
Prevents test execution with "compile-test-snippets" enabled.
*/
exclude("org.jetbrains.kotlin", "kotlin-main-kts")
}
testImplementation(projects.detektTest)
testImplementation(libs.assertj)

testRuntimeOnly(libs.slf4j.nop)
Expand Down Expand Up @@ -59,8 +52,3 @@ tasks.test {
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
}
}

tasks.withType<Test>().configureEach {
// Required due to exclusion of kotlin-main-kts dependency above
systemProperty("compile-test-snippets", false)
}

0 comments on commit 615f1bd

Please sign in to comment.