[stdlib-mpp] Use kotlin-stdlib-common artifact for dist from kotlin-stdlib project

This commit is contained in:
Ilya Gorbunov
2023-07-21 06:05:07 +02:00
committed by Space Team
parent 3e4cbd6dd2
commit 7ae443ad7f
+12 -4
View File
@@ -203,6 +203,8 @@ dependencies {
if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
sources(kotlinStdlib(classifier = "sources"))
sources("org.jetbrains.kotlin:kotlin-reflect:$bootstrapKotlinVersion:sources")
distCommonContents(kotlinStdlib(classifier = "common"))
distCommonContents(kotlinStdlib(classifier = "common-sources"))
} else {
sources(project(":kotlin-stdlib", configuration = "distSources"))
sources(project(":kotlin-stdlib", configuration = "distJsSourcesJar"))
@@ -213,10 +215,10 @@ dependencies {
distJSContents(project(":kotlin-stdlib", configuration = "distJsContent"))
distJSContents(project(":kotlin-test:kotlin-test-js", configuration = "distJs"))
}
distCommonContents(kotlinStdlib(suffix = "common"))
distCommonContents(kotlinStdlib(suffix = "common", classifier = "sources"))
distCommonContents(project(":kotlin-stdlib", configuration = "commonMainMetadataElements"))
distCommonContents(project(":kotlin-stdlib", configuration = "metadataSourcesElements"))
}
distMavenContents(kotlinStdlib(classifier = "sources"))
@@ -425,7 +427,13 @@ val distKotlinc = distTask<Sync>("distKotlinc") {
val distCommon = distTask<Sync>("distCommon") {
destinationDir = File("$distDir/common")
from(distCommonContents)
from(distCommonContents) {
rename { name ->
name
.replace("-metadata.jar", "-common.jar")
.replace("-metadata-sources.jar", "-common-sources.jar")
}
}
}
val distMaven = distTask<Sync>("distMaven") {