KT-55700: fix kotlin-test-sources.jar in compiler lib
to contain both jvm and common parts as it is made for maven artifacts distribution
This commit is contained in:
committed by
Space Team
parent
607b8f6b61
commit
3cb0d489bf
@@ -142,6 +142,14 @@ val combinedSourcesJar by tasks.registering(Jar::class) {
|
||||
}
|
||||
}
|
||||
|
||||
val combinedJvmSourcesJar by configurations.creating {
|
||||
isCanBeConsumed = true
|
||||
isCanBeResolved = false
|
||||
}
|
||||
|
||||
artifacts {
|
||||
add(combinedJvmSourcesJar.name, combinedSourcesJar)
|
||||
}
|
||||
|
||||
val rootComponent = componentFactory.adhoc("root").apply {
|
||||
addVariantsFromConfiguration(jvmApi) {
|
||||
|
||||
@@ -126,7 +126,6 @@ val distSourcesProjects = listOfNotNull(
|
||||
":kotlin-test:kotlin-test-js".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
|
||||
":kotlin-test:kotlin-test-junit",
|
||||
":kotlin-test:kotlin-test-junit5",
|
||||
":kotlin-test:kotlin-test-jvm",
|
||||
":kotlin-test:kotlin-test-testng"
|
||||
)
|
||||
|
||||
@@ -173,6 +172,8 @@ dependencies {
|
||||
sources(project(it, configuration = "sources"))
|
||||
}
|
||||
|
||||
sources(project(":kotlin-test", "combinedJvmSourcesJar"))
|
||||
|
||||
sources(kotlinStdlib("jdk7", classifier = "sources"))
|
||||
sources(kotlinStdlib("jdk8", classifier = "sources"))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user