azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gradle plugin: fix sourceSets for flavors (android)

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-11-05 16:13:50 +03:00
parent 586d48f91e
commit 78bc15222b
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+9 -3
View File
@@ -235,11 +235,17 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler): Plug
if (variant is ApkVariant) { if (variant is ApkVariant) {
for (flavourName in AndroidGradleWrapper.getProductFlavorsNames(variant)) { for (flavourName in AndroidGradleWrapper.getProductFlavorsNames(variant)) {
val flavourSourceSetName = buildTypeSourceSetName + flavourName val defaultFlavourSourceSetName = flavourName + buildTypeSourceSetName.capitalize()
val flavourSourceSet : AndroidSourceSet? = sourceSets.findByName(flavourSourceSetName) val defaultFlavourSourceSet = sourceSets.findByName(defaultFlavourSourceSetName)
if (defaultFlavourSourceSet != null) {
javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(defaultFlavourSourceSet))
kotlinTask.source(getExtention<KotlinSourceSet>(defaultFlavourSourceSet, "kotlin").getKotlin())
}
val flavourSourceSet = sourceSets.findByName(flavourName)
if (flavourSourceSet != null) { if (flavourSourceSet != null) {
javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(flavourSourceSet)) javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(flavourSourceSet))
kotlinTask.source((buildTypeSourceSet as ExtensionAware).getExtensions().getByName("kotlin")) kotlinTask.source(getExtention<KotlinSourceSet>(flavourSourceSet, "kotlin").getKotlin())
} }
} }
} }