From cc58ee6b6f25e241139ad567019a9cef3979789f Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Wed, 11 Jun 2014 14:06:16 +0400 Subject: [PATCH] KT-5219 Kotlin build fails when using Android Gradle plugin 0.11 #KT-5219 Fixed --- .../jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 11 ++++++++--- 1 file changed, 8 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 de920727157..51298809d48 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 @@ -141,10 +141,15 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler): Plug val kotlinDirSet = kotlinSourceSet.getKotlin() kotlinDirSet.srcDir(project.file("src/${sourceSetName}/kotlin")) - AndroidGradleWrapper.srcDir(sourceSet, kotlinDirSet) - AndroidGradleWrapper.getResourceFilter(sourceSet)?.exclude(KSpec({ elem -> + + /*TODO: before 0.11 gradle android plugin there was: + sourceSet.getAllJava().source(kotlinDirSet) + sourceSet.getAllSource().source(kotlinDirSet) + AndroidGradleWrapper.getResourceFilter(sourceSet)?.exclude(KSpec({ elem -> kotlinDirSet.contains(elem.getFile()) - })) + })) + but those methods were removed so commented as temporary hack*/ + project.getLogger().debug("Created kotlin sourceDirectorySet at ${kotlinDirSet.getSrcDirs()}") } }