Skip to content

Fix exceptions thrown due to Gradle 7 rules. (ApplyS2STask) #3

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

Open
wants to merge 3 commits into
base: FG_2.1
Choose a base branch
from
Open

Fix exceptions thrown due to Gradle 7 rules. (ApplyS2STask) #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f99cc86
Attempt to fix Gradle 7 exception.
Sep 11, 2021
3d3ab65
2nd attempt to fix Gradle 7 exception.
Sep 11, 2021
c00c291
3rd attempt to fix Gradle 7 exception.
Sep 11, 2021
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
17 changes: 11 additions & 6 deletions src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@
import com.google.common.collect.Maps;
import com.google.common.io.Files;

public class ApplyS2STask extends DefaultTask
{
public class ApplyS2STask extends DefaultTask {
@InputFiles
private final List<Object> srg = new LinkedList<Object>();

Expand All @@ -67,7 +66,9 @@ public class ApplyS2STask extends DefaultTask
private Object excModifiers;

// stuff defined on the tasks..
@Internal
private final List<Object> in = new LinkedList<Object>();
@Internal
private Object out;

@TaskAction
Expand All @@ -76,8 +77,8 @@ public void doTask() throws IOException
File out = getOut();
File rangemap = getRangeMap();
File rangelog = File.createTempFile("rangelog", ".txt", this.getTemporaryDir());
FileCollection srg = getSrgs();
FileCollection exc = getExcs();
FileCollection srg = getSrg();
FileCollection exc = getExc();

InputSupplier inSup;

Expand Down Expand Up @@ -343,6 +344,10 @@ public FileCollection getOuts()
return getProject().files(outFile);
}

public List<Object> getIn() {
return in;
}

public File getOut()
{
return getProject().file(out);
Expand All @@ -353,7 +358,7 @@ public void setOut(Object out)
this.out = out;
}

public FileCollection getSrgs()
public FileCollection getSrg()
{
return getProject().files(srg);
}
Expand All @@ -373,7 +378,7 @@ public void addSrg(File srg)
this.srg.add(srg);
}

public FileCollection getExcs()
public FileCollection getExc()
{
return getProject().files(exc);
}
Expand Down