1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-27 00:38:11 -07:00
This commit is contained in:
Cedric Beust 2015-12-02 19:08:47 -08:00
parent ffe36a1814
commit cbfbdd21a1

View file

@ -4,7 +4,6 @@ import com.beust.kobalt.api.*
import com.beust.kobalt.maven.dependency.FileDependency import com.beust.kobalt.maven.dependency.FileDependency
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.warn
import com.google.common.collect.ArrayListMultimap import com.google.common.collect.ArrayListMultimap
import java.util.* import java.util.*
import javax.inject.Inject import javax.inject.Inject
@ -98,12 +97,7 @@ public class DependencyManager @Inject constructor(val executors: KobaltExecutor
it.project.name == project?.name it.project.name == project?.name
}.forEach { pd -> }.forEach { pd ->
pd.dependsOn.forEach { p -> pd.dependsOn.forEach { p ->
val classesDir = p.classesDir(context) result.add(FileDependency(KFiles.joinDir(p.directory, p.classesDir(context))))
if (classesDir != null) {
result.add(FileDependency(KFiles.joinDir(p.directory, classesDir)))
} else {
warn("Couldn't find any classes dir for project depended on ${p.name}")
}
val otherDependencies = calculateDependencies(p, context, projectDescriptions, val otherDependencies = calculateDependencies(p, context, projectDescriptions,
p.compileDependencies) p.compileDependencies)
result.addAll(otherDependencies) result.addAll(otherDependencies)