Support com.android.tools.build.gradle 1.3.0-beta1

#KT-7884 Fixed
This commit is contained in:
Natalia Ukhorskaya
2015-06-01 13:11:21 +03:00
parent 31db945110
commit 1334f0352b
2 changed files with 13 additions and 2 deletions
@@ -370,6 +370,10 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t
logger.kotlinDebug("Process variant [$variantDataName]")
val javaTask = AndroidGradleWrapper.getJavaCompile(variantData)
if (javaTask == null) {
logger.info("KOTLIN: javaTask is missing for $variantDataName, so Kotlin files won't be compiled for it")
continue
}
val kotlinTaskName = "compile${variantDataName.capitalize()}Kotlin"
val kotlinTask = tasksProvider.createKotlinJVMTask(project, kotlinTaskName)
@@ -9,6 +9,7 @@ import org.gradle.api.internal.DefaultDomainObjectSet
import org.gradle.api.tasks.compile.AbstractCompile
import org.gradle.api.tasks.util.PatternFilterable
import org.jetbrains.annotations.NotNull
import org.jetbrains.annotations.Nullable
class AndroidGradleWrapper {
static def getRuntimeJars(BasePlugin basePlugin, BaseExtension baseExtension) {
@@ -44,9 +45,15 @@ class AndroidGradleWrapper {
return variant.getBuildType().getName()
}
@NotNull
@Nullable
static def AbstractCompile getJavaCompile(Object baseVariantData) {
return baseVariantData.javaCompileTask
if (baseVariantData.getMetaClass().getMetaProperty("javaCompileTask")) {
return baseVariantData.javaCompileTask
}
else if (baseVariantData.getMetaClass().getMetaProperty("javaCompilerTask")) {
return baseVariantData.javaCompilerTask
}
return null
}
@NotNull