[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
This commit is contained in:
Alexander.Likhachev
2023-08-16 15:15:22 +02:00
committed by Space Team
parent 9d43945b19
commit 357d12fc8e
62 changed files with 120 additions and 86 deletions
@@ -37,7 +37,7 @@ dependencies {
testApi(project(":kotlin-android-extensions-runtime"))
testApi(projectTests(":compiler:tests-common"))
testApi(project(":kotlin-test:kotlin-test-jvm"))
testApi(commonDependency("junit:junit"))
testApi(libs.junit4)
robolectricDependency("org.robolectric:android-all:5.0.2_r3-robolectric-r0")
+1 -1
View File
@@ -20,7 +20,7 @@ dependencies {
testApi(projectTests(":compiler:tests-common-new"))
testImplementation(projectTests(":compiler:tests-common"))
testImplementation(commonDependency("junit:junit"))
testImplementation(libs.junit4)
testCompileOnly(project(":kotlin-reflect-api"))
testRuntimeOnly(project(":kotlin-reflect"))
@@ -83,7 +83,7 @@ dependencies {
testImplementation(projectTests(":generators:test-generator"))
testImplementation(projectTests(":js:js.tests"))
testApi(commonDependency("junit:junit"))
testApi(libs.junit4)
testApi(project(":kotlin-test:kotlin-test-jvm"))
// Dependencies for Kotlin/Native test infra:
@@ -147,7 +147,7 @@ dependencies {
testImplementation("org.jetbrains.kotlinx:atomicfu:0.21.0")
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.9.1")
testRuntimeOnly(libs.junit.vintage.engine)
}
optInToExperimentalCompilerApi()
+1 -1
View File
@@ -40,7 +40,7 @@ dependencies {
compileOnly(intellijCore())
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
testImplementation(commonDependency("junit:junit"))
testImplementation(libs.junit4)
testImplementation(projectTests(":compiler:tests-common"))
testImplementation(projectTests(":compiler:incremental-compilation-impl"))
}
+1 -1
View File
@@ -36,7 +36,7 @@ dependencies {
testRuntimeOnly(project(":core:descriptors.runtime"))
testApi(commonDependency("junit:junit"))
testApi(libs.junit4)
testRuntimeOnly(libs.guava)
testRuntimeOnly(commonDependency("org.codehaus.woodstox:stax2-api"))
@@ -53,7 +53,7 @@ dependencies {
testRuntimeOnly(commonDependency("com.fasterxml:aalto-xml"))
testRuntimeOnly("com.jetbrains.intellij.platform:util-xml-dom:$intellijVersion") { isTransitive = false }
testApi(commonDependency("junit:junit"))
testApi(libs.junit4)
robolectricDependency("org.robolectric:android-all:5.0.2_r3-robolectric-r0")
@@ -24,8 +24,8 @@ dependencies {
}
testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar"))
testRuntimeOnly(platform(commonDependency("org.junit:junit-bom")))
testRuntimeOnly("org.junit.jupiter:junit-jupiter")
testRuntimeOnly(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.jupyter)
if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
testRuntimeOnly(project(":core:descriptors.runtime"))
+1 -1
View File
@@ -24,7 +24,7 @@ dependencies {
testApi(projectTests(":compiler:test-infrastructure-utils"))
testImplementation(projectTests(":compiler:tests-common"))
testImplementation(commonDependency("junit:junit"))
testImplementation(libs.junit4)
testRuntimeOnly(project(":core:descriptors.runtime"))
testRuntimeOnly(project(":compiler:fir:fir-serialization"))
@@ -32,7 +32,7 @@ dependencies {
testApi(project(":compiler:cli-common"))
testApi(project(":compiler:frontend.java"))
testApi(projectTests(":compiler:tests-common"))
testApi(commonDependency("junit:junit"))
testApi(libs.junit4)
}
sourceSets {
@@ -32,7 +32,7 @@ dependencies {
testApi(project(":compiler:cli-common"))
testApi(project(":compiler:frontend.java"))
testApi(projectTests(":compiler:tests-common"))
testApi(commonDependency("junit:junit"))
testApi(libs.junit4)
testImplementation(intellijCore())
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
@@ -19,7 +19,7 @@ val embeddableTestRuntime by configurations.creating {
}
dependencies {
allTestsRuntime(commonDependency("junit"))
allTestsRuntime(libs.junit4)
testApi(kotlinStdlib("jdk8"))
testApi(project(":kotlin-scripting-ide-services-unshaded"))
testApi(project(":kotlin-scripting-compiler"))