From 8bd7fe146439f236468e1c4fde2098752fc01480 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Mon, 13 Apr 2015 19:11:08 +0300 Subject: [PATCH] Gradle: add kotlin outputDir to java classPath if kotlin files are up-to-date --- .../org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 c82ca142200..3b4eca50386 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,14 +398,15 @@ 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) + val fullClasspath = (javaTask.getClasspath() + (javaSources + androidRT)) - project.files(kotlinTask.property("kotlinDestinationDir")) (it as AbstractCompile).setClasspath(fullClasspath) - - val javacClassPath = javaTask.getClasspath() + project.files(kotlinTask.property("kotlinDestinationDir")) - javaTask.setClasspath(javacClassPath) } javaTask.dependsOn(kotlinTaskName) + + javaTask doFirst { + javaTask.setClasspath(javaTask.getClasspath() + project.files(kotlinTask.property("kotlinDestinationDir"))) + } } } }