Enable gradle's configuration-cache (#3742)

mezz · Sep 6, 2024 · 7b75d12 · 7b75d12
1 parent 9e851b4
commit 7b75d12
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 23 deletions.
diff --git a/Forge/build.gradle.kts b/Forge/build.gradle.kts
@@ -1,4 +1,6 @@
 import net.darkhax.curseforgegradle.TaskPublishCurseForge
+import net.minecraftforge.gradle.common.tasks.DownloadMavenArtifact
+import net.minecraftforge.gradle.common.tasks.JarExec
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import net.darkhax.curseforgegradle.Constants as CFG_Constants
@@ -148,7 +150,7 @@ tasks.withType<JavaCompile>().configureEach {
     }
 }
 
-tasks.processResources {
+tasks.withType<ProcessResources> {
     dependencyProjects.forEach {
         from(it.sourceSets.main.get().resources)
     }
@@ -247,3 +249,11 @@ sourceSets.forEach {
     it.output.setResourcesDir(outputDir)
     it.java.destinationDirectory.set(outputDir)
 }
+
+tasks.withType<DownloadMavenArtifact> {
+	notCompatibleWithConfigurationCache("uses Task.project at execution time")
+}
+
+tasks.withType<JarExec> {
+	notCompatibleWithConfigurationCache("uses external process at execution time")
+}
diff --git a/ForgeApi/build.gradle.kts b/ForgeApi/build.gradle.kts
@@ -1,3 +1,5 @@
+import net.minecraftforge.gradle.common.tasks.DownloadMavenArtifact
+
 plugins {
 	id("java")
 	id("idea")
@@ -120,3 +122,7 @@ publishing {
 		}
 	}
 }
+
+tasks.withType<DownloadMavenArtifact> {
+	notCompatibleWithConfigurationCache("uses Task.project at execution time")
+}
diff --git a/NeoForge/build.gradle.kts b/NeoForge/build.gradle.kts
@@ -61,7 +61,7 @@ tasks.withType<JavaCompile>().configureEach {
     }
 }
 
-tasks.withType<ProcessResources>().configureEach {
+tasks.withType<ProcessResources> {
     dependencyProjects.forEach {
         from(it.sourceSets.main.get().resources)
     }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -101,28 +101,27 @@ subprojects {
     }
 
     tasks.withType<ProcessResources> {
-        // this will ensure that this task is redone when the versions change.
-        inputs.property("version", version)
-
+        val properties = mapOf(
+            "curseHomepageUrl" to curseHomepageUrl,
+            "fabricApiVersion" to fabricApiVersion,
+            "fabricLoaderVersion" to fabricLoaderVersion,
+            "forgeVersionRange" to forgeVersionRange,
+            "githubUrl" to githubUrl,
+            "forgeLoaderVersionRange" to forgeLoaderVersionRange,
+            "neoforgeVersionRange" to neoforgeVersionRange,
+            "neoforgeLoaderVersionRange" to neoforgeLoaderVersionRange,
+            "minecraftVersion" to minecraftVersion,
+            "minecraftVersionRange" to minecraftVersionRange,
+            "modAuthor" to modAuthor,
+            "modDescription" to modDescription,
+            "modId" to modId,
+            "modJavaVersion" to modJavaVersion,
+            "modName" to modName,
+            "version" to version,
+        )
+        inputs.properties(properties)
         filesMatching(listOf("META-INF/mods.toml", "META-INF/neoforge.mods.toml", "pack.mcmeta", "fabric.mod.json")) {
-            expand(mapOf(
-                "curseHomepageUrl" to curseHomepageUrl,
-                "fabricApiVersion" to fabricApiVersion,
-                "fabricLoaderVersion" to fabricLoaderVersion,
-                "forgeVersionRange" to forgeVersionRange,
-                "githubUrl" to githubUrl,
-                "forgeLoaderVersionRange" to forgeLoaderVersionRange,
-                "neoforgeVersionRange" to neoforgeVersionRange,
-                "neoforgeLoaderVersionRange" to neoforgeLoaderVersionRange,
-                "minecraftVersion" to minecraftVersion,
-                "minecraftVersionRange" to minecraftVersionRange,
-                "modAuthor" to modAuthor,
-                "modDescription" to modDescription,
-                "modId" to modId,
-                "modJavaVersion" to modJavaVersion,
-                "modName" to modName,
-                "version" to version,
-            ))
+            expand(properties)
         }
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -6,6 +6,8 @@ org.gradle.daemon=true
 # Disabled because this breaks ForgeGradle tasks
 org.gradle.configureondemand=false
 org.gradle.caching=true
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.problems=warn
 
 # JEI
 modName=Just Enough Items