diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt index 72268325893..dd580258f1c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.gradle.targets.js.ir -import org.gradle.api.NamedDomainObjectContainer import org.gradle.api.Task import org.gradle.api.plugins.BasePluginConvention import org.gradle.api.tasks.Copy @@ -30,8 +29,6 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) : private val commonRunConfigurations: MutableList Unit> = mutableListOf() private val distribution: Distribution = BrowserDistribution() - private lateinit var buildVariants: NamedDomainObjectContainer - override val testTaskDescription: String get() = "Run all ${target.name} tests inside browser using karma and webpack" @@ -197,20 +194,7 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) : BuildVariantKind.DEVELOPMENT -> debugValue } - override fun configureBuildVariants() { - buildVariants = project.container(BuildVariant::class.java) - buildVariants.create(PRODUCTION) { - it.kind = BuildVariantKind.PRODUCTION - } - buildVariants.create(DEVELOPMENT) { - it.kind = BuildVariantKind.DEVELOPMENT - } - } - companion object { - const val PRODUCTION = "production" - const val DEVELOPMENT = "development" - private const val WEBPACK_TASK_NAME = "webpack" private const val DISTRIBUTE_RESOURCES_TASK_NAME = "distributeResources" private const val DISTRIBUTION_TASK_NAME = "distribution" diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt index 1ce30b711f9..3c59620aed8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt @@ -39,7 +39,6 @@ abstract class KotlinJsIrSubTarget( internal fun configure() { NpmResolverPlugin.apply(project) - configureBuildVariants() configureTests() target.compilations.all { @@ -63,8 +62,6 @@ abstract class KotlinJsIrSubTarget( protected fun disambiguateCamelCased(vararg names: String): String = lowerCamelCaseName(target.disambiguationClassifier, disambiguationClassifier, *names) - abstract fun configureBuildVariants() - private fun configureTests() { testRuns = project.container(KotlinJsPlatformTestRun::class.java) { name -> KotlinJsPlatformTestRun(name, target) }.also { (this as ExtensionAware).extensions.add(this::testRuns.name, it) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt index 5182e0564cc..8563759a29d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt @@ -47,7 +47,4 @@ open class KotlinNodeJsIr @Inject constructor(target: KotlinJsIrTarget) : val assembleTask = project.tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME) assembleTask.dependsOn(productionExecutable.linkTask) } - - override fun configureBuildVariants() { - } } \ No newline at end of file