azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Build] Get rid of the testApiJUnit5 method

Browse Source 
#KTI-1349 In Progress
This commit is contained in:
Alexander.Likhachev
2023-08-23 18:44:47 +02:00
committed by Space Team
parent 53fde520d5
commit 6f96be0b76
44 changed files with 124 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/build-tools/kotlin-build-tools-api/build.gradle.kts
+3 -1
View File
@@ -10,7 +10,9 @@ configureKotlinCompileTasksGradleCompatibility()
dependencies {
compileOnly(kotlinStdlib())
testApiJUnit5()
testApi(platform(libs.junit.bom))
testImplementation(libs.junit.jupyter.api)
testRuntimeOnly(libs.junit.jupyter.engine)
testImplementation(kotlinStdlib())
}
compiler/fir/analysis-tests/build.gradle.kts
+3 -1
View File
@@ -26,7 +26,9 @@ dependencies {
testApi(project(":compiler:fir:entrypoint"))
testApi(project(":compiler:frontend"))
testApiJUnit5()
testApi(platform(libs.junit.bom))
testImplementation(libs.junit.jupyter.api)
testRuntimeOnly(libs.junit.jupyter.engine)
testRuntimeOnly(project(":core:descriptors.runtime"))
testRuntimeOnly(project(":compiler:fir:fir2ir:jvm-backend"))
compiler/fir/fir2ir/build.gradle.kts
+3 -1
View File
@@ -29,7 +29,9 @@ dependencies {
testApi(projectTests(":compiler:tests-common-new"))
testApi(projectTests(":compiler:fir:analysis-tests"))
testApiJUnit5()
testApi(platform(libs.junit.bom))
testImplementation(libs.junit.jupyter.api)
testRuntimeOnly(libs.junit.jupyter.engine)
testRuntimeOnly(project(":core:deserialization"))
testRuntimeOnly(project(":core:descriptors.runtime"))
compiler/tests-common-new/build.gradle.kts
+4 -1
View File
@@ -18,7 +18,10 @@ dependencies {
testImplementation(projectTests(":generators:test-generator"))
testApiJUnit5()
testApi(platform(libs.junit.bom))
testImplementation(libs.junit.jupyter.api)
testRuntimeOnly(libs.junit.jupyter.engine)
testApi(libs.junit.platform.launcher)
testApi(projectTests(":compiler:test-infrastructure"))
testApi(projectTests(":compiler:test-infrastructure-utils"))
testApi(projectTests(":compiler:tests-compiler-utils"))
compiler/tests-common/build.gradle.kts
+3 -1
View File
@@ -81,7 +81,9 @@ dependencies {
testImplementation(commonDependency("org.jetbrains.intellij.deps:log4j"))
testImplementation(commonDependency("org.jetbrains.intellij.deps:jdom"))
testApiJUnit5()
testApi(platform(libs.junit.bom))
testImplementation(libs.junit.jupyter.api)
testRuntimeOnly(libs.junit.jupyter.engine)
}
optInToExperimentalCompilerApi()
compiler/tests-different-jdk/build.gradle.kts
+3 -1
View File
@@ -10,7 +10,9 @@ dependencies {
testApi(projectTests(":compiler:tests-compiler-utils"))
testApi(projectTests(":compiler:tests-common-new"))
testApiJUnit5()
testApi(platform(libs.junit.bom))
testImplementation(libs.junit.jupyter.api)
testRuntimeOnly(libs.junit.jupyter.engine)
testImplementation(libs.junit.platform.runner)
testImplementation(libs.junit.platform.suite.api)
runtimeOnly(libs.junit.vintage.engine)
compiler/tests-for-compiler-generator/build.gradle.kts
+3 -1
View File
@@ -6,7 +6,9 @@ plugins {
dependencies {
testImplementation(kotlinStdlib())
testApiJUnit5()
testApi(platform(libs.junit.bom))
testImplementation(libs.junit.jupyter.api)
testRuntimeOnly(libs.junit.jupyter.engine)
testImplementation(projectTests(":compiler:tests-common"))
testImplementation(projectTests(":compiler:test-infrastructure"))
testImplementation(projectTests(":compiler:tests-common-new"))
compiler/tests-java8/build.gradle.kts
+2
View File
@@ -9,6 +9,8 @@ dependencies {
testApi(project(":kotlin-scripting-compiler"))
testApi(projectTests(":compiler:tests-common"))
testImplementation(intellijCore())
testApi(platform(libs.junit.bom))
testImplementation(libs.junit4)
testApi(projectTests(":generators:test-generator"))
testRuntimeOnly(toolsJar())
}
compiler/tests-spec/build.gradle.kts
+4 -1
View File
@@ -16,9 +16,12 @@ dependencies {
testRuntimeOnly(project(":core:descriptors.runtime"))
testApiJUnit5()
testApi(platform(libs.junit.bom))
testImplementation(libs.junit.jupyter.api)
testRuntimeOnly(libs.junit.jupyter.engine)
testImplementation(libs.junit.jupyter.params)
runtimeOnly(libs.junit.vintage.engine)
testImplementation(libs.junit4)
}
sourceSets {
compiler/util-klib-abi/build.gradle.kts
+3 -1
View File
@@ -9,7 +9,9 @@ dependencies {
implementation(project(":core:compiler.common"))
implementation(project(":compiler:ir.serialization.common"))
compileOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
testApiJUnit5()
testApi(platform(libs.junit.bom))
testImplementation(libs.junit.jupyter.api)
testRuntimeOnly(libs.junit.jupyter.engine)
testImplementation(libs.junit.jupyter.params)
testImplementation(intellijCore())
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
compiler/util/build.gradle.kts
+2
View File
@@ -16,6 +16,8 @@ dependencies {
testImplementation(projectTests(":compiler:tests-common"))
testImplementation(intellijCore())
testApi(platform(libs.junit.bom))
testImplementation(libs.junit4)
}
sourceSets {
compiler/visualizer/build.gradle.kts
+3 -1
View File
@@ -11,7 +11,9 @@ dependencies {
testImplementation(project(":compiler:visualizer:render-psi"))
testImplementation(project(":compiler:visualizer:render-fir"))
testApiJUnit5()
testApi(platform(libs.junit.bom))
testImplementation(libs.junit.jupyter.api)
testRuntimeOnly(libs.junit.jupyter.engine)
testApi(projectTests(":compiler:tests-compiler-utils"))
testApi(projectTests(":compiler:tests-common-new"))