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

[stdlib-mpp] Cleanup kotlin.stdlib.mpp build flag (always true)

Browse Source
This commit is contained in:
Ilya Gorbunov
2023-08-04 15:04:26 +02:00
committed by Space Team
parent 00fa09dbf3
commit 222f996d45
10 changed files with 10 additions and 24 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,6 +59,3 @@ 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
@@ -56,9 +56,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.takeUnless { kotlinBuildProperties.kotlinStdlibMpp && it == "mpp" }).joinToString("-"), bootstrapKotlinVersion, classifier)
kotlinDep(listOfNotNull("stdlib", suffix).joinToString("-"), bootstrapKotlinVersion, classifier)
else
dependencies.project(listOfNotNull(":kotlin-stdlib", suffix.takeUnless { kotlinBuildProperties.kotlinStdlibMpp && it == "mpp" }).joinToString("-"), classifier)
dependencies.project(listOfNotNull(":kotlin-stdlib", suffix).joinToString("-"), classifier)
}
fun Project.kotlinBuiltins(): Any = kotlinBuiltins(forJvm = false)