erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-27 08:38:13 -07:00
Code Releases Activity

Merge branch 'master' of github.com:cbeust/kobalt

Browse source
This commit is contained in:
Cedric Beust 2015-12-25 07:20:22 -08:00
commit 9ec8be4adc
3 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kobalt/wrapper/kobalt-wrapper.properties
View file

@ -1 +1 @@
kobalt.version=0.362 kobalt.version=0.363

25
src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt
View file

@ -1,15 +1,12 @@
package com.beust.kobalt.plugin.packaging package com.beust.kobalt.plugin.packaging
import com.beust.kobalt.Features import com.beust.kobalt.*
import com.beust.kobalt.IFileSpec
import com.beust.kobalt.IFileSpec.FileSpec import com.beust.kobalt.IFileSpec.FileSpec
import com.beust.kobalt.IFileSpec.Glob import com.beust.kobalt.IFileSpec.Glob
import com.beust.kobalt.TaskResult
import com.beust.kobalt.api.* import com.beust.kobalt.api.*
import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.api.annotation.Directive
import com.beust.kobalt.api.annotation.ExportedProjectProperty import com.beust.kobalt.api.annotation.ExportedProjectProperty
import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.api.annotation.Task
import com.beust.kobalt.glob
import com.beust.kobalt.internal.JvmCompilerPlugin import com.beust.kobalt.internal.JvmCompilerPlugin
import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.maven.PomGenerator import com.beust.kobalt.maven.PomGenerator
@ -177,16 +174,20 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
@Task(name = TASK_ASSEMBLE, description = "Package the artifacts", @Task(name = TASK_ASSEMBLE, description = "Package the artifacts",
runAfter = arrayOf(JvmCompilerPlugin.TASK_COMPILE)) runAfter = arrayOf(JvmCompilerPlugin.TASK_COMPILE))
fun doTaskAssemble(project: Project) : TaskResult { fun doTaskAssemble(project: Project) : TaskResult {
project.projectProperties.put(PACKAGES, packages) try {
packages.filter { it.project.name == project.name }.forEach { pkg -> project.projectProperties.put(PACKAGES, packages)
pkg.jars.forEach { jarGenerator.generateJar(pkg.project, context, it) } packages.filter { it.project.name == project.name }.forEach { pkg ->
pkg.wars.forEach { warGenerator.generateWar(pkg.project, context, it, projects) } pkg.jars.forEach { jarGenerator.generateJar(pkg.project, context, it) }
pkg.zips.forEach { zipGenerator.generateZip(pkg.project, context, it) } pkg.wars.forEach { warGenerator.generateWar(pkg.project, context, it, projects) }
if (pkg.generatePom) { pkg.zips.forEach { zipGenerator.generateZip(pkg.project, context, it) }
pomFactory.create(project).generate() if (pkg.generatePom) {
pomFactory.create(project).generate()
}
} }
return TaskResult()
} catch(ex: Exception) {
throw KobaltException(ex)
} }
return TaskResult()
} }
fun addPackage(p: PackageConfig) { fun addPackage(p: PackageConfig) {

2
src/main/resources/kobalt.properties
View file

@ -1 +1 @@
kobalt.version=0.362 kobalt.version=0.363