Skip to content

Use list of files instead of string #716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 20, 2019
Merged

Use list of files instead of string #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4589b9
fix some issues
VinayGuthal Aug 20, 2019
22524e7
use input files
VinayGuthal Aug 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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);
Expand All @@ -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);
Expand Down
12 changes: 7 additions & 5 deletions buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/ApiInformationTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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();
Expand All @@ -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);

Expand All @@ -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();
Expand All @@ -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"
));
Expand Down
13 changes: 9 additions & 4 deletions ...rc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/GenerateApiTxtFileTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -34,8 +38,8 @@ public abstract class GenerateApiTxtFileTask extends DefaultTask {
@OutputFile
abstract File getApiTxt();

@Input
abstract String getSourcePath();
@InputFiles
abstract List<File> getSourcePath();


@OutputFile
Expand All @@ -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);

Expand All @@ -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"
Expand Down