From ac0b4f989818d5eb9e04991264d3eedca62d3cee Mon Sep 17 00:00:00 2001
From: Matthew Haughton <3flex@users.noreply.github.com>
Date: Sat, 22 Jan 2022 14:11:47 +1100
Subject: [PATCH 1/3] Use consistent JUnit version in all project
 configurations

---
 build-logic/src/main/kotlin/module.gradle.kts | 6 +++---
 detekt-gradle-plugin/build.gradle.kts         | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build-logic/src/main/kotlin/module.gradle.kts b/build-logic/src/main/kotlin/module.gradle.kts
index bd4fbe76b02..69c1d01c8d9 100644
--- 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/detekt-gradle-plugin/build.gradle.kts b/detekt-gradle-plugin/build.gradle.kts
index 32a464cc8f9..28985eb8c36 100644
--- 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)

From 9f923689beb6898652d9083668698fb8ac8172d9 Mon Sep 17 00:00:00 2001
From: Matthew Haughton <3flex@users.noreply.github.com>
Date: Sat, 22 Jan 2022 14:13:29 +1100
Subject: [PATCH 2/3] Remove explicit junit-params dependency

This is already added as a dependency by useJunitJupiter()
---
 gradle/libs.versions.toml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e8c5b90a486..dbbdc89b3a1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -34,7 +34,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"
@@ -53,4 +52,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"]

From 757fb18512a76268ba9110e40f75a8a03e206446 Mon Sep 17 00:00:00 2001
From: Matthew Haughton <3flex@users.noreply.github.com>
Date: Sat, 22 Jan 2022 14:15:41 +1100
Subject: [PATCH 3/3] Remove unused Spek dependencies from projects migrated to
 JUnit

---
 custom-checks/build.gradle.kts    | 4 ++--
 detekt-generator/build.gradle.kts | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/custom-checks/build.gradle.kts b/custom-checks/build.gradle.kts
index 36bd9620ba1..9e4622e960b 100644
--- 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
index 68a8d60d50c..23534f3e8e6 100644
--- 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)
 }