Android Gradle Plugin 0.14.4 breaks Kotlin
#KT-6310 Fixed
This commit is contained in:
+4
-1
@@ -228,7 +228,10 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler): Plug
|
|||||||
javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(buildTypeSourceSet))
|
javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(buildTypeSourceSet))
|
||||||
kotlinTask.source(getExtention<KotlinSourceSet>(buildTypeSourceSet, "kotlin").getKotlin())
|
kotlinTask.source(getExtention<KotlinSourceSet>(buildTypeSourceSet, "kotlin").getKotlin())
|
||||||
}
|
}
|
||||||
javaSourceList.add(Callable<File?>{ variant.getProcessResources().getSourceOutputDir() })
|
|
||||||
|
for (resourceFolder in AndroidGradleWrapper.getRClassFolder(variant)) {
|
||||||
|
javaSourceList.add(Callable<File?>{ resourceFolder })
|
||||||
|
}
|
||||||
javaSourceList.add(Callable<File?>{ variant.getGenerateBuildConfig()?.getSourceOutputDir() })
|
javaSourceList.add(Callable<File?>{ variant.getGenerateBuildConfig()?.getSourceOutputDir() })
|
||||||
javaSourceList.add(Callable<File?>{ variant.getAidlCompile().getSourceOutputDir() })
|
javaSourceList.add(Callable<File?>{ variant.getAidlCompile().getSourceOutputDir() })
|
||||||
javaSourceList.add(Callable<File?>{ variant.getRenderscriptCompile().getSourceOutputDir() })
|
javaSourceList.add(Callable<File?>{ variant.getRenderscriptCompile().getSourceOutputDir() })
|
||||||
|
|||||||
+16
@@ -2,6 +2,8 @@ package org.jetbrains.kotlin.gradle.plugin.android
|
|||||||
|
|
||||||
import com.android.build.gradle.BasePlugin
|
import com.android.build.gradle.BasePlugin
|
||||||
import com.android.build.gradle.api.ApkVariant
|
import com.android.build.gradle.api.ApkVariant
|
||||||
|
import com.android.build.gradle.api.BaseVariant
|
||||||
|
import com.android.build.gradle.api.BaseVariantOutput
|
||||||
import org.gradle.api.tasks.util.PatternFilterable
|
import org.gradle.api.tasks.util.PatternFilterable
|
||||||
import org.jetbrains.annotations.NotNull
|
import org.jetbrains.annotations.NotNull
|
||||||
|
|
||||||
@@ -45,4 +47,18 @@ class AndroidGradleWrapper {
|
|||||||
static def List<String> getProductFlavorsNames(ApkVariant variant) {
|
static def List<String> getProductFlavorsNames(ApkVariant variant) {
|
||||||
return variant.getProductFlavors().iterator().collect { it.getName() }
|
return variant.getProductFlavors().iterator().collect { it.getName() }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
static def List<File> getRClassFolder(BaseVariant variant) {
|
||||||
|
def list = new ArrayList<File>()
|
||||||
|
if (variant.getMetaClass().getMetaMethod("getProcessResources")) {
|
||||||
|
list.add(variant.getProcessResources().getSourceOutputDir())
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
for (BaseVariantOutput variantOutput : variant.getOutputs()) {
|
||||||
|
list.add(variantOutput.processResources.sourceOutputDir)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return list
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user