From 59c2bc25d536a2368c83b47d2cd31feaaea40e49 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 28 May 2020 11:28:07 +0300 Subject: [PATCH] [Gradle, JS] Detect multiple plugins for NodeJsRootPlugin and YarnPlugin ^KT-39210 fixed ^KT-31669 fixed --- .../KotlinPluginInMultipleProjectsHolder.kt | 2 +- .../js/MultiplePluginDeclarationDetector.kt | 25 +++++++++++++++++++ .../targets/js/ir/KotlinJsIrSubTarget.kt | 21 +++------------- .../targets/js/nodejs/NodeJsRootPlugin.kt | 3 +++ .../js/subtargets/KotlinJsSubTarget.kt | 21 +++------------- .../gradle/targets/js/yarn/YarnPlugin.kt | 3 +++ 6 files changed, 40 insertions(+), 35 deletions(-) create mode 100644 libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/MultiplePluginDeclarationDetector.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginInMultipleProjectsHolder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginInMultipleProjectsHolder.kt index beacfdc3936..276b6d419e7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginInMultipleProjectsHolder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginInMultipleProjectsHolder.kt @@ -24,7 +24,7 @@ internal class KotlinPluginInMultipleProjectsHolder( val loadedInProjectsPropertyName = getPropertyName(kotlinPluginVersion) - if (!differentVersionsInDifferentProject || loadedInProjectPath == null) { + if (loadedInProjectPath == null) { loadedInProjectPath = projectPath val ext = project.rootProject.extensions.getByType(ExtraPropertiesExtension::class.java) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/MultiplePluginDeclarationDetector.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/MultiplePluginDeclarationDetector.kt new file mode 100644 index 00000000000..5e9d4c6da77 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/MultiplePluginDeclarationDetector.kt @@ -0,0 +1,25 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.targets.js + +import org.gradle.api.Project +import org.jetbrains.kotlin.gradle.plugin.KotlinPluginInMultipleProjectsHolder +import org.jetbrains.kotlin.gradle.plugin.MULTIPLE_KOTLIN_PLUGINS_LOADED_WARNING + +internal object MultiplePluginDeclarationDetector { + private val pluginInMultipleProjectsHolder = KotlinPluginInMultipleProjectsHolder( + differentVersionsInDifferentProject = false + ) + + fun detect(project: Project) { + pluginInMultipleProjectsHolder + .addProject(project) + + if (pluginInMultipleProjectsHolder.isInMultipleProjects(project)) { + error(MULTIPLE_KOTLIN_PLUGINS_LOADED_WARNING) + } + } +} \ No newline at end of file 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 21e51561668..e34ecb2cc07 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 @@ -10,7 +10,10 @@ import org.gradle.api.Task import org.gradle.api.plugins.ExtensionAware import org.gradle.api.tasks.TaskProvider import org.gradle.language.base.plugins.LifecycleBasePlugin -import org.jetbrains.kotlin.gradle.plugin.* +import org.jetbrains.kotlin.gradle.plugin.AbstractKotlinTargetConfigurator +import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation +import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTests +import org.jetbrains.kotlin.gradle.plugin.whenEvaluated import org.jetbrains.kotlin.gradle.targets.js.KotlinJsPlatformTestRun import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBinaryType import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetDsl @@ -29,22 +32,6 @@ abstract class KotlinJsIrSubTarget( ) : KotlinJsSubTargetDsl { val project get() = target.project - init { - val kotlinPluginInMultipleProjectsHolder = KotlinPluginInMultipleProjectsHolder( - differentVersionsInDifferentProject = false - ) - - val anyProjectAffected = kotlinPluginInMultipleProjectsHolder.getAffectedProjects(project) - ?.isNotEmpty() ?: false - - if (anyProjectAffected) { - error(MULTIPLE_KOTLIN_PLUGINS_LOADED_WARNING) - } - - kotlinPluginInMultipleProjectsHolder - .addProject(project) - } - private val nodeJs = NodeJsRootPlugin.apply(project.rootProject) abstract val testTaskDescription: String diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt index f0486c2e596..05481076d26 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.gradle.targets.js.nodejs import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.plugins.BasePlugin +import org.jetbrains.kotlin.gradle.targets.js.MultiplePluginDeclarationDetector import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension.Companion.EXTENSION_NAME import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin @@ -15,6 +16,8 @@ import org.jetbrains.kotlin.gradle.tasks.CleanDataTask open class NodeJsRootPlugin : Plugin { override fun apply(project: Project): Unit = project.run { + MultiplePluginDeclarationDetector.detect(project) + project.plugins.apply(BasePlugin::class.java) check(project == project.rootProject) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt index 49f8d9d3839..10d081cfc46 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt @@ -10,8 +10,11 @@ import org.gradle.api.Task import org.gradle.api.plugins.ExtensionAware import org.gradle.api.tasks.TaskProvider import org.gradle.language.base.plugins.LifecycleBasePlugin -import org.jetbrains.kotlin.gradle.plugin.* +import org.jetbrains.kotlin.gradle.plugin.AbstractKotlinTargetConfigurator +import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation +import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTests import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation +import org.jetbrains.kotlin.gradle.plugin.whenEvaluated import org.jetbrains.kotlin.gradle.targets.js.KotlinJsPlatformTestRun import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetDsl @@ -31,22 +34,6 @@ abstract class KotlinJsSubTarget( ) : KotlinJsSubTargetDsl { val project get() = target.project - init { - val kotlinPluginInMultipleProjectsHolder = KotlinPluginInMultipleProjectsHolder( - differentVersionsInDifferentProject = false - ) - - val anyProjectAffected = kotlinPluginInMultipleProjectsHolder.getAffectedProjects(project) - ?.isNotEmpty() ?: false - - if (anyProjectAffected) { - error(MULTIPLE_KOTLIN_PLUGINS_LOADED_WARNING) - } - - kotlinPluginInMultipleProjectsHolder - .addProject(project) - } - private val nodeJs = NodeJsRootPlugin.apply(project.rootProject) abstract val testTaskDescription: String diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt index d53923ea9e2..a038a72dfb4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.gradle.targets.js.yarn import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.plugins.BasePlugin +import org.jetbrains.kotlin.gradle.targets.js.MultiplePluginDeclarationDetector import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.RootPackageJsonTask @@ -15,6 +16,8 @@ import org.jetbrains.kotlin.gradle.tasks.CleanDataTask open class YarnPlugin : Plugin { override fun apply(project: Project): Unit = project.run { + MultiplePluginDeclarationDetector.detect(project) + check(project == project.rootProject) { "YarnPlugin can be applied only to root project" }