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

[Gradle, JS] In Ir target should configure Ir subtarget

Browse Source
This commit is contained in:
Ilya Goncharov
2020-01-27 16:29:41 +03:00
parent 831757018c
commit d33521052f
1 changed files with 3 additions and 4 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/ir/KotlinJsIrTarget.kt
+3 -4
View File
@@ -18,7 +18,6 @@ import org.jetbrains.kotlin.gradle.targets.js.KotlinJsProducingType
import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsIrBrowserDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsIrBrowserDsl
import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsIrNodeDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsIrNodeDsl
import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsIrTargetDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsIrTargetDsl
import org.jetbrains.kotlin.gradle.targets.js.subtargets.KotlinJsSubTarget
import org.jetbrains.kotlin.gradle.tasks.locateTask import org.jetbrains.kotlin.gradle.tasks.locateTask
import org.jetbrains.kotlin.gradle.testing.internal.KotlinTestReport import org.jetbrains.kotlin.gradle.testing.internal.KotlinTestReport
import org.jetbrains.kotlin.gradle.testing.testTaskName import org.jetbrains.kotlin.gradle.testing.testTaskName
@@ -99,7 +98,7 @@ open class KotlinJsIrTarget @Inject constructor(project: Project, platformType:
private fun produce( private fun produce(
producingType: KotlinJsProducingType, producingType: KotlinJsProducingType,
producer: KotlinJsSubTarget.() -> Unit producer: KotlinJsIrSubTarget.() -> Unit
) { ) {
check(this.producingType == null || this.producingType == producingType) { check(this.producingType == null || this.producingType == producingType) {
"Only one producing type supported. Try to set $producingType but previously ${this.producingType} found" "Only one producing type supported. Try to set $producingType but previously ${this.producingType} found"
@@ -108,11 +107,11 @@ open class KotlinJsIrTarget @Inject constructor(project: Project, platformType:
this.producingType = producingType this.producingType = producingType
whenBrowserConfigured { whenBrowserConfigured {
(this as KotlinJsSubTarget).producer() (this as KotlinJsIrSubTarget).producer()
} }
whenNodejsConfigured { whenNodejsConfigured {
(this as KotlinJsSubTarget).producer() (this as KotlinJsIrSubTarget).producer()
} }
} }