erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Fix directories.

Browse source
This commit is contained in:
Cedric Beust 2016-04-11 09:48:12 -07:00
parent a2645c779c
commit 09c6f4c6ba
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
View file

@ -341,8 +341,9 @@ open class JvmCompilerPlugin @Inject constructor(
}
}
extraSourceFiles.addAll(contributedSourceDirs.filter { it.exists() }.map { it.path })
val allSources= (sourceFiles + extraSourceFiles).distinct()
val allSources = (sourceFiles + extraSourceFiles).distinct().filter { File(it).exists() }.map {
File(projectDirectory, it).path
}
// Finally, alter the info with the compiler interceptors before returning it
val initialActionInfo = CompilerActionInfo(projectDirectory.path, classpath, allSources,
sourceSuffixes, buildDirectory, emptyList() /* the flags will be provided by flag contributors */)

2
src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt
View file

@ -73,7 +73,7 @@ class JavaCompiler @Inject constructor(val jvmCompiler: JvmCompiler) {
}
allArgs.addAll(info.compilerArgs)
allArgs.addAll(info.sourceFiles)
allArgs.addAll(info.sourceFiles.filter { File(it).isFile })
val pb = ProcessBuilder(allArgs)
pb.inheritIO()