From ff94cc5e3f4342d5c1d0ff4fdac09074c91f59cd Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Thu, 5 Jan 2017 12:23:55 -0800
Subject: [PATCH] Implements args() for application {}.

---
 .../kobalt/plugin/application/ApplicationPlugin.kt     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 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 fcc48a7f..edd6be7b 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt
@@ -20,9 +20,12 @@ import java.io.File
 @Directive
 class ApplicationConfig {
     var mainClass: String? = null
-    var jvmArgs = arrayListOf<String>()
 
+    val jvmArgs = arrayListOf<String>()
     fun jvmArgs(vararg args: String) = args.forEach { jvmArgs.add(it) }
+
+    val args = arrayListOf<String>()
+    fun args(vararg argv: String) = argv.forEach { args.add(it) }
 }
 
 @Directive
@@ -93,7 +96,8 @@ class ApplicationPlugin @Inject constructor(val configActor: ConfigActor<Applica
     }
 
     private fun runJarFile(project: Project, context: KobaltContext, config: ApplicationConfig) : TaskResult {
-        val jarFileName = project.projectProperties.get(Archives.JAR_NAME)
+        val fileName = project.projectProperties.get(Archives.JAR_NAME) as String
+        val jarFileName = KFiles.joinDir(KFiles.libsDir(project), fileName)
         val jarName = (jarFileName ?: KFiles.joinDir(KFiles.libsDir(project),
                 context.variant.archiveName(project, null, ".jar")))
             as String
@@ -118,7 +122,7 @@ class ApplicationPlugin @Inject constructor(val configActor: ConfigActor<Applica
         val contributorFlags = context.pluginInfo.jvmFlagContributors.flatMap {
             it.jvmFlagsFor(project, context, initialArgs)
         }
-        val args = contributorFlags + initialArgs
+        val args = contributorFlags + initialArgs + config.args
         val exitCode = RunCommand(java.absolutePath).run(args,
                 successCallback = { output: List<String> ->
                     println(output.joinToString("\n"))