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

Dependent project dependencies were not handled correctly.

Browse source
This commit is contained in:
Cedric Beust 2015-11-18 23:16:50 -08:00
parent 2746f57b9a
commit b91c8f2c83
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt
View file

@ -4,8 +4,10 @@ import com.beust.kobalt.api.IClasspathContributor
import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.KobaltContext
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.api.ProjectDescription import com.beust.kobalt.api.ProjectDescription
import com.beust.kobalt.internal.JvmCompilerPlugin
import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.plugin.packaging.PackagingPlugin 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
@ -96,7 +98,12 @@ 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 ->
result.add(FileDependency(p.projectProperties.getString(PackagingPlugin.JAR_NAME))) val classesDir = p.projectProperties.getString(JvmCompilerPlugin.BUILD_DIR)
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}")
}
result.addAll(calculateDependencies(p, context)) result.addAll(calculateDependencies(p, context))
} }
} }