[Build] Move JUnit dependencies into the version catalog

The `kotlin-test` dependencies are left untouched as changing them affects publications, thus these versions are independent from the used inside our build
#KTI-1349 In Progress

compiler/android-tests/build.gradle.kts

@@ -17,21 +17,19 @@ dependencies {
 
     testApi(kotlinStdlib())
     testApi(projectTests(":compiler:tests-common"))
-    testApi(commonDependency("junit:junit"))
+    testApi(libs.junit4)
     testApi(projectTests(":compiler:test-infrastructure"))
     testApi(projectTests(":compiler:test-infrastructure-utils"))
     testApi(projectTests(":compiler:tests-compiler-utils"))
     testApi(projectTests(":compiler:tests-common-new"))
 
-    testApi(commonDependency("junit:junit"))
-
     testApi(jpsModel())
     testApi(jpsBuildTest())
 
     testRuntimeOnly(intellijCore())
     testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps.jna:jna"))
 
-    testApi("org.junit.platform:junit-platform-launcher:${commonDependencyVersion("org.junit.platform", "")}")
+    testApi(libs.junit.platform.launcher)
 }
 
 sourceSets {

compiler/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
     
     testApi(kotlinStdlib())
 
-    testApi(commonDependency("junit:junit"))
+    testApi(libs.junit4)
     testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
     testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
     testApi(projectTests(":compiler:tests-common"))

compiler/cli/build.gradle.kts

@@ -37,7 +37,7 @@ dependencies {
     testApi(project(":compiler:backend"))
     testApi(project(":compiler:cli"))
     testApi(projectTests(":compiler:tests-common"))
-    testApi(commonDependency("junit:junit"))
+    testApi(libs.junit4)
 }
 
 sourceSets {

compiler/container/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
     testCompileOnly("org.jetbrains:annotations:13.0")
     testApi(project(":kotlin-test:kotlin-test-jvm"))
     testApi(project(":kotlin-test:kotlin-test-junit"))
-    testApi(commonDependency("junit:junit"))
+    testApi(libs.junit4)
     testCompileOnly(intellijCore())
 
     testRuntimeOnly(intellijCore())

compiler/daemon/daemon-tests/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     testImplementation(project(":kotlin-test:kotlin-test-jvm"))
     testImplementation(project(":kotlin-daemon"))
     testImplementation(project(":kotlin-daemon-client"))
-    testImplementation(commonDependency("junit:junit"))
+    testImplementation(libs.junit4)
     testImplementation(projectTests(":compiler:tests-common"))
     testImplementation(intellijCore())
 }

compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts

@@ -13,7 +13,7 @@ plugins {
 dependencies {
     compileOnly(intellijCore())
 
-    testApi(commonDependency("junit:junit"))
+    testApi(libs.junit4)
     testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
     testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
     testApi(projectTests(":compiler:tests-common"))

compiler/fir/modularized-tests/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
     testRuntimeOnly("xerces:xercesImpl:2.12.0")
     testRuntimeOnly(commonDependency("commons-lang:commons-lang"))
 
-    testApi(commonDependency("junit:junit"))
+    testApi(libs.junit4)
     testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
     testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
     testApi(projectTests(":compiler:tests-common"))

compiler/fir/raw-fir/light-tree2fir/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
     compileOnly(intellijCore())
     compileOnly(libs.guava)
 
-    testImplementation(commonDependency("junit:junit"))
+    testImplementation(libs.junit4)
     testImplementation(projectTests(":compiler:tests-common"))
     testImplementation(projectTests(":compiler:fir:raw-fir:psi2fir"))
 

compiler/fir/raw-fir/psi2fir/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
     compileOnly(intellijCore())
     compileOnly(libs.guava)
 
-    testImplementation(commonDependency("junit:junit"))
+    testImplementation(libs.junit4)
     testImplementation(projectTests(":compiler:tests-common"))
     testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
 

compiler/incremental-compilation-impl/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
     api(project(":compiler:build-tools:kotlin-build-tools-api"))
     compileOnly(intellijCore())
 
-    testApi(commonDependency("junit:junit"))
+    testApi(libs.junit4)
     testApi(project(":kotlin-test:kotlin-test-junit"))
     testApi(kotlinStdlib())
     testApi(projectTests(":kotlin-build-common"))

compiler/tests-common/build.gradle.kts

@@ -53,7 +53,7 @@ dependencies {
     testApi(project(":kotlin-test:kotlin-test-jvm"))
     testApi(project(":kotlin-scripting-compiler-impl"))
     testApi(projectTests(":compiler:test-infrastructure-utils"))
-    testApi(commonDependency("junit:junit"))
+    testApi(libs.junit4)
     testApi(commonDependency("com.android.tools:r8"))
     testApi(project(":analysis:analysis-internal-utils"))
     testCompileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }

compiler/util-io/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     implementation(kotlinStdlib())
-    testImplementation(commonDependency("junit:junit"))
+    testImplementation(libs.junit4)
     testImplementation(kotlin("test"))
 }
 

compiler/util-klib/build.gradle.kts

@@ -10,7 +10,7 @@ description = "Common klib reader and writer"
 dependencies {
     api(kotlinStdlib())
     api(project(":kotlin-util-io"))
-    testImplementation(commonDependency("junit:junit"))
+    testImplementation(libs.junit4)
 }
 
 sourceSets {