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

Fix test includes/excludes.

Browse source
This commit is contained in:
Cedric Beust 2016-01-02 14:29:19 -08:00
parent 77e895d3a0
commit 6aa3c16d38
5 changed files with 77 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,8 +42,7 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
const val TASK_ASSEMBLE: String = "assemble"
const val TASK_INSTALL: String = "install"
fun findIncludedFiles(directory: String, files: List<IncludedFile>, excludes: IFileSpec.GlobSpec)
fun findIncludedFiles(directory: String, files: List<IncludedFile>, excludes: List<Glob>)
: List<IncludedFile> {
val result = arrayListOf<IncludedFile>()
files.forEach { includedFile ->
@ -312,7 +311,7 @@ class PackageConfig(val project: Project) : AttributeHolder {
open class Zip(open var name: String? = null) {
// internal val includes = arrayListOf<IFileSpec>()
internal val excludes = GlobSpec(arrayListOf(), arrayListOf())
internal val excludes = arrayListOf<Glob>()
@Directive
public fun from(s: String) = From(s)
@ -322,12 +321,12 @@ open class Zip(open var name: String? = null) {
@Directive
public fun exclude(vararg files: String) {
files.forEach { excludes.excludeSpec.add(it) }
files.forEach { excludes.add(Glob(it)) }
}
@Directive
public fun exclude(vararg specs: GlobSpec) {
specs.forEach { excludes.excludeSpec.addAll(it.excludeSpec) }
public fun exclude(vararg specs: Glob) {
specs.forEach { excludes.add(it) }
}
@Directive