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

[stdlib-mpp] Switch kotlin-stdlib project to multiplatform

Browse Source 
#KT-56106
This commit is contained in:
Ilya Gorbunov
2023-03-24 09:51:12 +01:00
committed by Space Team
parent fac620df0b
commit 34720f27d4
9 changed files with 63 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/BuildPropertiesExt.kt
+3
View File
@@ -59,3 +59,6 @@ val KotlinBuildProperties.useFirWithLightTree: Boolean
val KotlinBuildProperties.useFirTightIC: Boolean
get() = getBoolean("kotlin.build.useFirIC")
val KotlinBuildProperties.kotlinStdlibMpp: Boolean
get() = getBoolean("kotlin.stdlib.mpp")
repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt
+2 -2
View File
@@ -86,9 +86,9 @@ fun kotlinDep(artifactBaseName: String, version: String, classifier: String? = n
@JvmOverloads
fun Project.kotlinStdlib(suffix: String? = null, classifier: String? = null): Any {
return if (kotlinBuildProperties.useBootstrapStdlib)
kotlinDep(listOfNotNull("stdlib", suffix).joinToString("-"), bootstrapKotlinVersion, classifier)
kotlinDep(listOfNotNull("stdlib", suffix.takeUnless { kotlinBuildProperties.kotlinStdlibMpp && it == "mpp" }).joinToString("-"), bootstrapKotlinVersion, classifier)
else
dependencies.project(listOfNotNull(":kotlin-stdlib", suffix).joinToString("-"), classifier)
dependencies.project(listOfNotNull(":kotlin-stdlib", suffix.takeUnless { kotlinBuildProperties.kotlinStdlibMpp && it == "mpp" }).joinToString("-"), classifier)
}
fun Project.kotlinBuiltins(): Any = kotlinBuiltins(forJvm = false)