erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 00:17:11 -07:00
Code Releases Activity

Build fix.

Browse source
This commit is contained in:
Cedric Beust 2016-08-08 17:53:21 -07:00
parent 24c2c99ddc
commit a2c705ae6e
3 changed files with 3 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/JarGenerator.kt
View file

@ -159,7 +159,7 @@ class JarGenerator @Inject constructor(val dependencyManager: DependencyManager)
val jarFactory = { os: OutputStream -> JarOutputStream(os, manifest) } val jarFactory = { os: OutputStream -> JarOutputStream(os, manifest) }
return Archives.generateArchive(project, context, jar.name, ".jar", includedFiles, return Archives.generateArchive(project, context, jar.name, ".jar", includedFiles,
true /* expandJarFiles */, jarFactory, kobaltLog) true /* expandJarFiles */, jarFactory)
} }
} }

2
src/main/kotlin/com/beust/kobalt/plugin/packaging/WarGenerator.kt
View file

@ -89,7 +89,7 @@ class WarGenerator @Inject constructor(val dependencyManager: DependencyManager,
val allFiles = findIncludedFiles(project, context, war) val allFiles = findIncludedFiles(project, context, war)
val jarFactory = { os: OutputStream -> JarOutputStream(os, manifest) } val jarFactory = { os: OutputStream -> JarOutputStream(os, manifest) }
return Archives.generateArchive(project, context, war.name, ".war", allFiles, return Archives.generateArchive(project, context, war.name, ".war", allFiles,
false /* don't expand jar files */, jarFactory, kobaltLog) false /* don't expand jar files */, jarFactory)
} }
} }

2
src/main/kotlin/com/beust/kobalt/plugin/packaging/ZipGenerator.kt
View file

@ -12,6 +12,6 @@ import com.google.inject.Inject
class ZipGenerator @Inject constructor(val dependencyManager: DependencyManager, val kobaltLog: ParallelLogger) { class ZipGenerator @Inject constructor(val dependencyManager: DependencyManager, val kobaltLog: ParallelLogger) {
fun generateZip(project: Project, context: KobaltContext, zip: Zip) { fun generateZip(project: Project, context: KobaltContext, zip: Zip) {
val allFiles = JarGenerator.findIncludedFiles(project.directory, zip.includedFiles, zip.excludes) val allFiles = JarGenerator.findIncludedFiles(project.directory, zip.includedFiles, zip.excludes)
Archives.generateArchive(project, context, zip.name, ".zip", allFiles, kobaltLog = kobaltLog) Archives.generateArchive(project, context, zip.name, ".zip", allFiles)
} }
} }