From 6028276688260784983376e02e6de3c7c8133592 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sun, 1 May 2016 08:09:55 -0700 Subject: [PATCH] Fixx kobalt.properties not included in kobalt-wrapper.jar. --- kobalt/src/Build.kt | 3 ++- src/test/kotlin/com/beust/kobalt/VerifyKobaltZipTest.kt | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index d02ee051..4114cb24 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -205,7 +205,8 @@ fun readVersion() : String { } } -@Task(name = "copyVersionForWrapper", runBefore = arrayOf("assemble"), runAfter = arrayOf("compile"), description = "") +@Task(name = "copyVersionForWrapper", runBefore = arrayOf("assemble"), + reverseDependsOn = arrayOf("compile"), description = "") fun taskCopyVersionForWrapper(project: Project) : TaskResult { if (project.name == "kobalt-wrapper") { val toString = "modules/wrapper/kobaltBuild/classes" diff --git a/src/test/kotlin/com/beust/kobalt/VerifyKobaltZipTest.kt b/src/test/kotlin/com/beust/kobalt/VerifyKobaltZipTest.kt index 861a8ea3..036ed235 100644 --- a/src/test/kotlin/com/beust/kobalt/VerifyKobaltZipTest.kt +++ b/src/test/kotlin/com/beust/kobalt/VerifyKobaltZipTest.kt @@ -54,7 +54,9 @@ class VerifyKobaltZipTest : KobaltTest() { verifyMainJarFile(ins) foundJar = true } else if (entry.name.endsWith("kobalt-wrapper.jar")) { + val ins = zipFile.getInputStream(entry) foundWrapperJar = true + assertExistsInJarInputStream(JarInputStream(ins), "kobalt.properties") } entry = stream.nextEntry }