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

[Build] Split junit-jupiter into api and engine

Browse Source 
#KTI-1349 In Progress
This commit is contained in:
Alexander.Likhachev
2023-08-16 17:58:34 +02:00
committed by Space Team
parent 357d12fc8e
commit ef0fb557a5
6 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/build.gradle.kts
+1
View File
@@ -23,6 +23,7 @@ dependencies {
testCompileOnly(project(":compiler:cli-common"))
testApi(projectTests(":compiler:tests-common"))
testApiJUnit5(jupiterParams = true)
testApi(libs.junit4)
testApi(protobufFull())
testApi(kotlinStdlib())
compiler/tests-spec/build.gradle.kts
+1 -1
View File
@@ -16,7 +16,7 @@ dependencies {
testRuntimeOnly(project(":core:descriptors.runtime"))
testApiJUnit5(vintageEngine = true)
testApiJUnit5(vintageEngine = true, jupiterParams = true)
}
sourceSets {
gradle/libs.versions.toml
+2 -1
View File
@@ -55,7 +55,8 @@ jdom2 = { module = "org.jdom:jdom2", version.ref = "jdom2" }
jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "jgit" }
junit4 = { module = "junit:junit", version.ref = "junit4" }
junit-bom = { module = "org.junit:junit-bom", version.ref = "junit5" }
junit-jupyter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit5" }
junit-jupyter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit5" }
junit-jupyter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5" }
junit-jupyter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit5" }
junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit5" }
junit-platform-commons = { module = "org.junit.platform:junit-platform-commons", version.ref = "junit-platform" }
gradle/verification-metadata.xml
-6
View File
@@ -4425,12 +4425,6 @@
<sha256 value="e20a5e78b1372f2a4e620832db4442d5077e5cbde280b24c666a3770844999bc" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.junit.jupiter" name="junit-jupiter" version="5.9.1">
<artifact name="junit-jupiter-5.9.1.jar">
<md5 value="f9e29d72f8e9dc363e63b77600fc430a" origin="Generated by Gradle"/>
<sha256 value="e305ce7b01adfcc89b4eee03bca473eeb68925a596d8ccca404a436344fc1965" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.junit.jupiter" name="junit-jupiter-api" version="5.0.0">
<artifact name="junit-jupiter-api-5.0.0.jar">
<md5 value="59468e20e8d8c03c17bd089659d26654" origin="Generated by Gradle"/>
plugins/pill/generate-all-tests/build.gradle.kts
+1 -1
View File
@@ -25,7 +25,7 @@ dependencies {
testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar"))
testRuntimeOnly(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.jupyter)
testRuntimeOnly(libs.junit.jupyter.engine)
if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
testRuntimeOnly(project(":core:descriptors.runtime"))
repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt
+2 -1
View File
@@ -202,7 +202,8 @@ fun Project.testApiJUnit5(
with(dependencies) {
val libsVersionCatalog = libsVersionCatalog
testApi(platform(libsVersionCatalog.findLibrary("junit-bom").orElseThrow { GradleException("No version for `junit-bom`") }))
testApi(libsVersionCatalog.findLibrary("junit-jupyter").orElseThrow { GradleException("No version for `junit-jupyter`") })
testApi(libsVersionCatalog.findLibrary("junit-jupyter-api").orElseThrow { GradleException("No version for `junit-jupyter-api`") })
testRuntimeOnly(libsVersionCatalog.findLibrary("junit-jupyter-engine").orElseThrow { GradleException("No version for `junit-jupyter-engine`") })
if (vintageEngine) {
testRuntimeOnly(
libsVersionCatalog.findLibrary("junit-vintage-engine")