[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
2023-08-16 15:15:22 +02:00
parent 9d43945b19
commit 357d12fc8e
62 changed files with 120 additions and 86 deletions
@@ -10,7 +10,7 @@ dependencies {
    testRuntimeOnly(project(":kotlin-scripting-compiler-embeddable"))
    testRuntimeOnly(project(":kotlin-scripting-jvm-host"))
    testRuntimeOnly(libs.guava)
-    testApi(commonDependency("junit"))
+    testApi(libs.junit4)
 }

 sourceSets {
@@ -12,7 +12,7 @@ dependencies {
    testRuntimeOnly(project(":kotlin-compiler"))
    testRuntimeOnly(project(":kotlin-scripting-compiler"))

-    testApi(commonDependency("junit"))
+    testApi(libs.junit4)
 }

 sourceSets {
@@ -8,7 +8,7 @@ dependencies {
    api(project(":kotlin-scripting-jvm-host-unshaded"))
    testRuntimeOnly(project(":kotlin-compiler"))
    testRuntimeOnly(project(":kotlin-scripting-compiler"))
-    testApi(commonDependency("junit"))
+    testApi(libs.junit4)
 }

 sourceSets {
@@ -45,7 +45,7 @@ dependencies {
    embedded(project(":core:metadata.jvm"))
    embedded(protobufLite())
    testImplementation(project(":kotlin-test:kotlin-test-junit"))
-    testImplementation(commonDependency("junit:junit"))
+    testImplementation(libs.junit4)
    testImplementation(commonDependency("org.jetbrains.intellij.deps:asm-all"))
    testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
 }
@@ -8,7 +8,7 @@ project.updateJvmTarget("1.8")
 dependencies {
    api(kotlinStdlib())
    compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
-    testApi(commonDependency("junit"))
+    testApi(libs.junit4)
 }

 sourceSets {
@@ -39,7 +39,7 @@ dependencies {
    embedded("org.apache.maven.wagon:wagon-http:3.5.3")
    embedded("commons-io:commons-io:2.11.0")

-    testImplementation(commonDependency("junit"))
+    testImplementation(libs.junit4)
    testRuntimeOnly("org.slf4j:slf4j-nop:1.7.36")
    testImplementation(project(":kotlin-scripting-dependencies-maven-all"))
 }
@@ -18,7 +18,7 @@ dependencies {
    implementation("commons-io:commons-io:2.11.0")

    testImplementation(projectTests(":kotlin-scripting-dependencies"))
-    testImplementation(commonDependency("junit"))
+    testImplementation(libs.junit4)
    testRuntimeOnly("org.slf4j:slf4j-nop:1.7.36")
    testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
    testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
@@ -8,7 +8,7 @@ project.updateJvmTarget("1.8")
 dependencies {
    api(kotlinStdlib())
    api(project(":kotlin-scripting-common"))
-    testApi(commonDependency("junit"))
+    testApi(libs.junit4)
    testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
 }

@@ -17,7 +17,7 @@ val testJsr223Runtime by configurations.creating {
 val testCompilationClasspath by configurations.creating

 dependencies {
-    testApi(commonDependency("junit"))
+    testApi(libs.junit4)
    testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
    testCompileOnly(project(":compiler:cli"))
    testCompileOnly(project(":core:util.runtime"))
@@ -28,7 +28,7 @@ dependencies {
    testRuntimeOnly(project(":kotlin-scripting-jsr223-unshaded"))
    testRuntimeOnly(project(":kotlin-compiler"))

-    embeddableTestRuntime(commonDependency("junit"))
+    embeddableTestRuntime(libs.junit4)
    embeddableTestRuntime(project(":kotlin-scripting-jsr223"))
    embeddableTestRuntime(project(":kotlin-scripting-compiler-embeddable"))
    embeddableTestRuntime(testSourceSet.output)
@@ -11,7 +11,7 @@ val embeddableTestRuntime by configurations.creating {
 }

 dependencies {
-    allTestsRuntime(commonDependency("junit"))
+    allTestsRuntime(libs.junit4)
    allTestsRuntime(intellijCore())
    testApi(project(":kotlin-scripting-jvm-host-unshaded"))
    testApi(projectTests(":compiler:tests-common"))
@@ -9,7 +9,7 @@ dependencies {
    api(project(":kotlin-script-runtime"))
    api(kotlinStdlib())
    api(project(":kotlin-scripting-common"))
-    testApi(commonDependency("junit"))
+    testApi(libs.junit4)
 }

 sourceSets {
@@ -16,7 +16,7 @@ dependencies {
    commonCompileOnly(project(":compiler"))
    commonCompileOnly(project(":kotlin-assignment-compiler-plugin"))

-    testImplementation(commonDependency("junit"))
+    testImplementation(libs.junit4)
 }

 gradlePlugin {
@@ -18,7 +18,7 @@ dependencies {
    compileOnly(kotlinStdlib())

    testImplementation(project(":kotlin-test:kotlin-test-junit"))
-    testImplementation(commonDependency("junit:junit"))
+    testImplementation(libs.junit4)
 }

 projectTest {
@@ -141,7 +141,7 @@ dependencies {
    testImplementation(projectTests(":kotlin-build-common"))
    testImplementation(project(":kotlin-compiler-runner"))
    testImplementation(project(":kotlin-test:kotlin-test-junit"))
-    testImplementation(commonDependency("junit:junit"))
+    testImplementation(libs.junit4)
    testImplementation(project(":kotlin-gradle-statistics"))
    testImplementation(project(":kotlin-tooling-metadata"))
 }
@@ -18,7 +18,7 @@ dependencies {
    compileOnly(kotlinStdlib())

    testImplementation(project(":kotlin-test:kotlin-test-junit"))
-    testImplementation(commonDependency("junit"))
+    testImplementation(libs.junit4)
 }

 projectTest {
@@ -12,7 +12,7 @@ dependencies {
    testCompileOnly(project(":compiler:cli"))
    testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
    testApi(kotlinStdlib("jdk8"))
-    testApi(commonDependency("junit"))
+    testApi(libs.junit4)
    testApi(projectTests(":kotlin-scripting-compiler")) { isTransitive = false }
    testImplementation(project(":kotlin-compiler-embeddable"))
    kotlinxSerializationGradlePluginClasspath(project(":kotlinx-serialization-compiler-plugin.embeddable")) { isTransitive = false }
@@ -17,7 +17,7 @@ dependencies {
    commonCompileOnly(project(":kotlin-noarg-compiler-plugin"))

    testImplementation(gradleApi())
-    testImplementation(commonDependency("junit"))
+    testImplementation(libs.junit4)
 }

 gradlePlugin {
@@ -16,7 +16,7 @@ dependencies {
    commonCompileOnly(project(":compiler"))
    commonCompileOnly(project(":kotlin-sam-with-receiver-compiler-plugin"))

-    testImplementation(commonDependency("junit"))
+    testImplementation(libs.junit4)
 }

 gradlePlugin {
@@ -17,7 +17,7 @@ dependencies {
    api(project(":kotlin-daemon-client"))
    testCompileOnly(project(":compiler:cli"))
    testApi(project(":kotlin-test:kotlin-test-junit"))
-    testApi(commonDependency("junit:junit"))
+    testApi(libs.junit4)
    testApi(project(":kotlin-scripting-compiler"))
    testRuntimeOnly(project(":kotlin-compiler"))
    testApi(intellijCore())
@@ -27,7 +27,7 @@ optInToExperimentalCompilerApi()

 configurations.all {
    resolutionStrategy {
-        force(commonDependency("junit:junit"))
+        force(libs.junit4)
    }
 }

@@ -21,7 +21,7 @@ dependencies {
    testCompileOnly(project(":kotlinx-metadata"))
    testCompileOnly(project(":kotlinx-metadata-jvm"))

-    testImplementation(commonDependency("junit:junit"))
+    testImplementation(libs.junit4)
    testImplementation(projectTests(":compiler:tests-common"))
    testImplementation(projectTests(":generators:test-generator"))