Skip to content

Commit 993adcc

Browse files
committed
fixed issue with subprojects and Ats
1 parent 20df4c8 commit 993adcc

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

src/main/java/net/minecraftforge/gradle/user/TaskExtractDepAts.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@
3131
import java.util.jar.Manifest;
3232

3333
import org.gradle.api.DefaultTask;
34+
import org.gradle.api.artifacts.Configuration;
3435
import org.gradle.api.file.FileCollection;
35-
import org.gradle.api.tasks.InputFiles;
36+
import org.gradle.api.tasks.Input;
3637
import org.gradle.api.tasks.OutputDirectory;
3738
import org.gradle.api.tasks.TaskAction;
3839

@@ -44,8 +45,8 @@
4445

4546
public class TaskExtractDepAts extends DefaultTask
4647
{
47-
@InputFiles
48-
private List<FileCollection> collections = Lists.newArrayList();
48+
@Input
49+
private List<String> configurations = Lists.newArrayList();
4950
@OutputDirectory
5051
private Object outputDir;
5152

@@ -111,12 +112,15 @@ public boolean accept(File f)
111112

112113
public FileCollection getCollections()
113114
{
114-
return getProject().files(collections);
115+
List<Configuration> configs = Lists.newArrayListWithCapacity(configurations.size());
116+
for (String s : configurations)
117+
configs.add(getProject().getConfigurations().getByName(s));
118+
return getProject().files(configs);
115119
}
116120

117-
public void addCollection(FileCollection col)
121+
public void addCollection(String col)
118122
{
119-
collections.add(col);
123+
configurations.add(col);
120124
}
121125

122126
public File getOutputDir()

src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -681,10 +681,10 @@ private Object getFile(String baseDir, String group, String name, String version
681681
protected void doDepAtExtraction()
682682
{
683683
TaskExtractDepAts extract = makeTask(TASK_EXTRACT_DEP_ATS, TaskExtractDepAts.class);
684-
extract.addCollection(project.getConfigurations().getByName("compile"));
685-
extract.addCollection(project.getConfigurations().getByName(CONFIG_PROVIDED));
686-
extract.addCollection(project.getConfigurations().getByName(CONFIG_DEOBF_COMPILE));
687-
extract.addCollection(project.getConfigurations().getByName(CONFIG_DEOBF_PROVIDED));
684+
extract.addCollection("compile");
685+
extract.addCollection(CONFIG_PROVIDED);
686+
extract.addCollection(CONFIG_DEOBF_COMPILE);
687+
extract.addCollection(CONFIG_DEOBF_PROVIDED);
688688
extract.setOutputDir(delayedFile(DIR_DEP_ATS));
689689
extract.onlyIf(new Spec<Object>() {
690690
@Override

0 commit comments

Comments
 (0)