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

Java source directories can come from contributors too.

Browse source
This commit is contained in:
Cedric Beust 2016-02-09 02:42:33 +04:00
parent 5115fb830f
commit 672bc4b496
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -274,6 +274,7 @@ open class JvmCompilerPlugin @Inject constructor(
File(project.directory, it.path).exists() File(project.directory, it.path).exists()
} }
// Now that we have all the source directories, find all the source files in them
val sourceFiles = files.findRecursively(projectDirectory, sourceDirectories, val sourceFiles = files.findRecursively(projectDirectory, sourceDirectories,
{ file -> sourceSuffixes.any { file.endsWith(it) }}) { file -> sourceSuffixes.any { file.endsWith(it) }})
.map { File(projectDirectory, it).path } .map { File(projectDirectory, it).path }
@ -286,7 +287,15 @@ open class JvmCompilerPlugin @Inject constructor(
project.sourceDirectories.forEach { project.sourceDirectories.forEach {
val javaDir = KFiles.joinDir(project.directory, it) val javaDir = KFiles.joinDir(project.directory, it)
if (File(javaDir).exists()) { if (File(javaDir).exists()) {
if (it.contains("java")) extraSourceFiles.add(javaDir) if (it.contains("java")) {
extraSourceFiles.add(javaDir)
// Add all the source directories contributed as potential Java directories too
// (except our own)
context.pluginInfo.sourceDirContributors.filter { it != this }.forEach {
extraSourceFiles.addAll(it.sourceDirectoriesFor(project, context).map { it.path })
}
}
} }
} }
} }