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

Revert "Force bootstrap stdlib in modules that used in composite build"

Browse Source 
This reverts commit ad76562c
This commit is contained in:
Nikolay Krasko
2020-04-27 15:58:38 +03:00
parent ad76562cbc
commit 4230a17427
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/dependencies.kt
+2 -2
View File
@@ -81,8 +81,8 @@ fun Project.ideaUltimatePreloadedDeps(vararg artifactBaseNames: String, subdir:
fun Project.kotlinDep(artifactBaseName: String, version: String, classifier: String? = null): String =
listOfNotNull("org.jetbrains.kotlin:kotlin-$artifactBaseName:$version", classifier).joinToString(":")
fun Project.kotlinStdlib(suffix: String? = null, classifier: String? = null, forceBootstrap: Boolean = false): Any {
return if (forceBootstrap || kotlinBuildProperties.useBootstrapStdlib)
fun Project.kotlinStdlib(suffix: String? = null, classifier: String? = null): Any {
return if (kotlinBuildProperties.useBootstrapStdlib)
kotlinDep(listOfNotNull("stdlib", suffix).joinToString("-"), bootstrapKotlinVersion, classifier)
else
dependencies.project(listOfNotNull(":kotlin-stdlib", suffix).joinToString("-"), classifier)