From 7c911e1f0aabbb4e632ef48d9ec66465a2f30167 Mon Sep 17 00:00:00 2001 From: Dmitry Kalita Date: Fri, 3 Apr 2015 21:53:45 +0300 Subject: [PATCH] When you build the project for the first time after cleaning, you lose paths to internal_impl jars of support libraries such as build/intermediates/exploded-aar/com.android.support/support-v4/21.0.2/libs/internal_impl-21.0.2.jar They are absent in javaCompile.getClasspath() when javaCompile task starts. This patch fixes it. #KT-7277 Fixed --- .../org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 ea9d2baa49d..de5198bc047 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 @@ -398,13 +398,14 @@ 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, androidExt)) - val fullClasspath = (javaTask.getClasspath() + (javaSources + androidRT)) - project.files(kotlinTask.property("kotlinDestinationDir")) + val fullClasspath = javaTask.getClasspath() + (javaSources + androidRT) (it as AbstractCompile).setClasspath(fullClasspath) + + val javacClassPath = javaTask.getClasspath() + project.files(kotlinTask.property("kotlinDestinationDir")) + javaTask.setClasspath(javacClassPath) } javaTask.dependsOn(kotlinTaskName) - val javacClassPath = javaTask.getClasspath() + project.files(kotlinTask.property("kotlinDestinationDir")) - javaTask.setClasspath(javacClassPath) } } }