Fix for issue #16, bump version for publication

psxpaul · Mar 27, 2019 · 63bd95c · 63bd95c
1 parent ca30ab2
commit 63bd95c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ For running a standard executable:
 
 ```groovy
 plugins {
-  id 'com.github.psxpaul.execfork' version '0.1.9'
+  id 'com.github.psxpaul.execfork' version '0.1.10'
 }
 
 task startDaemon(type: com.github.psxpaul.task.ExecFork) {
@@ -27,7 +27,7 @@ For running a java main class:
 
 ```groovy
 plugins {
-  id 'com.github.psxpaul.execfork' version '0.1.9'
+  id 'com.github.psxpaul.execfork' version '0.1.10'
 }
 
 task startDaemon(type: com.github.psxpaul.task.JavaExecFork) {

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.9
+0.1.10
diff --git a/sample_projects/simple/build.gradle b/sample_projects/simple/build.gradle
@@ -18,4 +18,5 @@ build.dependsOn integrationTest
 task startDaemon(type: com.github.psxpaul.task.JavaExecFork, dependsOn: 'classes') {
   classpath = sourceSets.main.runtimeClasspath
   main = 'com.github.psxpaul.example.Main'
+  args = [ '--someArg', "$buildDir/somePath" ]
 }
diff --git a/sample_projects/simple/src/main/java/com/github/psxpaul/example/Main.java b/sample_projects/simple/src/main/java/com/github/psxpaul/example/Main.java
@@ -2,6 +2,7 @@
 
 public class Main {
     public static void main(String[] args) throws Exception {
+        System.out.println("Daemon started with args: " + String.join(", ", args));
         System.out.println("Daemon is now running!");
         while(true) {
           System.out.println("PING");

diff --git a/src/main/kotlin/com/github/psxpaul/task/AbstractExecFork.kt b/src/main/kotlin/com/github/psxpaul/task/AbstractExecFork.kt
@@ -38,7 +38,7 @@ abstract class AbstractExecFork : DefaultTask(), ProcessForkOptions {
     private val log: Logger = LoggerFactory.getLogger(javaClass.simpleName)
 
     @Input
-    var args: MutableList<String> = mutableListOf()
+    var args: MutableList<CharSequence> = mutableListOf()
 
     @OutputFile
     @Optional

diff --git a/src/main/kotlin/com/github/psxpaul/task/ExecFork.kt b/src/main/kotlin/com/github/psxpaul/task/ExecFork.kt
@@ -30,7 +30,7 @@ open class ExecFork @Inject constructor(fileResolver: PathToFileResolver) : Abst
     override fun getProcessArgs(): List<String>? {
         val processArgs: MutableList<String> = mutableListOf()
         processArgs.add(executable!!)
-        processArgs.addAll(args)
+        processArgs.addAll(args.map(CharSequence::toString))
         return processArgs
     }
 

diff --git a/src/main/kotlin/com/github/psxpaul/task/JavaExecFork.kt b/src/main/kotlin/com/github/psxpaul/task/JavaExecFork.kt
@@ -36,7 +36,7 @@ open class JavaExecFork @Inject constructor(fileResolver: PathToFileResolver) :
         processArgs.add((bootstrapClasspath + classpath!!).asPath)
         processArgs.addAll(allJvmArgs)
         processArgs.add(main!!)
-        processArgs.addAll(args)
+        processArgs.addAll(args.map(CharSequence::toString))
         return processArgs
     }
 }