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

Rename.

Browse source
This commit is contained in:
Cedric Beust 2016-07-11 22:34:39 -08:00
parent 86abfc3d80
commit 644871056f
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ class PomGenerator @Inject constructor(@Assisted val project: Project) {
requireNotNull(project.group, { "group mandatory on project ${project.name}" }) requireNotNull(project.group, { "group mandatory on project ${project.name}" })
requireNotNull(project.artifactId, { "artifactId mandatory on project ${project.name}" }) requireNotNull(project.artifactId, { "artifactId mandatory on project ${project.name}" })
val m = val pom =
if (project.pom == null) { if (project.pom == null) {
// No pom specified, create one with default values // No pom specified, create one with default values
Model().apply { Model().apply {
@ -45,16 +45,16 @@ class PomGenerator @Inject constructor(@Assisted val project: Project) {
// //
// Dependencies // Dependencies
// //
m.dependencies = arrayListOf<org.apache.maven.model.Dependency>() pom.dependencies = arrayListOf<org.apache.maven.model.Dependency>()
// 1. Compile dependencies // 1. Compile dependencies
project.compileDependencies.forEach { dep -> project.compileDependencies.forEach { dep ->
m.dependencies.add(dep.toMavenDependencies()) pom.dependencies.add(dep.toMavenDependencies())
} }
// 2. Project dependencies // 2. Project dependencies
project.dependsOn.forEach { project.dependsOn.forEach {
m.dependencies.add(org.apache.maven.model.Dependency().apply { pom.dependencies.add(org.apache.maven.model.Dependency().apply {
version = it.version version = it.version
groupId = it.group groupId = it.group
artifactId = it.artifactId artifactId = it.artifactId
@ -62,12 +62,13 @@ class PomGenerator @Inject constructor(@Assisted val project: Project) {
} }
val s = StringWriter() val s = StringWriter()
MavenXpp3Writer().write(s, m) MavenXpp3Writer().write(s, pom)
val buildDir = KFiles.makeDir(project.directory, project.buildDirectory) val buildDir = KFiles.makeDir(project.directory, project.buildDirectory)
val outputDir = KFiles.makeDir(buildDir.path, "libs") val outputDir = KFiles.makeDir(buildDir.path, "libs")
val NO_CLASSIFIER = null val NO_CLASSIFIER = null
val mavenId = MavenId.create(project.group!!, project.artifactId!!, project.packaging, NO_CLASSIFIER, project.version!!) val mavenId = MavenId.create(project.group!!, project.artifactId!!, project.packaging, NO_CLASSIFIER,
project.version!!)
val pomFile = SimpleDep(mavenId).toPomFileName() val pomFile = SimpleDep(mavenId).toPomFileName()
val outputFile = File(outputDir, pomFile) val outputFile = File(outputDir, pomFile)
outputFile.writeText(s.toString(), Charset.defaultCharset()) outputFile.writeText(s.toString(), Charset.defaultCharset())