Merge pull request #73 from gradle/cjohnson/enable-config-cache

etiennestuder · web-flow · commit b96df83d90f1 · 2022-04-20T09:27:39.000+02:00
Enable configuration caching
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -93,15 +93,16 @@ val copyGradleScripts = tasks.register<Copy>("copyGradleScripts") {
     group = "build"
     description = "Copies the Gradle source and generated scripts to output directory."
 
-    inputs.property("project.version", appVersion)
+    val projectVersion = appVersion // local variable required for configuration cache compatibility
+    inputs.property("project.version", projectVersion)
 
     from(layout.projectDirectory.file("LICENSE"))
     from(layout.projectDirectory.dir("release").file("version.txt"))
     rename("version.txt", "VERSION")
 
     from(layout.projectDirectory.dir("components/scripts/gradle")) {
         exclude("gradle-init-scripts")
-        filter { line: String -> line.replace("<HEAD>", appVersion) }
+        filter { line: String -> line.replace("<HEAD>", projectVersion) }
     }
     from(layout.projectDirectory.dir("components/scripts/gradle")) {
         include("gradle-init-scripts/**")
@@ -111,7 +112,7 @@ val copyGradleScripts = tasks.register<Copy>("copyGradleScripts") {
         include("README.md")
         include("lib/**")
         exclude("lib/cli-parsers")
-        filter { line: String -> line.replace("<HEAD>", appVersion) }
+        filter { line: String -> line.replace("<HEAD>", projectVersion) }
     }
     from(applyArgbash.map { it.outputDir.file("lib/cli-parsers/gradle") }) {
         into("lib/")
@@ -126,20 +127,21 @@ val copyMavenScripts = tasks.register<Copy>("copyMavenScripts") {
     group = "build"
     description = "Copies the Maven source and generated scripts to output directory."
 
-    inputs.property("project.version", appVersion)
+    val projectVersion = appVersion // local variable required for configuration cache compatibility
+    inputs.property("project.version", projectVersion)
 
     from(layout.projectDirectory.file("LICENSE"))
     from(layout.projectDirectory.dir("release").file("version.txt"))
     rename("version.txt", "VERSION")
 
     from(layout.projectDirectory.dir("components/scripts/maven")) {
-        filter { line: String -> line.replace("<HEAD>", appVersion) }
+        filter { line: String -> line.replace("<HEAD>", projectVersion) }
     }
     from(layout.projectDirectory.dir("components/scripts/")) {
         include("README.md")
         include("lib/**")
         exclude("lib/cli-parsers")
-        filter { line: String -> line.replace("<HEAD>", appVersion) }
+        filter { line: String -> line.replace("<HEAD>", projectVersion) }
     }
     from(applyArgbash.map { it.outputDir.file("lib/cli-parsers/maven") }) {
         into("lib/")
@@ -262,6 +264,10 @@ tasks.named("githubRelease") {
     dependsOn("createReleaseTag")
 }
 
+tasks.withType(Sign::class).configureEach {
+    notCompatibleWithConfigurationCache("$name task does not support configuration caching")
+}
+
 fun gitHubReleaseName(): String {
     if (isDevelopmentRelease) {
         return "Development Build"
diff --git a/gradle.properties b/gradle.properties
@@ -2,5 +2,5 @@ org.gradle.vfs.watch=true
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.unsafe.configuration-cache=false
+org.gradle.unsafe.configuration-cache=true
 org.gradle.jvmargs=-Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8
