Workarounds to build parts of stdlib as kotlin-runtime and mock runtime

Fix source paths of kotlin-stdlib-minimal-for-tests
This commit is contained in:
Ilya Gorbunov
2018-01-25 22:47:38 +03:00
parent 7c74083f09
commit 23d0e5f2e1
8 changed files with 26 additions and 11 deletions
@@ -23,16 +23,19 @@ sourceSets {
}
val copySources by task<Copy> {
from(project(":kotlin-stdlib").projectDir.resolve("jvm/runtime"))
.include("kotlin/TypeAliases.kt",
"kotlin/text/TypeAliases.kt")
from(project(":kotlin-stdlib").projectDir.resolve("src"))
.include("kotlin/collections/TypeAliases.kt",
"kotlin/jvm/JvmVersion.kt",
"kotlin/util/Standard.kt",
"kotlin/internal/Annotations.kt",
"kotlin/internal/contracts/ContractBuilder.kt",
"kotlin/internal/contracts/Effect.kt")
val stdlibProjectDir = project(":kotlin-stdlib").projectDir
from(stdlibProjectDir.resolve("runtime"))
.include("kotlin/TypeAliases.kt",
"kotlin/text/TypeAliases.kt")
from(stdlibProjectDir.resolve("src"))
.include("kotlin/collections/TypeAliases.kt",
"kotlin/jvm/JvmVersion.kt")
from(stdlibProjectDir.resolve("../src"))
.include("kotlin/util/Standard.kt",
"kotlin/internal/Annotations.kt",
"kotlin/internal/contracts/ContractBuilder.kt",
"kotlin/internal/contracts/Effect.kt")
into(File(buildDir, "src"))
}
@@ -44,7 +47,7 @@ tasks.withType<JavaCompile> {
tasks.withType<KotlinCompile> {
dependsOn(copySources)
kotlinOptions {
freeCompilerArgs += listOf("-module-name", "kotlin-stdlib")
freeCompilerArgs += listOf("-module-name", "kotlin-stdlib", "-Xmulti-platform")
}
}