From 78bc15222b0fcd2cedf40da61377d63c439a48bd Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Wed, 5 Nov 2014 16:13:50 +0300 Subject: [PATCH] Gradle plugin: fix sourceSets for flavors (android) --- .../jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index b86cf6e2fe1..69ffeac6bbb 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -235,11 +235,17 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler): Plug if (variant is ApkVariant) { for (flavourName in AndroidGradleWrapper.getProductFlavorsNames(variant)) { - val flavourSourceSetName = buildTypeSourceSetName + flavourName - val flavourSourceSet : AndroidSourceSet? = sourceSets.findByName(flavourSourceSetName) + val defaultFlavourSourceSetName = flavourName + buildTypeSourceSetName.capitalize() + val defaultFlavourSourceSet = sourceSets.findByName(defaultFlavourSourceSetName) + if (defaultFlavourSourceSet != null) { + javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(defaultFlavourSourceSet)) + kotlinTask.source(getExtention(defaultFlavourSourceSet, "kotlin").getKotlin()) + } + + val flavourSourceSet = sourceSets.findByName(flavourName) if (flavourSourceSet != null) { javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(flavourSourceSet)) - kotlinTask.source((buildTypeSourceSet as ExtensionAware).getExtensions().getByName("kotlin")) + kotlinTask.source(getExtention(flavourSourceSet, "kotlin").getKotlin()) } } }