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 mixed Java/Kotlin projects in tests.

Browse source
This commit is contained in:
Cedric Beust 2016-07-06 19:55:20 -07:00
parent a4f3f93fc1
commit 56092edfcc
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -143,16 +143,16 @@ class CompilerUtils @Inject constructor(val files: KFiles,
}
if (sourceSuffixes.any { it.contains("kt")}) {
project.sourceDirectories.forEach {
val directories = if (isTest) project.sourceDirectoriesTest else project.sourceDirectories
directories.forEach {
val javaDir = File(KFiles.joinDir(project.directory, it))
if (javaDir.exists() && containsJavaFiles(javaDir)) {
extraSourceFiles.add(javaDir.path)
// Add all the source directories contributed as potential Java directories too
// (except our own)
context.pluginInfo.sourceDirContributors
.forEach {
extraSourceFiles.addAll(it.sourceDirectoriesFor(project, context).map { it.path })
}
context.pluginInfo.sourceDirContributors.forEach {
extraSourceFiles.addAll(it.sourceDirectoriesFor(project, context).map { it.path })
}
}
}
}