Support list variables

ayltai · Jul 8, 2020 · 5612f0d · 5612f0d
1 parent dc6e361
commit 5612f0d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ plugins {
 }
 
 group 'com.github.ayltai'
-version '0.2.11'
+version '0.2.12'
 
 sourceCompatibility = 8
 targetCompatibility = 8

diff --git a/src/main/java/com/github/ayltai/gradle/plugin/BaseApplyTask.java b/src/main/java/com/github/ayltai/gradle/plugin/BaseApplyTask.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 import javax.annotation.Nonnull;
 
 import org.gradle.api.NamedDomainObjectContainer;
@@ -90,7 +91,14 @@ protected List<String> getCommandLineArgs() {
 
                 variable.vars.forEach(var -> {
                     args.add("-var");
-                    args.add(String.format(Locale.US, "'%1$s=%2$s'", var.name, var.value));
+
+                    if (var.value instanceof Iterable) {
+                        args.add(String.format(Locale.US, "%1$s=%2$s", var.name, String.format(Locale.US, "[%s]", StreamSupport.stream(((Iterable<String>)var.value).spliterator(), false)
+                            .map(value -> String.format(Locale.US, "\"%s\"", value))
+                            .collect(Collectors.joining(",")))));
+                    } else {
+                        args.add(String.format(Locale.US, "%1$s=%2$s", var.name, var.value));
+                    }
                 });
             });
         }