diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt index 9ea2807c6fe..fff1e5012c4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt @@ -125,7 +125,7 @@ internal class KotlinGradleBuildServices private constructor( ManagementFactory.getGarbageCollectorMXBeans().sumByLong { max(0, it.collectionCount) } private val multipleProjectsHolder = KotlinPluginInMultipleProjectsHolder( - differentVersionsInDifferentProject = true + trackPluginVersionsSeparately = true ) @Synchronized 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 276b6d419e7..2965d6628b0 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 @@ -9,7 +9,7 @@ import org.gradle.api.Project import org.gradle.api.plugins.ExtraPropertiesExtension internal class KotlinPluginInMultipleProjectsHolder( - private val differentVersionsInDifferentProject: Boolean + private val trackPluginVersionsSeparately: Boolean ) { private var loadedInProjectPath: String? = null @@ -18,7 +18,7 @@ internal class KotlinPluginInMultipleProjectsHolder( kotlinPluginVersion: String? = null, onRegister: () -> Unit = {} ) { - require(differentVersionsInDifferentProject == (kotlinPluginVersion != null)) + require(trackPluginVersionsSeparately == (kotlinPluginVersion != null)) val projectPath = project.path @@ -42,7 +42,7 @@ internal class KotlinPluginInMultipleProjectsHolder( project: Project, kotlinPluginVersion: String? = null ): Boolean { - require(differentVersionsInDifferentProject == (kotlinPluginVersion != null)) + require(trackPluginVersionsSeparately == (kotlinPluginVersion != null)) return getAffectedProjects(project, kotlinPluginVersion)?.let { it.size > 1 } ?: false @@ -52,7 +52,7 @@ internal class KotlinPluginInMultipleProjectsHolder( project: Project, kotlinPluginVersion: String? = null ): List? { - require(differentVersionsInDifferentProject == (kotlinPluginVersion != null)) + require(trackPluginVersionsSeparately == (kotlinPluginVersion != null)) val ext = getExt(project) 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 index 1262ebdd4cc..61e9776aeb0 100644 --- 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 @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.gradle.plugin.MULTIPLE_KOTLIN_PLUGINS_LOADED_WARNING internal class MultiplePluginDeclarationDetector private constructor() { private val pluginInMultipleProjectsHolder = KotlinPluginInMultipleProjectsHolder( - differentVersionsInDifferentProject = false + trackPluginVersionsSeparately = false ) fun detect(project: Project) {