Improve Gradle configuration cache support

src/common/java/net/minecraftforge/gradle/common/tasks/ApplyBinPatches.java

@@ -22,19 +22,22 @@
 
 import net.minecraftforge.gradle.common.util.Utils;
 
+import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.OutputFile;
 
 import com.google.common.collect.ImmutableMap;
+
+import javax.inject.Inject;
 import java.util.List;
 
 public abstract class ApplyBinPatches extends JarExec {
     public ApplyBinPatches() {
         getTool().set(Utils.BINPATCHER);
         getArgs().addAll("--clean", "{clean}", "--output", "{output}", "--apply", "{patch}");
 
-        getOutput().convention(getProject().getLayout().getBuildDirectory().dir(getName()).map(d -> d.file("output.jar")));
+        getOutput().convention(getProjectLayout().getBuildDirectory().dir(getName()).map(d -> d.file("output.jar")));
     }
 
     @Override
@@ -45,6 +48,9 @@ protected List<String> filterArgs(List<String> args) {
                 "{patch}", getPatch().get().getAsFile()), null);
     }
 
+    @Inject
+    protected abstract ProjectLayout getProjectLayout();
+
     @InputFile
     public abstract RegularFileProperty getClean();
 

src/common/java/net/minecraftforge/gradle/common/tasks/ApplyMappings.java

@@ -25,12 +25,14 @@
 
 import org.apache.commons.io.IOUtils;
 import org.gradle.api.DefaultTask;
+import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 
+import javax.inject.Inject;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -42,7 +44,7 @@ public abstract class ApplyMappings extends DefaultTask {
     private boolean lambdas = true;
 
     public ApplyMappings() {
-        getOutput().convention(getProject().getLayout().getBuildDirectory().dir(getName()).map(s -> s.file("output.zip")));
+        getOutput().convention(getProjectLayout().getBuildDirectory().dir(getName()).map(s -> s.file("output.zip")));
     }
 
     @TaskAction
@@ -69,6 +71,9 @@ public void apply() throws IOException {
         }
     }
 
+    @Inject
+    protected abstract ProjectLayout getProjectLayout();
+
     @InputFile
     public abstract RegularFileProperty getInput();
 

src/common/java/net/minecraftforge/gradle/common/tasks/ApplyRangeMap.java

@@ -23,6 +23,7 @@
 import net.minecraftforge.gradle.common.util.Utils;
 
 import org.gradle.api.file.ConfigurableFileCollection;
+import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFile;
@@ -31,6 +32,8 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
+
+import javax.inject.Inject;
 import java.util.List;
 
 public abstract class ApplyRangeMap extends JarExec {
@@ -43,7 +46,7 @@ public ApplyRangeMap() {
                 "--output", "{output}", "--keepImports", "{keepImports}");
         setMinimumRuntimeJavaVersion(11);
 
-        getOutput().convention(getProject().getLayout().getBuildDirectory().dir(getName()).map(d -> d.file("output.zip")));
+        getOutput().convention(getProjectLayout().getBuildDirectory().dir(getName()).map(d -> d.file("output.zip")));
     }
 
     @Override
@@ -61,6 +64,9 @@ protected List<String> filterArgs(List<String> args) {
         );
     }
 
+    @Inject
+    protected abstract ProjectLayout getProjectLayout();
+
     @InputFiles
     public abstract ConfigurableFileCollection getSrgFiles();
 

src/common/java/net/minecraftforge/gradle/common/tasks/ArchiveChecksum.java

@@ -21,6 +21,7 @@
 package net.minecraftforge.gradle.common.tasks;
 
 import org.gradle.api.DefaultTask;
+import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.OutputFile;
@@ -29,6 +30,8 @@
 import com.google.common.collect.Maps;
 import com.google.common.hash.Hashing;
 import com.google.common.hash.HashingInputStream;
+
+import javax.inject.Inject;
 import java.io.BufferedWriter;
 import java.io.FileInputStream;
 import java.io.FileWriter;
@@ -44,7 +47,7 @@ public abstract class ArchiveChecksum extends DefaultTask {
     //TODO: Filters of some kind?
 
     public ArchiveChecksum() {
-        getOutput().convention(getProject().getLayout().getBuildDirectory().dir(getName()).map(s -> s.file("output.sha256")));
+        getOutput().convention(getProjectLayout().getBuildDirectory().dir(getName()).map(s -> s.file("output.sha256")));
     }
 
     @TaskAction
@@ -71,6 +74,9 @@ public void run() throws IOException {
         }
     }
 
