Use list of files instead of string (#716)

* fix some issues

* use input files

Author: VinayGuthal

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java

@@ -24,15 +24,8 @@
 import com.google.firebase.gradle.plugins.apiinfo.GetMetalavaJarTask;
 import com.google.firebase.gradle.plugins.ci.device.FirebaseTestServer;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Collection;
-import org.codehaus.groovy.util.ReleaseInfo;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.attributes.Attribute;
-import org.gradle.api.file.FileCollection;
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
 import java.io.File;
 import java.nio.file.Paths;
@@ -99,9 +92,7 @@ private static void setupApiInformationAnalysis(Project project, LibraryExtensio
         "apiinfo",
         project.getPath().substring(1).replace(":", "_")));
     File outputApiFile = new File(outputFile.getAbsolutePath() + "_api.txt");
-    String sourcePathArgument = mainSourceSet.getJava().getSrcDirs().stream()
-        .map(File::getAbsolutePath)
-        .collect(Collectors.joining(":"));
+    List<File> sourcePath = mainSourceSet.getJava().getSrcDirs().stream().collect(Collectors.toList());
     if(mainSourceSet.getJava().getSrcDirs().stream().noneMatch(File::exists)) {
       return;
     }
@@ -111,7 +102,7 @@ private static void setupApiInformationAnalysis(Project project, LibraryExtensio
     project.getTasks().register("apiInformation", ApiInformationTask.class, task -> {
       task.setApiTxt(project.file("api.txt"));
       task.setMetalavaJarPath(metalavaOutputJarFile.getAbsolutePath());
-      task.setSourcePath(sourcePathArgument);
+      task.setSourcePath(sourcePath);
       task.setOutputFile(outputFile);
       task.setBaselineFile(project.file("baseline.txt"));
       task.setOutputApiFile(outputApiFile);
@@ -126,7 +117,7 @@ private static void setupApiInformationAnalysis(Project project, LibraryExtensio
     project.getTasks().register("generateApiTxtFile", GenerateApiTxtFileTask.class, task -> {
       task.setApiTxt(project.file("api.txt"));
       task.setMetalavaJarPath(metalavaOutputJarFile.getAbsolutePath());
-      task.setSourcePath(sourcePathArgument);
+      task.setSourcePath(sourcePath);
       task.setBaselineFile(project.file("baseline.txt"));
       if (project.hasProperty("updateBaseline")) {
         task.setUpdateBaseline(true);

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/ApiInformationTask.java

@@ -22,7 +22,9 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.InputDirectory;
 import org.gradle.api.tasks.InputFile;
+import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 
@@ -43,8 +45,8 @@ public abstract class ApiInformationTask extends DefaultTask {
     @InputFile
     abstract File getApiTxt();
 
-    @Input
-    abstract String getSourcePath();
+    @InputFiles
+    abstract List<File> getSourcePath();
 
     @OutputFile
     abstract File getBaselineFile();
@@ -58,7 +60,7 @@ public abstract class ApiInformationTask extends DefaultTask {
     @OutputFile
     abstract File getOutputFile();
 
-    public abstract void setSourcePath(String value);
+    public abstract void setSourcePath(List<File> value);
 
     public abstract void setBaselineFile(File value);
 
@@ -75,7 +77,7 @@ public abstract class ApiInformationTask extends DefaultTask {
 
     @TaskAction
     void execute() {
-
+        String sourcePath = getSourcePath().stream().map(File::getAbsolutePath).collect(Collectors.joining(":"));
         File outputFileDir = getOutputFile().getParentFile();
         if(!outputFileDir.exists()) {
             outputFileDir.mkdirs();
@@ -86,7 +88,7 @@ void execute() {
             spec.setMain("-jar");
             spec.setArgs(Arrays.asList(
                 getMetalavaJarPath(),
-                "--source-path", getSourcePath(),
+                "--source-path", sourcePath,
                 "--api", getOutputApiFile().getAbsolutePath(),
                 "--format=v2"
             ));

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/GenerateApiTxtFileTask.java

@@ -19,11 +19,15 @@
 import java.util.List;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.InputDirectory;
+import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 import java.io.File;
 
 import java.util.Arrays;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 
 public abstract class GenerateApiTxtFileTask extends DefaultTask {
@@ -34,8 +38,8 @@ public abstract class GenerateApiTxtFileTask extends DefaultTask {
     @OutputFile
     abstract File getApiTxt();
 
-    @Input
-    abstract String getSourcePath();
+    @InputFiles
+    abstract List<File> getSourcePath();
 
 
     @OutputFile
@@ -45,7 +49,7 @@ public abstract class GenerateApiTxtFileTask extends DefaultTask {
     abstract boolean getUpdateBaseline();
 
 
-    public abstract void setSourcePath(String value);
+    public abstract void setSourcePath(List<File> value);
 
     public abstract void setBaselineFile(File value);
 
@@ -57,9 +61,10 @@ public abstract class GenerateApiTxtFileTask extends DefaultTask {
 
     @TaskAction
     void execute() {
+        String sourcePath =  getSourcePath().stream().map(File::getAbsolutePath).collect(Collectors.joining(":"));
         List<String> args =  new ArrayList<String>(Arrays.asList(
             getMetalavaJarPath(),
-            "--source-path", getSourcePath(),
+            "--source-path", sourcePath,
             "--api", getApiTxt().getAbsolutePath(),
             "--format=v2",
             "--delete-empty-baselines"