From 360a4967249aa9347c97e50feecff2d15306faa2 Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Thu, 5 Feb 2015 16:27:36 +0300
Subject: [PATCH] Gradle plugin: update to 1.1.0-rc1  #KT-6729 Fixed

---
 .../org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt      | 2 +-
 .../gradle/plugin/android/AndroidGradleWrapper.groovy       | 6 +++++-
 2 files changed, 6 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 4294d6e68de..7faf82d1cc3 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
@@ -390,7 +390,7 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t
                     }
                     val basePlugin: BasePlugin = plugin as BasePlugin
                     val javaSources = project.files(javaSourceList)
-                    val androidRT = project.files(AndroidGradleWrapper.getRuntimeJars(basePlugin))
+                    val androidRT = project.files(AndroidGradleWrapper.getRuntimeJars(basePlugin, androidExt))
                     val fullClasspath = (javaTask.getClasspath() + (javaSources + androidRT)) - project.files(kotlinTask.property("kotlinDestinationDir"))
                     (it as AbstractCompile).setClasspath(fullClasspath)
                 }
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 caa785b5f98..6d061483fff 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
@@ -1,5 +1,6 @@
 package org.jetbrains.kotlin.gradle.plugin.android
 
+import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.BasePlugin
 import com.android.build.gradle.api.ApkVariant
 import com.android.build.gradle.api.BaseVariant
@@ -7,10 +8,13 @@ import org.gradle.api.tasks.util.PatternFilterable
 import org.jetbrains.annotations.NotNull
 
 class AndroidGradleWrapper {
-  static def getRuntimeJars(BasePlugin basePlugin) {
+  static def getRuntimeJars(BasePlugin basePlugin, BaseExtension baseExtension) {
     if (basePlugin.getMetaClass().getMetaMethod("getRuntimeJarList")) {
       return basePlugin.getRuntimeJarList()
     }
+    else if (baseExtension.getMetaClass().getMetaMethod("getBootClasspath")) {
+        return baseExtension.getBootClasspath()
+    }
     else {
       return basePlugin.getBootClasspath()
     }