From b9fc66ec0b34904e72795eaabfb41eba79159d2e Mon Sep 17 00:00:00 2001 From: Nikita Skvortsov Date: Wed, 27 Mar 2013 15:07:13 +0400 Subject: [PATCH] filter out non-existent directories from class path --- .../kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index 720b177b824..7422d5f491d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -39,8 +39,12 @@ public open class KotlinCompile(): AbstractCompile() { val compiler = K2JVMCompiler() val logger = Logging.getLogger(getClass()) - public val kotlinOptions: K2JVMCompilerArguments = K2JVMCompilerArguments() + public val kotlinOptions: K2JVMCompilerArguments = K2JVMCompilerArguments(); + { + kotlinOptions.noStdlib = true + kotlinOptions.noJdkAnnotations = true + } // override setSource to track source directory sets override fun setSource(source: Any?) { @@ -104,8 +108,8 @@ public open class KotlinCompile(): AbstractCompile() { if (StringUtils.isEmpty(kotlinOptions.classpath)) { - val gradleClasspath = getClasspath() - val effectiveClassPath = (javaSrcRoots + gradleClasspath).makeString(File.pathSeparator) + val existingClasspathEntries = getClasspath().filter(KSpec({ it != null && it.exists() })) + val effectiveClassPath = (javaSrcRoots + existingClasspathEntries).makeString(File.pathSeparator) args.setClasspath(effectiveClassPath) }