diff --git a/build-logic/src/main/kotlin/module.gradle.kts b/build-logic/src/main/kotlin/module.gradle.kts index 040052a03..b09e7939e 100644 --- a/build-logic/src/main/kotlin/module.gradle.kts +++ b/build-logic/src/main/kotlin/module.gradle.kts @@ -100,15 +100,7 @@ tasks.withType().configureEach { } dependencies { - implementation(platform(project(":detekt-bom"))) compileOnly(kotlin("stdlib-jdk8")) - - testImplementation("org.assertj:assertj-core") - testImplementation("org.spekframework.spek2:spek-dsl-jvm") - testImplementation("org.reflections:reflections") - - testRuntimeOnly("org.junit.platform:junit-platform-launcher") - testRuntimeOnly("org.spekframework.spek2:spek-runner-junit5") } java { diff --git a/custom-checks/build.gradle.kts b/custom-checks/build.gradle.kts index 5e3703899..9c13c39fa 100644 --- a/custom-checks/build.gradle.kts +++ b/custom-checks/build.gradle.kts @@ -5,4 +5,6 @@ plugins { dependencies { implementation(projects.detektApi) testImplementation(projects.detektTest) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-api/build.gradle.kts b/detekt-api/build.gradle.kts index be7d23d90..2203a5f6d 100644 --- a/detekt-api/build.gradle.kts +++ b/detekt-api/build.gradle.kts @@ -12,6 +12,9 @@ dependencies { api(projects.detektPsiUtils) testImplementation(projects.detektTest) + testImplementation(libs.bundles.testImplementation) + + testRuntimeOnly(libs.bundles.testRuntime) testFixturesApi(libs.kotlin.stdlibJdk8) diff --git a/detekt-bom/build.gradle.kts b/detekt-bom/build.gradle.kts deleted file mode 100644 index 744f9b18b..000000000 --- a/detekt-bom/build.gradle.kts +++ /dev/null @@ -1,28 +0,0 @@ -plugins { - `java-platform` -} - -dependencies { - constraints { - api(libs.assertj) - api(libs.spek.dsl) - api(libs.spek.runner) - api(libs.reflections) - api(libs.mockk) - api(libs.junitLauncher) - api(libs.snakeyaml) - api(libs.jcommander) - api(libs.ktlint.rulesetStandard) - api(libs.ktlint.core) - api(libs.ktlint.rulesetExperimental) - api(libs.kotlinx.html) - api(libs.kotlinx.coroutines) - api(libs.sarif4k) - } -} - -publishing { - publications.named(DETEKT_PUBLICATION) { - from(components["javaPlatform"]) - } -} diff --git a/detekt-cli/build.gradle.kts b/detekt-cli/build.gradle.kts index eee7ceb77..0256edbe4 100644 --- a/detekt-cli/build.gradle.kts +++ b/detekt-cli/build.gradle.kts @@ -16,6 +16,8 @@ dependencies { runtimeOnly(projects.detektRules) testImplementation(projects.detektTest) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } val javaComponent = components["java"] as AdhocComponentWithVariants diff --git a/detekt-core/build.gradle.kts b/detekt-core/build.gradle.kts index 24fe0b5a9..cb6b117b0 100644 --- a/detekt-core/build.gradle.kts +++ b/detekt-core/build.gradle.kts @@ -16,7 +16,10 @@ dependencies { testRuntimeOnly(projects.detektRules) testRuntimeOnly(projects.detektFormatting) + testRuntimeOnly(libs.bundles.testRuntime) testImplementation(projects.detektTest) testImplementation(testFixtures(projects.detektApi)) testImplementation(libs.mockk) + testImplementation(libs.reflections) + testImplementation(libs.bundles.testImplementation) } diff --git a/detekt-formatting/build.gradle.kts b/detekt-formatting/build.gradle.kts index d8a67202b..13de31dc1 100644 --- a/detekt-formatting/build.gradle.kts +++ b/detekt-formatting/build.gradle.kts @@ -15,6 +15,9 @@ dependencies { } testImplementation(projects.detektTest) + testImplementation(libs.bundles.testImplementation) + + testRuntimeOnly(libs.bundles.testRuntime) } tasks.build { finalizedBy(":detekt-generator:generateDocumentation") } diff --git a/detekt-generator/build.gradle.kts b/detekt-generator/build.gradle.kts index 32f350c2d..d183aba6e 100644 --- a/detekt-generator/build.gradle.kts +++ b/detekt-generator/build.gradle.kts @@ -13,6 +13,8 @@ dependencies { implementation(libs.jcommander) testImplementation(projects.detektTestUtils) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } val documentationDir = "${rootProject.rootDir}/docs/pages/documentation" diff --git a/detekt-gradle-plugin/build.gradle.kts b/detekt-gradle-plugin/build.gradle.kts index df4b28006..166f2e320 100644 --- a/detekt-gradle-plugin/build.gradle.kts +++ b/detekt-gradle-plugin/build.gradle.kts @@ -13,12 +13,14 @@ val intTest: Configuration by configurations.creating dependencies { implementation(libs.kotlin.gradlePluginApi) - implementation("io.github.detekt.sarif4k:sarif4k") + implementation(libs.sarif4k) compileOnly(libs.android.gradle) compileOnly(libs.kotlin.gradle) testImplementation(projects.detektTestUtils) testImplementation(libs.kotlin.gradle) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) intTest(libs.kotlin.gradle) intTest(libs.android.gradle) } diff --git a/detekt-metrics/build.gradle.kts b/detekt-metrics/build.gradle.kts index 885e401db..9c30096b8 100644 --- a/detekt-metrics/build.gradle.kts +++ b/detekt-metrics/build.gradle.kts @@ -7,4 +7,6 @@ dependencies { testImplementation(projects.detektTestUtils) testImplementation(testFixtures(projects.detektApi)) testImplementation(libs.mockk) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-parser/build.gradle.kts b/detekt-parser/build.gradle.kts index 509432f8b..206eec765 100644 --- a/detekt-parser/build.gradle.kts +++ b/detekt-parser/build.gradle.kts @@ -8,6 +8,8 @@ dependencies { api(libs.kotlin.compilerEmbeddable) implementation(projects.detektPsiUtils) testImplementation(projects.detektTestUtils) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } tasks.withType { diff --git a/detekt-psi-utils/build.gradle.kts b/detekt-psi-utils/build.gradle.kts index 5f34579dc..5adcfb57c 100644 --- a/detekt-psi-utils/build.gradle.kts +++ b/detekt-psi-utils/build.gradle.kts @@ -5,4 +5,7 @@ plugins { dependencies { implementation(libs.kotlin.compilerEmbeddable) + + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-report-html/build.gradle.kts b/detekt-report-html/build.gradle.kts index ac68b11f6..97bd1b319 100644 --- a/detekt-report-html/build.gradle.kts +++ b/detekt-report-html/build.gradle.kts @@ -12,4 +12,6 @@ dependencies { testImplementation(projects.detektTestUtils) testImplementation(testFixtures(projects.detektApi)) testImplementation(libs.mockk) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-report-sarif/build.gradle.kts b/detekt-report-sarif/build.gradle.kts index f39592c9f..8d7e76af7 100644 --- a/detekt-report-sarif/build.gradle.kts +++ b/detekt-report-sarif/build.gradle.kts @@ -9,4 +9,6 @@ dependencies { testImplementation(projects.detektTooling) testImplementation(projects.detektTestUtils) testImplementation(testFixtures(projects.detektApi)) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-report-txt/build.gradle.kts b/detekt-report-txt/build.gradle.kts index 1547781c6..d9f75eb95 100644 --- a/detekt-report-txt/build.gradle.kts +++ b/detekt-report-txt/build.gradle.kts @@ -5,4 +5,6 @@ plugins { dependencies { implementation(projects.detektApi) testImplementation(testFixtures(projects.detektApi)) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-report-xml/build.gradle.kts b/detekt-report-xml/build.gradle.kts index 1547781c6..d9f75eb95 100644 --- a/detekt-report-xml/build.gradle.kts +++ b/detekt-report-xml/build.gradle.kts @@ -5,4 +5,6 @@ plugins { dependencies { implementation(projects.detektApi) testImplementation(testFixtures(projects.detektApi)) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-rules-complexity/build.gradle.kts b/detekt-rules-complexity/build.gradle.kts index e9080709d..f20eb7feb 100644 --- a/detekt-rules-complexity/build.gradle.kts +++ b/detekt-rules-complexity/build.gradle.kts @@ -7,4 +7,6 @@ dependencies { compileOnly(projects.detektMetrics) testImplementation(projects.detektMetrics) testImplementation(projects.detektTest) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-rules-coroutines/build.gradle.kts b/detekt-rules-coroutines/build.gradle.kts index 99d11b15b..9ed8ff658 100644 --- a/detekt-rules-coroutines/build.gradle.kts +++ b/detekt-rules-coroutines/build.gradle.kts @@ -5,4 +5,6 @@ plugins { dependencies { compileOnly(projects.detektApi) testImplementation(projects.detektTest) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-rules-documentation/build.gradle.kts b/detekt-rules-documentation/build.gradle.kts index 99d11b15b..9ed8ff658 100644 --- a/detekt-rules-documentation/build.gradle.kts +++ b/detekt-rules-documentation/build.gradle.kts @@ -5,4 +5,6 @@ plugins { dependencies { compileOnly(projects.detektApi) testImplementation(projects.detektTest) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-rules-empty/build.gradle.kts b/detekt-rules-empty/build.gradle.kts index 99d11b15b..9ed8ff658 100644 --- a/detekt-rules-empty/build.gradle.kts +++ b/detekt-rules-empty/build.gradle.kts @@ -5,4 +5,6 @@ plugins { dependencies { compileOnly(projects.detektApi) testImplementation(projects.detektTest) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-rules-errorprone/build.gradle.kts b/detekt-rules-errorprone/build.gradle.kts index 99d11b15b..9ed8ff658 100644 --- a/detekt-rules-errorprone/build.gradle.kts +++ b/detekt-rules-errorprone/build.gradle.kts @@ -5,4 +5,6 @@ plugins { dependencies { compileOnly(projects.detektApi) testImplementation(projects.detektTest) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-rules-exceptions/build.gradle.kts b/detekt-rules-exceptions/build.gradle.kts index 99d11b15b..9ed8ff658 100644 --- a/detekt-rules-exceptions/build.gradle.kts +++ b/detekt-rules-exceptions/build.gradle.kts @@ -5,4 +5,6 @@ plugins { dependencies { compileOnly(projects.detektApi) testImplementation(projects.detektTest) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-rules-naming/build.gradle.kts b/detekt-rules-naming/build.gradle.kts index 99d11b15b..9ed8ff658 100644 --- a/detekt-rules-naming/build.gradle.kts +++ b/detekt-rules-naming/build.gradle.kts @@ -5,4 +5,6 @@ plugins { dependencies { compileOnly(projects.detektApi) testImplementation(projects.detektTest) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-rules-performance/build.gradle.kts b/detekt-rules-performance/build.gradle.kts index 99d11b15b..9ed8ff658 100644 --- a/detekt-rules-performance/build.gradle.kts +++ b/detekt-rules-performance/build.gradle.kts @@ -5,4 +5,6 @@ plugins { dependencies { compileOnly(projects.detektApi) testImplementation(projects.detektTest) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-rules-style/build.gradle.kts b/detekt-rules-style/build.gradle.kts index c11577561..7a1e409db 100644 --- a/detekt-rules-style/build.gradle.kts +++ b/detekt-rules-style/build.gradle.kts @@ -8,4 +8,6 @@ dependencies { testImplementation(projects.detektMetrics) testImplementation(projects.detektTest) testImplementation(libs.mockk) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-rules/build.gradle.kts b/detekt-rules/build.gradle.kts index 4e3c84eba..15344d7c5 100644 --- a/detekt-rules/build.gradle.kts +++ b/detekt-rules/build.gradle.kts @@ -24,6 +24,9 @@ dependencies { testImplementation(projects.detektRulesNaming) testImplementation(projects.detektRulesPerformance) testImplementation(projects.detektRulesStyle) + testImplementation(libs.bundles.testImplementation) + testImplementation(libs.reflections) + testRuntimeOnly(libs.bundles.testRuntime) } tasks.build { finalizedBy(":detekt-generator:generateDocumentation") } diff --git a/detekt-sample-extensions/build.gradle.kts b/detekt-sample-extensions/build.gradle.kts index f8ac4a0a9..469eb5b8b 100644 --- a/detekt-sample-extensions/build.gradle.kts +++ b/detekt-sample-extensions/build.gradle.kts @@ -9,4 +9,6 @@ dependencies { // When creating a sample extension, change this dependency to the detekt-test version you build against // e.g. io.gitlab.arturbosch.detekt:detekt-test:1.x.x testImplementation(projects.detektTest) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/detekt-tooling/build.gradle.kts b/detekt-tooling/build.gradle.kts index 3c6e0e299..2ca7c5ced 100644 --- a/detekt-tooling/build.gradle.kts +++ b/detekt-tooling/build.gradle.kts @@ -5,4 +5,6 @@ plugins { dependencies { api(projects.detektApi) testImplementation(projects.detektTestUtils) + testImplementation(libs.bundles.testImplementation) + testRuntimeOnly(libs.bundles.testRuntime) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 52cbf29d8..5462fbd77 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -50,3 +50,5 @@ shadow = { id = "com.github.johnrengelman.shadow", version = "7.0.0" } sonarqube = { id = "org.sonarqube", version = "3.3" } [bundles] +testImplementation = ["assertj", "spek-dsl"] +testRuntime = ["junitLauncher", "spek-runner"] diff --git a/settings.gradle.kts b/settings.gradle.kts index b978ab9c2..15e19d486 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,7 +9,6 @@ include( "custom-checks", "detekt-api", "detekt-cli", - "detekt-bom", "detekt-core", "detekt-formatting", "detekt-generator",