[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
@@ -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)
}
}
+1 -1
View File
@@ -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"))