[Gradle, JS] Commonize producing for js targets
This commit is contained in:
+10
-8
@@ -124,22 +124,24 @@ constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun produceKotlinLibrary() {
|
override fun produceKotlinLibrary() {
|
||||||
whenBrowserConfigured {
|
produce {
|
||||||
(this as KotlinJsSubTarget).produceKotlinLibrary()
|
produceKotlinLibrary()
|
||||||
}
|
|
||||||
|
|
||||||
whenNodejsConfigured {
|
|
||||||
(this as KotlinJsSubTarget).produceKotlinLibrary()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun produceExecutable() {
|
override fun produceExecutable() {
|
||||||
|
produce {
|
||||||
|
produceExecutable()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun produce(producer: KotlinJsSubTarget.() -> Unit) {
|
||||||
whenBrowserConfigured {
|
whenBrowserConfigured {
|
||||||
(this as KotlinJsSubTarget).produceExecutable()
|
(this as KotlinJsSubTarget).producer()
|
||||||
}
|
}
|
||||||
|
|
||||||
whenNodejsConfigured {
|
whenNodejsConfigured {
|
||||||
(this as KotlinJsSubTarget).produceExecutable()
|
(this as KotlinJsSubTarget).producer()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+11
-8
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.gradle.targets.js.KotlinJsIrReportAggregatingTestRun
|
|||||||
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
|
||||||
@@ -82,22 +83,24 @@ open class KotlinJsIrTarget @Inject constructor(project: Project, platformType:
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun produceKotlinLibrary() {
|
override fun produceKotlinLibrary() {
|
||||||
whenBrowserConfigured {
|
produce {
|
||||||
(this as KotlinJsIrSubTarget).produceKotlinLibrary()
|
produceKotlinLibrary()
|
||||||
}
|
|
||||||
|
|
||||||
whenNodejsConfigured {
|
|
||||||
(this as KotlinJsIrSubTarget).produceKotlinLibrary()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun produceExecutable() {
|
override fun produceExecutable() {
|
||||||
|
produce {
|
||||||
|
produceExecutable()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun produce(producer: KotlinJsSubTarget.() -> Unit) {
|
||||||
whenBrowserConfigured {
|
whenBrowserConfigured {
|
||||||
(this as KotlinJsIrSubTarget).produceExecutable()
|
(this as KotlinJsSubTarget).producer()
|
||||||
}
|
}
|
||||||
|
|
||||||
whenNodejsConfigured {
|
whenNodejsConfigured {
|
||||||
(this as KotlinJsIrSubTarget).produceExecutable()
|
(this as KotlinJsSubTarget).producer()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user