From 333bb4da50d0583672b0fc2e6c8fb6bfc3642545 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 6 Feb 2020 12:19:01 +0300 Subject: [PATCH] [Gradle, JS] Remove redundant delegation --- .../gradle/targets/js/subtargets/KotlinBrowserJs.kt | 9 --------- .../kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt | 2 -- 2 files changed, 11 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt index ed334caf21e..98078647dfe 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt @@ -60,29 +60,20 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : override fun runTask(body: KotlinWebpack.() -> Unit) { commonRunConfigurations.add(body) - irBrowser?.runTask(body) } @ExperimentalDistributionDsl override fun distribution(body: Distribution.() -> Unit) { distribution.body() - target.irTarget?.browser?.distribution(body) } override fun webpackTask(body: KotlinWebpack.() -> Unit) { commonWebpackConfigurations.add(body) - irBrowser?.webpackTask(body) } @ExperimentalDceDsl override fun dceTask(body: KotlinJsDce.() -> Unit) { dceConfigurations.add(body) - irBrowser?.dceTask(body) - } - - override fun testTask(body: KotlinJsTest.() -> Unit) { - super.testTask(body) - irBrowser?.testTask(body) } override fun configureMain(compilation: KotlinJsCompilation) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt index c53bb248836..5d64382388a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt @@ -31,12 +31,10 @@ open class KotlinNodeJs @Inject constructor(target: KotlinJsTarget) : override fun runTask(body: NodeJsExec.() -> Unit) { (project.tasks.getByName(runTaskName) as NodeJsExec).body() - irNodejs?.runTask(body) } override fun testTask(body: KotlinJsTest.() -> Unit) { super.testTask(body) - irNodejs?.testTask(body) } override fun configureDefaultTestFramework(testTask: KotlinJsTest) {