From 7cb8e76ed7972798582bea576c3f785cefe019dc Mon Sep 17 00:00:00 2001 From: Nikita Skvortsov Date: Tue, 13 Aug 2013 15:24:48 +0400 Subject: [PATCH] fix duplicates in classpath --- .../kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index 09cc1c5f9fc..9a70c6b42b2 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -248,7 +248,7 @@ open class KotlinAndroidPlugin: Plugin { val basePlugin : BasePlugin = plugin as BasePlugin val javaSources = project.files(javaSourceList) val androidRT = project.files(basePlugin.getRuntimeJarList()) - val fullClasspath = javaTask.getClasspath() + (javaSources + androidRT) + val fullClasspath = javaTask.getClasspath() + (javaSources + androidRT)?.minus(project.files(kotlinTask.kotlinDestinationDir)) (task as AbstractCompile).setClasspath(fullClasspath) })