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

Generate the correct pom file for provided().

Browse source
This commit is contained in:
Cedric Beust 2016-09-22 11:12:19 -07:00
parent 91baf6e86f
commit b80c996e05
4 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IClasspathDependency.kt
View file

@ -29,7 +29,7 @@ interface IClasspathDependency {
val jarFile: Future<File> val jarFile: Future<File>
/** Convert to a Maven <dependency> model tag */ /** Convert to a Maven <dependency> model tag */
fun toMavenDependencies() : Dependency fun toMavenDependencies(scope: String? = null) : Dependency
/** The list of dependencies for this element (not the transitive closure) */ /** The list of dependencies for this element (not the transitive closure) */
fun directDependencies(): List<IClasspathDependency> fun directDependencies(): List<IClasspathDependency>

15
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt
View file

@ -72,6 +72,21 @@ class PomGenerator @Inject constructor(@Assisted val project: Project) {
pom.dependencies.add(dep.toMavenDependencies()) pom.dependencies.add(dep.toMavenDependencies())
} }
// Provided dependencies
project.compileProvidedDependencies.forEach { dep ->
pom.dependencies.add(dep.toMavenDependencies("provided"))
}
// Test dependencies
project.testDependencies.forEach { dep ->
pom.dependencies.add(dep.toMavenDependencies("test"))
}
// Test provided dependencies
project.testProvidedDependencies.forEach { dep ->
pom.dependencies.add(dep.toMavenDependencies("test"))
}
// Project dependencies // Project dependencies
project.dependsOn.forEach { project.dependsOn.forEach {
pom.dependencies.add(org.apache.maven.model.Dependency().apply { pom.dependencies.add(org.apache.maven.model.Dependency().apply {

4
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Aether.kt
View file

@ -266,13 +266,15 @@ class AetherDependency(val artifact: Artifact, override val optional: Boolean =
} }
} }
override fun toMavenDependencies() : org.apache.maven.model.Dependency { override fun toMavenDependencies(scope: String?) : org.apache.maven.model.Dependency {
val passedScope = scope
val op = this.optional val op = this.optional
return org.apache.maven.model.Dependency().apply { return org.apache.maven.model.Dependency().apply {
groupId = artifact.groupId groupId = artifact.groupId
artifactId = artifact.artifactId artifactId = artifact.artifactId
version = artifact.version version = artifact.version
if (op) optional = op.toString() if (op) optional = op.toString()
if (passedScope != null) this.scope = passedScope
} }
} }

3
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/dependency/FileDependency.kt
View file

@ -19,9 +19,10 @@ open class FileDependency(open val fileName: String, override val optional: Bool
override val jarFile = CompletedFuture(File(fileName)) override val jarFile = CompletedFuture(File(fileName))
override fun toMavenDependencies(): Dependency { override fun toMavenDependencies(scope: String?): Dependency {
with(Dependency()) { with(Dependency()) {
systemPath = jarFile.get().absolutePath systemPath = jarFile.get().absolutePath
this.scope = scope
return this return this
} }
} }