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

Remote duplicate paths.

Browse source
This commit is contained in:
Cedric Beust 2016-07-16 19:09:07 -07:00
parent a413823198
commit 669b6cf6cb
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
import com.google.inject.Inject import com.google.inject.Inject
import java.io.File import java.io.File
import java.nio.file.Paths
import java.util.* import java.util.*
/** /**
@ -114,7 +115,9 @@ class CompilerUtils @Inject constructor(val files: KFiles,
File(project.directory, it.path).exists() File(project.directory, it.path).exists()
}.filter { }.filter {
! KFiles.isResource(it.path) ! KFiles.isResource(it.path)
}.distinct() }.distinctBy {
Paths.get(it.path)
}
// Now that we have all the source directories, find all the source files in them. Note that // Now that we have all the source directories, find all the source files in them. Note that
// depending on the compiler's ability, sourceFiles can actually contain a list of directories // depending on the compiler's ability, sourceFiles can actually contain a list of directories
@ -149,13 +152,18 @@ class CompilerUtils @Inject constructor(val files: KFiles,
// Add all the source directories contributed as potential Java directories too // Add all the source directories contributed as potential Java directories too
// (except our own) // (except our own)
context.pluginInfo.sourceDirContributors.forEach { context.pluginInfo.sourceDirContributors.forEach {
extraSourceFiles.addAll(it.sourceDirectoriesFor(project, context).map { it.path }) val sd = it.sourceDirectoriesFor(project, context).map { it.path }
.filter { ! it.contains("kotlin") }
if (! sd.contains("kotlin")) {
extraSourceFiles.addAll(sd)
}
} }
} }
} }
} }
val allSources = (sourceFiles + extraSourceFiles) val distinctSources = (sourceFiles + extraSourceFiles).distinctBy { File(it).toURI().normalize().path }
val allSources = distinctSources
.map { File(it).path } .map { File(it).path }
.distinct() .distinct()
.filter { File(it).exists() } .filter { File(it).exists() }