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

Disable kotlinMetadata compilation for js-ir-minimal-for-test

Browse Source 
Use more convenient way to specify dependency on source syncing tasks.
This commit is contained in:
Ilya Gorbunov
2020-05-13 11:47:30 +03:00
parent bcf277d885
commit 46b0784508
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts
+11 -7
View File
@@ -94,15 +94,15 @@ val jsMainSources by task<Sync> {
kotlin { kotlin {
sourceSets { sourceSets {
val commonMain by getting { val commonMain by getting {
kotlin.srcDir(commonMainSources.get().destinationDir) kotlin.srcDir(files(commonMainSources.map { it.destinationDir }))
} }
val jsMain by getting { val jsMain by getting {
kotlin.srcDir(jsMainSources.get().destinationDir) kotlin.srcDir(files(jsMainSources.map { it.destinationDir }))
} }
} }
} }
tasks.withType<KotlinCompile<*>>().configureEach { tasks.withType<KotlinCompile<*>> {
kotlinOptions.freeCompilerArgs += listOf( kotlinOptions.freeCompilerArgs += listOf(
"-Xallow-kotlin-package", "-Xallow-kotlin-package",
"-Xallow-result-return-type", "-Xallow-result-return-type",
@@ -116,8 +116,12 @@ tasks.withType<KotlinCompile<*>>().configureEach {
) )
} }
tasks.named("compileKotlinJs") { tasks {
(this as KotlinCompile<*>).kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin" compileKotlinMetadata {
dependsOn(commonMainSources) enabled = false
dependsOn(jsMainSources) }
named("compileKotlinJs", KotlinCompile::class) {
kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin"
}
} }
libraries/stdlib/js-ir/build.gradle.kts
+7 -14
View File
@@ -105,22 +105,22 @@ val jsTestSources by task<Sync> {
kotlin { kotlin {
sourceSets { sourceSets {
val commonMain by getting { val commonMain by getting {
kotlin.srcDir(commonMainSources.get().destinationDir) kotlin.srcDir(files(commonMainSources.map { it.destinationDir }))
} }
val jsMain by getting { val jsMain by getting {
kotlin.srcDir(jsMainSources.get().destinationDir) kotlin.srcDir(files(jsMainSources.map { it.destinationDir }))
} }
val commonTest by getting { val commonTest by getting {
dependencies { dependencies {
api(project(":kotlin-test:kotlin-test-js-ir")) api(project(":kotlin-test:kotlin-test-js-ir"))
} }
kotlin.srcDir(commonTestSources.get().destinationDir) kotlin.srcDir(files(commonTestSources.map { it.destinationDir }))
} }
val jsTest by getting { val jsTest by getting {
dependencies { dependencies {
api(project(":kotlin-test:kotlin-test-js-ir")) api(project(":kotlin-test:kotlin-test-js-ir"))
} }
kotlin.srcDir(jsTestSources.get().destinationDir) kotlin.srcDir(files(jsTestSources.map { it.destinationDir }))
} }
} }
} }
@@ -139,19 +139,12 @@ tasks.withType<KotlinCompile<*>>().configureEach {
) )
} }
tasks.named("compileKotlinJs") { val compileKotlinJs by tasks.existing(KotlinCompile::class) {
(this as KotlinCompile<*>).kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin" kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin"
dependsOn(commonMainSources)
dependsOn(jsMainSources)
}
tasks.named("compileTestKotlinJs") {
dependsOn(commonTestSources)
dependsOn(jsTestSources)
} }
val packFullRuntimeKLib by tasks.registering(Jar::class) { val packFullRuntimeKLib by tasks.registering(Jar::class) {
dependsOn(tasks.named("compileKotlinJs")) dependsOn(compileKotlinJs)
from(buildDir.resolve("classes/kotlin/js/main")) from(buildDir.resolve("classes/kotlin/js/main"))
destinationDirectory.set(rootProject.buildDir.resolve("js-ir-runtime")) destinationDirectory.set(rootProject.buildDir.resolve("js-ir-runtime"))
archiveFileName.set("full-runtime.klib") archiveFileName.set("full-runtime.klib")