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

Package -> PackageConfig.

Browse source
This commit is contained in:
Cedric Beust 2015-11-14 17:51:15 -08:00
parent 7405654e98
commit 91194b2b2a
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@ package com.beust.kobalt.plugin.packaging
import com.beust.kobalt.IFileSpec 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.BasePlugin import com.beust.kobalt.api.BasePlugin
import com.beust.kobalt.api.Kobalt import com.beust.kobalt.api.Kobalt
import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.KobaltContext
@ -12,7 +13,6 @@ import com.beust.kobalt.api.annotation.ExportedProperty
import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.api.annotation.Task
import com.beust.kobalt.glob import com.beust.kobalt.glob
import com.beust.kobalt.internal.JvmCompilerPlugin import com.beust.kobalt.internal.JvmCompilerPlugin
import com.beust.kobalt.TaskResult
import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.maven.LocalRepo import com.beust.kobalt.maven.LocalRepo
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
@ -32,13 +32,6 @@ import java.util.zip.ZipOutputStream
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
@Directive
fun Project.assemble(init: Package.(p: Project) -> Unit): Package {
val pd = Package(this)
pd.init(this)
return pd
}
@Singleton @Singleton
class PackagingPlugin @Inject constructor(val dependencyManager : DependencyManager, class PackagingPlugin @Inject constructor(val dependencyManager : DependencyManager,
val executors: KobaltExecutors, val localRepo: LocalRepo) : BasePlugin() { val executors: KobaltExecutors, val localRepo: LocalRepo) : BasePlugin() {
@ -58,7 +51,7 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
override val name = PLUGIN_NAME override val name = PLUGIN_NAME
private val packages = arrayListOf<Package>() private val packages = arrayListOf<PackageConfig>()
override fun apply(project: Project, context: KobaltContext) { override fun apply(project: Project, context: KobaltContext) {
super.apply(project, context) super.apply(project, context)
@ -246,7 +239,7 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
return result return result
} }
fun addPackage(p: Package) { fun addPackage(p: PackageConfig) {
packages.add(p) packages.add(p)
} }
@ -284,7 +277,14 @@ fun Project.install(init: InstallConfig.() -> Unit) {
class InstallConfig(var libDir : String = "libs") class InstallConfig(var libDir : String = "libs")
class Package(val project: Project) : AttributeHolder { @Directive
fun Project.assemble(init: PackageConfig.(p: Project) -> Unit): PackageConfig {
val pd = PackageConfig(this)
pd.init(this)
return pd
}
class PackageConfig(val project: Project) : AttributeHolder {
val jars = arrayListOf<Jar>() val jars = arrayListOf<Jar>()
val wars = arrayListOf<War>() val wars = arrayListOf<War>()
val zips = arrayListOf<Zip>() val zips = arrayListOf<Zip>()