Skip to content

Commit 9b0f872

Browse files
Gradle plugin: unable to build project in multi flavor environment with gradle 0.11+
#KT-5348 Fixed (cherry picked from commit 09e8d0d)
1 parent 1d650bf commit 9b0f872

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,8 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler): Plug
234234
javaSourceList.add(Callable<File?>{ variant.getRenderscriptCompile().getSourceOutputDir() })
235235

236236
if (variant is ApkVariant) {
237-
for (flavour in variant.getProductFlavors().iterator()) {
238-
val flavourSourceSetName = buildTypeSourceSetName + flavour.getName()
237+
for (flavourName in AndroidGradleWrapper.getProductFlavorsNames(variant)) {
238+
val flavourSourceSetName = buildTypeSourceSetName + flavourName
239239
val flavourSourceSet : AndroidSourceSet? = sourceSets.findByName(flavourSourceSetName)
240240
if (flavourSourceSet != null) {
241241
javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(flavourSourceSet))

libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.jetbrains.kotlin.gradle.plugin.android
22

33
import com.android.build.gradle.BasePlugin
4+
import com.android.build.gradle.api.ApkVariant
45
import org.gradle.api.tasks.util.PatternFilterable
56
import org.jetbrains.annotations.NotNull
67

@@ -39,4 +40,9 @@ class AndroidGradleWrapper {
3940
static def Set<File> getJavaSrcDirs(Object androidSourceSet) {
4041
return androidSourceSet.getJava().getSrcDirs()
4142
}
43+
44+
@NotNull
45+
static def List<String> getProductFlavorsNames(ApkVariant variant) {
46+
return variant.getProductFlavors().iterator().collect { it.getName() }
47+
}
4248
}

0 commit comments

Comments
 (0)