[Gradle, JS] Fix param name

^KT-39210 fixed
^KT-31669 fixed
This commit is contained in:
Ilya Goncharov
2020-05-28 17:15:43 +03:00
parent 9fd211cfcd
commit 1b841adfff
3 changed files with 6 additions and 6 deletions
@@ -125,7 +125,7 @@ internal class KotlinGradleBuildServices private constructor(
ManagementFactory.getGarbageCollectorMXBeans().sumByLong { max(0, it.collectionCount) } ManagementFactory.getGarbageCollectorMXBeans().sumByLong { max(0, it.collectionCount) }
private val multipleProjectsHolder = KotlinPluginInMultipleProjectsHolder( private val multipleProjectsHolder = KotlinPluginInMultipleProjectsHolder(
differentVersionsInDifferentProject = true trackPluginVersionsSeparately = true
) )
@Synchronized @Synchronized
@@ -9,7 +9,7 @@ import org.gradle.api.Project
import org.gradle.api.plugins.ExtraPropertiesExtension import org.gradle.api.plugins.ExtraPropertiesExtension
internal class KotlinPluginInMultipleProjectsHolder( internal class KotlinPluginInMultipleProjectsHolder(
private val differentVersionsInDifferentProject: Boolean private val trackPluginVersionsSeparately: Boolean
) { ) {
private var loadedInProjectPath: String? = null private var loadedInProjectPath: String? = null
@@ -18,7 +18,7 @@ internal class KotlinPluginInMultipleProjectsHolder(
kotlinPluginVersion: String? = null, kotlinPluginVersion: String? = null,
onRegister: () -> Unit = {} onRegister: () -> Unit = {}
) { ) {
require(differentVersionsInDifferentProject == (kotlinPluginVersion != null)) require(trackPluginVersionsSeparately == (kotlinPluginVersion != null))
val projectPath = project.path val projectPath = project.path
@@ -42,7 +42,7 @@ internal class KotlinPluginInMultipleProjectsHolder(
project: Project, project: Project,
kotlinPluginVersion: String? = null kotlinPluginVersion: String? = null
): Boolean { ): Boolean {
require(differentVersionsInDifferentProject == (kotlinPluginVersion != null)) require(trackPluginVersionsSeparately == (kotlinPluginVersion != null))
return getAffectedProjects(project, kotlinPluginVersion)?.let { return getAffectedProjects(project, kotlinPluginVersion)?.let {
it.size > 1 it.size > 1
} ?: false } ?: false
@@ -52,7 +52,7 @@ internal class KotlinPluginInMultipleProjectsHolder(
project: Project, project: Project,
kotlinPluginVersion: String? = null kotlinPluginVersion: String? = null
): List<String>? { ): List<String>? {
require(differentVersionsInDifferentProject == (kotlinPluginVersion != null)) require(trackPluginVersionsSeparately == (kotlinPluginVersion != null))
val ext = getExt(project) val ext = getExt(project)
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.gradle.plugin.MULTIPLE_KOTLIN_PLUGINS_LOADED_WARNING
internal class MultiplePluginDeclarationDetector internal class MultiplePluginDeclarationDetector
private constructor() { private constructor() {
private val pluginInMultipleProjectsHolder = KotlinPluginInMultipleProjectsHolder( private val pluginInMultipleProjectsHolder = KotlinPluginInMultipleProjectsHolder(
differentVersionsInDifferentProject = false trackPluginVersionsSeparately = false
) )
fun detect(project: Project) { fun detect(project: Project) {