Update JUnit dependencies (#4505)

* Use consistent JUnit version in all project configurations * Remove explicit junit-params dependency This is already added as a dependency by useJunitJupiter() * Remove unused Spek dependencies from projects migrated to JUnit
detekt · Jan 22, 2022 · 9471385 · 9471385
1 parent 2f7a925
commit 9471385
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/build-logic/src/main/kotlin/module.gradle.kts b/build-logic/src/main/kotlin/module.gradle.kts
@@ -17,9 +17,9 @@ tasks.withType<Jar>().configureEach {
     }
 }
 
-val catalogs = project.extensions.getByType(VersionCatalogsExtension::class)
+val versionCatalog = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
 
-jacoco.toolVersion = catalogs.named("libs").findVersion("jacoco").get().requiredVersion
+jacoco.toolVersion = versionCatalog.findVersion("jacoco").get().requiredVersion
 
 tasks.withType<Test>().configureEach {
     useJUnitPlatform()
@@ -96,7 +96,7 @@ tasks.withType<KotlinCompile>().configureEach {
 testing {
     suites {
         val test by getting(JvmTestSuite::class) {
-            useJUnitJupiter()
+            useJUnitJupiter(versionCatalog.findVersion("junit").get().requiredVersion)
         }
     }
 }

diff --git a/custom-checks/build.gradle.kts b/custom-checks/build.gradle.kts
@@ -5,6 +5,6 @@ plugins {
 dependencies {
     implementation(projects.detektApi)
     testImplementation(projects.detektTest)
-    testImplementation(libs.bundles.testImplementation)
-    testRuntimeOnly(libs.spek.runner)
+    testImplementation(libs.assertj)
+    testRuntimeOnly(libs.spek.dsl)
 }
diff --git a/detekt-generator/build.gradle.kts b/detekt-generator/build.gradle.kts
@@ -14,8 +14,7 @@ dependencies {
 
     testImplementation(projects.detektCore)
     testImplementation(projects.detektTestUtils)
-    testImplementation(libs.bundles.testImplementation)
-    testRuntimeOnly(libs.spek.runner)
+    testImplementation(libs.assertj)
     testImplementation(libs.reflections)
 }
 

diff --git a/detekt-gradle-plugin/build.gradle.kts b/detekt-gradle-plugin/build.gradle.kts
@@ -39,6 +39,8 @@ testing {
             }
         }
         register("functionalTest", JvmTestSuite::class) {
+            useJUnitJupiter(libs.versions.junit.get())
+
             dependencies {
                 implementation(libs.assertj)
                 implementation(libs.spek.dsl)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -33,7 +33,6 @@ spek-dsl = { module = "org.spekframework.spek2:spek-dsl-jvm", version.ref = "spe
 spek-runner = { module = "org.spekframework.spek2:spek-runner-junit5", version.ref = "spek" }
 
 junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
-junit-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
 
 sarif4k = "io.github.detekt.sarif4k:sarif4k:0.0.1"
 assertj = "org.assertj:assertj-core:3.20.2"
@@ -52,4 +51,4 @@ shadow = { id = "com.github.johnrengelman.shadow", version = "7.1.2" }
 sonarqube = { id = "org.sonarqube", version = "3.3" }
 
 [bundles]
-testImplementation = ["assertj", "spek-dsl", "junit-params"]
+testImplementation = ["assertj", "spek-dsl"]