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

[Gradle, JS] Return binaries from ir target if it exists

Browse Source
This commit is contained in:
Ilya Goncharov
2020-02-13 17:31:37 +03:00
parent 2d900e2234
commit 703ceff9a3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTarget.kt
+4 -1
View File
@@ -96,11 +96,14 @@ constructor(
@Deprecated("Use produceExecutable instead", ReplaceWith("produceExecutable()")) @Deprecated("Use produceExecutable instead", ReplaceWith("produceExecutable()"))
override val binaries: KotlinJsBinaryContainer override val binaries: KotlinJsBinaryContainer
get() = project.objects.newInstance( get() {
return irTarget?.binaries
?: project.objects.newInstance(
KotlinJsBinaryContainer::class.java, KotlinJsBinaryContainer::class.java,
this, this,
WrapUtil.toDomainObjectSet(JsBinary::class.java) WrapUtil.toDomainObjectSet(JsBinary::class.java)
) )
}
var irTarget: KotlinJsIrTarget? = null var irTarget: KotlinJsIrTarget? = null