[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
+1 -1
View File
@@ -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"))
+1 -1
View File
@@ -9,7 +9,7 @@ dependencies {
api(project(":kotlin-script-runtime"))
api(kotlinStdlib())
api(project(":kotlin-scripting-common"))
testApi(commonDependency("junit"))
testApi(libs.junit4)
}
sourceSets {