From e166cf1288d5658c28680fc77c9b93200a2e3495 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Sun, 22 May 2016 23:20:06 -0800
Subject: [PATCH] Bug when running a variant package.

Fixes https://github.com/cbeust/kobalt/issues/202
---
 .../kobalt/plugin/application/ApplicationPlugin.kt     | 10 +++++++---
 .../beust/kobalt/plugin/packaging/PackagingPlugin.kt   |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt
index 38aa114e..6f237dae 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt
@@ -9,6 +9,7 @@ import com.beust.kobalt.archive.Jar
 import com.beust.kobalt.internal.ActorUtils
 import com.beust.kobalt.internal.JvmCompilerPlugin
 import com.beust.kobalt.maven.DependencyManager
+import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltExecutors
 import com.beust.kobalt.misc.RunCommand
 import com.beust.kobalt.misc.warn
@@ -86,7 +87,7 @@ class ApplicationPlugin @Inject constructor(val configActor: ConfigActor<Applica
         var result = TaskResult()
         configurationFor(project)?.let { config ->
             if (config.mainClass != null) {
-                result = runJarFile(project, config)
+                result = runJarFile(project, context, config)
             } else {
                 throw KobaltException("No \"mainClass\" specified in the application{} part of project ${project.name}")
             }
@@ -94,8 +95,11 @@ class ApplicationPlugin @Inject constructor(val configActor: ConfigActor<Applica
         return result
     }
 
-    private fun runJarFile(project: Project, config: ApplicationConfig) : TaskResult {
-        val jarName = project.projectProperties.get(Archives.JAR_NAME) as String
+    private fun runJarFile(project: Project, context: KobaltContext, config: ApplicationConfig) : TaskResult {
+        val jarFileName = project.projectProperties.get(Archives.JAR_NAME)
+        val jarName = (jarFileName ?: KFiles.joinDir(KFiles.libsDir(project),
+                context.variant.archiveName(project, null, ".jar")))
+            as String
         @Suppress("UNCHECKED_CAST")
         val packages = project.projectProperties.get(PackagingPlugin.PACKAGES) as List<PackageConfig>
         val allDeps = arrayListOf(jarName)
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt
index b998d77a..a7bcbfa9 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt
@@ -48,6 +48,8 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
     override fun apply(project: Project, context: KobaltContext) {
         super.apply(project, context)
         project.projectProperties.put(LIBS_DIR, KFiles.libsDir(project))
+        project.projectProperties.put(PACKAGES, packages)
+
         taskContributor.addVariantTasks(this, project, context, "assemble", group = "build",
                 dependsOn = listOf("compile"),
                 runTask = { doTaskAssemble(project) })
@@ -64,7 +66,6 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
     override fun assemble(project: Project, context: KobaltContext) : IncrementalTaskInfo {
         return IncrementalTaskInfo({ null }, { null }, { project ->
             try {
-                project.projectProperties.put(PACKAGES, packages)
                 packages.filter { it.project.name == project.name }.forEach { pkg ->
                     pkg.jars.forEach { jarGenerator.generateJar(pkg.project, context, it) }
                     pkg.wars.forEach { warGenerator.generateWar(pkg.project, context, it) }