From 4d3b7cbebb69d8ba28b53d8517329113dce941d5 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Tue, 5 Jul 2016 09:26:16 -0700 Subject: [PATCH] generatePom: generates dependencies on projects too. Fixes https://github.com/cbeust/kobalt/issues/257 --- .../com/beust/kobalt/maven/PomGenerator.kt | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt index 2ccc9250..8bc5833b 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt @@ -45,10 +45,23 @@ public class PomGenerator @Inject constructor(@Assisted val project: Project) { m.addDeveloper(this) } - val dependencies = arrayListOf() - m.dependencies = dependencies + // + // Dependencies + // + m.dependencies = arrayListOf() + + // 1. Compile dependencies project.compileDependencies.forEach { dep -> - dependencies.add(dep.toMavenDependencies()) + m.dependencies.add(dep.toMavenDependencies()) + } + + // 2. Project dependencies + project.dependentProjects.filter { it.project.name == project.name }.first().dependsOn.forEach { + m.dependencies.add(org.apache.maven.model.Dependency().apply { + version = it.version + groupId = it.group + artifactId = it.artifactId + }) } val s = StringWriter()