+    @Inject
+    protected abstract ProjectLayout getProjectLayout();
+
     @InputFile
     public abstract RegularFileProperty getInput();
 

src/common/java/net/minecraftforge/gradle/common/tasks/DownloadAssets.java

@@ -26,13 +26,15 @@
 
 import org.apache.commons.io.FileUtils;
 import org.gradle.api.DefaultTask;
+import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.TaskAction;
 
+import javax.inject.Inject;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -49,6 +51,7 @@
 
 public abstract class DownloadAssets extends DefaultTask {
     public DownloadAssets() {
+        notCompatibleWithConfigurationCache("MAD");
         getAssetRepository().convention("https://resources.download.minecraft.net/");
         getConcurrentDownloads().convention(8);
     }
@@ -73,20 +76,20 @@ public void run() throws IOException, InterruptedException {
                     try {
                         File localFile = FileUtils.getFile(assetsPath + File.separator + asset.getPath());
                         if (localFile.exists()) {
-                            getProject().getLogger().lifecycle("Copying local object: " + asset.getPath() + " Asset: " + key);
+                            getLogger().lifecycle("Copying local object: " + asset.getPath() + " Asset: " + key);
                             FileUtils.copyFile(localFile, target);
                         } else {
-                            getProject().getLogger().lifecycle("Downloading: " + url + " Asset: " + key);
+                            getLogger().lifecycle("Downloading: " + url + " Asset: " + key);
                             FileUtils.copyURLToFile(url, target, 10_000, 5_000);
                         }
                         if (!HashFunction.SHA1.hash(target).equals(asset.hash)) {
                             failedDownloads.add(key);
                             Utils.delete(target);
-                            getProject().getLogger().error("{} Hash failed.", key);
+                            getLogger().error("{} Hash failed.", key);
                         }
                     } catch (IOException e) {
                         failedDownloads.add(key);
-                        getProject().getLogger().error("{} Failed.", key);
+                        getLogger().error("{} Failed.", key);
                         e.printStackTrace();
                     }
                 };

src/common/java/net/minecraftforge/gradle/common/tasks/DownloadMCMeta.java

@@ -24,6 +24,7 @@
 
 import org.apache.commons.io.FileUtils;
 import org.gradle.api.DefaultTask;
+import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.Input;
@@ -33,6 +34,8 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+
+import javax.inject.Inject;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -44,8 +47,8 @@ public abstract class DownloadMCMeta extends DefaultTask {
     private static final Gson GSON = new GsonBuilder().create();
 
     public DownloadMCMeta() {
-        getManifest().convention(getProject().getLayout().getBuildDirectory().dir(getName()).map(s -> s.file("manifest.json")));
-        getOutput().convention(getProject().getLayout().getBuildDirectory().dir(getName()).map(s -> s.file("version.json")));
+        getManifest().convention(getProjectLayout().getBuildDirectory().dir(getName()).map(s -> s.file("manifest.json")));
+        getOutput().convention(getProjectLayout().getBuildDirectory().dir(getName()).map(s -> s.file("version.json")));
     }
 
     @TaskAction
@@ -60,6 +63,9 @@ public void downloadMCMeta() throws IOException {
         }
     }
 
+    @Inject
+    protected abstract ProjectLayout getProjectLayout();
+
     @Input
     public abstract Property<String> getMCVersion();
 

src/common/java/net/minecraftforge/gradle/common/tasks/DownloadMavenArtifact.java

@@ -25,13 +25,16 @@
 
 import org.apache.commons.io.FileUtils;
 import org.gradle.api.DefaultTask;
+import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 
+import javax.inject.Inject;
 import java.io.File;
 import java.io.IOException;
 
@@ -40,11 +43,12 @@ public abstract class DownloadMavenArtifact extends DefaultTask {
     private boolean changing = false;
 
     public DownloadMavenArtifact() {
+        notCompatibleWithConfigurationCache("MAD");
         // We need to always ask, in case the file on the remote maven/local fake repo has changed.
         getOutputs().upToDateWhen(task -> false);
 
-        this.artifact = getProject().getObjects().property(Artifact.class);
-        getOutput().convention(getProject().getLayout().getBuildDirectory().dir(getName())
+        this.artifact = getProjectObjects().property(Artifact.class);
+        getOutput().convention(getProjectLayout().getBuildDirectory().dir(getName())
                         .zip(getArtifact(), (d, a) -> d.file("output." + a.getExtension())));
     }
 
@@ -85,4 +89,10 @@ public void run() throws IOException {
         if (!output.getParentFile().exists()) output.getParentFile().mkdirs();
         FileUtils.copyFile(out, output);
     }
+
+    @Inject
+    protected abstract ProjectLayout getProjectLayout();
+
+    @Inject
+    protected abstract ObjectFactory getProjectObjects();
 }

src/common/java/net/minecraftforge/gradle/common/tasks/DynamicJarExec.java

@@ -20,6 +20,7 @@
 
 package net.minecraftforge.gradle.common.tasks;
 
+import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.MapProperty;
 import org.gradle.api.tasks.InputFile;
@@ -28,12 +29,14 @@
 import org.gradle.api.tasks.OutputFile;
 
 import com.google.common.collect.ImmutableMap;
+
+import javax.inject.Inject;
 import java.io.File;
 import java.util.List;
 
 public abstract class DynamicJarExec extends JarExec {
     public DynamicJarExec() {
-        getOutput().convention(getProject().getLayout().getBuildDirectory().dir(getName()).map(d -> d.file("output.jar")));
+        getOutput().convention(getProjectLayout().getBuildDirectory().dir(getName()).map(d -> d.file("output.jar")));
     }
 
     @Override
@@ -46,6 +49,9 @@ protected List<String> filterArgs(List<String> args) {
         return replaceArgs(args, replace.build(), null);
     }
 
+    @Inject
+    protected abstract ProjectLayout getProjectLayout();
+
     @InputFiles
     @Optional
     public abstract MapProperty<String, File> getData();

src/common/java/net/minecraftforge/gradle/common/tasks/ExtractInheritance.java

@@ -22,6 +22,7 @@
 
 import net.minecraftforge.gradle.common.util.Utils;
 
+import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.tasks.InputFile;
@@ -30,6 +31,7 @@
 
 import com.google.common.collect.ImmutableMap;
 
+import javax.inject.Inject;
 import java.io.File;
 import java.util.List;
 
@@ -38,7 +40,7 @@ public ExtractInheritance() {
         getTool().set(Utils.INSTALLERTOOLS);
         getArgs().addAll("--task", "extract_inheritance", "--input", "{input}", "--output", "{output}");
 
-        getOutput().convention(getProject().getLayout().getBuildDirectory().dir(getName()).map(d -> d.file("output.json")));
+        getOutput().convention(getProjectLayout().getBuildDirectory().dir(getName()).map(d -> d.file("output.json")));
     }
 
     @Override
@@ -53,6 +55,8 @@ protected List<String> filterArgs(List<String> args) {
         return newArgs;
     }
 
+    @Inject
+    protected abstract ProjectLayout getProjectLayout();
 
     @InputFile
     public abstract RegularFileProperty getInput();

src/common/java/net/minecraftforge/gradle/common/tasks/ExtractMCPData.java

@@ -28,6 +28,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.gradle.api.DefaultTask;
+import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.Project;
@@ -36,6 +37,7 @@
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 
+import javax.inject.Inject;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -47,7 +49,7 @@ public abstract class ExtractMCPData extends DefaultTask {
     private boolean allowEmpty = false;
 
     public ExtractMCPData() {
-        getOutput().convention(getProject().getLayout().getBuildDirectory().dir(getName()).map(s -> s.file("output.srg")));
+        getOutput().convention(getProjectLayout().getBuildDirectory().dir(getName()).map(s -> s.file("output.srg")));
         getKey().convention("mappings");
     }
 
@@ -109,6 +111,9 @@ private void error(String message) throws IOException {
         outputFile.createNewFile();
     }
 
+    @Inject
+    protected abstract ProjectLayout getProjectLayout();
+
     @Input
     public abstract Property<String> getKey();
 

src/common/java/net/minecraftforge/gradle/common/tasks/ExtractNatives.java

@@ -35,6 +35,11 @@
 import java.io.IOException;
 
 public abstract class ExtractNatives extends DefaultTask {
+
+    public ExtractNatives() {
+        notCompatibleWithConfigurationCache("Utils needing getProject()");
+    }
+
     @TaskAction
     public void run() throws IOException {
         VersionJson json = Utils.loadJson(getMeta().get().getAsFile(), VersionJson.class);