From 1334f0352b72732bc062fe5fc1c15eb005cb3adc Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Mon, 1 Jun 2015 13:11:21 +0300
Subject: [PATCH] Support com.android.tools.build.gradle 1.3.0-beta1 #KT-7884
 Fixed

---
 .../jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt    |  4 ++++
 .../gradle/plugin/android/AndroidGradleWrapper.groovy | 11 +++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
index de9001faa7d..09d6b812a7d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
@@ -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)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy
index 58cc0f0718f..8b5184148f8 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy
@@ -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