From e6670d439f0f0598f4587f8dc49a5e93f4708840 Mon Sep 17 00:00:00 2001 From: Yaroslav Chernyshev Date: Tue, 21 Jul 2020 18:17:37 +0300 Subject: [PATCH] Small renaming `classifier` -> `disambiguationClassifier` --- idea/kotlin-gradle-tooling/src/KotlinTasksPropertyUtils.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/kotlin-gradle-tooling/src/KotlinTasksPropertyUtils.kt b/idea/kotlin-gradle-tooling/src/KotlinTasksPropertyUtils.kt index c6eb798a3a2..3cad2c2031a 100644 --- a/idea/kotlin-gradle-tooling/src/KotlinTasksPropertyUtils.kt +++ b/idea/kotlin-gradle-tooling/src/KotlinTasksPropertyUtils.kt @@ -60,12 +60,12 @@ private fun Task.getIsIncremental(): Boolean? { return null } -private fun Task.getPureKotlinSourceRoots(sourceSet: String, classifier: String? = null): List? { +private fun Task.getPureKotlinSourceRoots(sourceSet: String, disambiguationClassifier: String? = null): List? { try { val kotlinExtensionClass = project.extensions.findByType(javaClass.classLoader.loadClass(kotlinProjectExtensionClass)) val getKotlinMethod = javaClass.classLoader.loadClass(kotlinSourceSetClass).getMethod("getKotlin") val kotlinSourceSet = (kotlinExtensionClass?.javaClass?.getMethod("getSourceSets")?.invoke(kotlinExtensionClass) - as? FactoryNamedDomainObjectContainer)?.asMap?.get(compilationFullName(sourceSet, classifier)) ?: return null + as? FactoryNamedDomainObjectContainer)?.asMap?.get(compilationFullName(sourceSet, disambiguationClassifier)) ?: return null val javaSourceSet = (project.convention.getPlugin(JavaPluginConvention::class.java) as JavaPluginConvention).sourceSets.asMap[sourceSet] val pureJava = javaSourceSet?.java?.srcDirs