diff --git a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt index 95794394..7717aed9 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt @@ -155,22 +155,19 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana @Suppress("UNCHECKED_CAST") val dependentProjects = project.projectProperties.get(JvmCompilerPlugin.DEPENDENT_PROJECTS) as List - listOf(dependencyManager.calculateDependencies(project, context, dependentProjects, - project.compileDependencies), - dependencyManager.calculateDependencies(project, context, dependentProjects, - project.compileRuntimeDependencies)) - .forEach { deps : List -> - deps.map { - it.jarFile.get() - }.forEach { file : File -> - if (! seen.contains(file.name)) { - seen.add(file.name) - if (! KFiles.isExcluded(file, jar.excludes)) { - allFiles.add(IncludedFile(arrayListOf(FileSpec(file.path)))) - } - } - } + val allDependencies = project.compileDependencies + project.compileRuntimeDependencies + val transitiveDependencies = dependencyManager.calculateDependencies(project, context, dependentProjects, + allDependencies) + transitiveDependencies.map { + it.jarFile.get() + }.forEach { file : File -> + if (! seen.contains(file.path)) { + seen.add(file.path) + if (! KFiles.isExcluded(file, jar.excludes)) { + allFiles.add(IncludedFile(arrayListOf(FileSpec(file.path)))) } + } + } } //