Test and improve gradle configuration cache

freefair · Aug 9, 2023 · 2654bd2 · 2654bd2
1 parent 6bdcaee
commit 2654bd2
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/examples/gradle.properties b/examples/gradle.properties
diff --git a/examples/gradle.properties b/examples/gradle.properties
@@ -0,0 +1,5 @@
+org.gradle.parallel=true
+org.gradle.caching=true
+
+org.gradle.configuration-cache=false
+org.gradle.configuration-cache.problems=warn
diff --git a/examples/settings.gradle b/examples/settings.gradle
@@ -1,5 +1,7 @@
 rootProject.name = 'gradle-plugins-examples'
 
+enableFeaturePreview "STABLE_CONFIGURATION_CACHE"
+
 includeBuild '..'
 
 include ":compress"

diff --git a/git-plugin/src/main/java/io/freefair/gradle/plugins/git/GitVersionPlugin.java b/git-plugin/src/main/java/io/freefair/gradle/plugins/git/GitVersionPlugin.java
@@ -1,6 +1,5 @@
 package io.freefair.gradle.plugins.git;
 
-import org.codehaus.groovy.runtime.ProcessGroovyMethods;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.logging.Logger;
@@ -115,8 +114,15 @@ else if (GitUtil.isCircleCi()) {
         }
 
         try {
-            Process execute = ProcessGroovyMethods.execute("git describe --tags --exact-match --dirty=-SNAPSHOT");
-            String gitTag = ProcessGroovyMethods.getText(execute).trim();
+            String gitTag = project.getProviders()
+                    .exec(execSpec -> {
+                        execSpec.setWorkingDir(project.getProjectDir());
+                        execSpec.commandLine("git", "describe", "--tags", "--exact-match", "--dirty=-SNAPSHOT");
+                    })
+                    .getStandardOutput()
+                    .getAsText()
+                    .get()
+                    .trim();
 
             if (!gitTag.isEmpty()) {
                 String version = resolveTagVersion(gitTag);
@@ -149,8 +155,15 @@ else if (GitUtil.isCircleCi()) {
         }
 
         try {
-            Process execute = ProcessGroovyMethods.execute("git symbolic-ref --short HEAD");
-            String gitBranch = ProcessGroovyMethods.getText(execute).trim();
+            String gitBranch = project.getProviders()
+                    .exec(execSpec -> {
+                        execSpec.setWorkingDir(project.getProjectDir());
+                        execSpec.commandLine("git", "symbolic-ref", "--short", "HEAD");
+                    })
+                    .getStandardOutput()
+                    .getAsText()
+                    .get()
+                    .trim();
 
             if (!gitBranch.isEmpty()) {
                 String version = resolveBranchVersion(gitBranch);

diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,5 @@
 org.gradle.parallel=true
 org.gradle.caching=true
+
+org.gradle.configuration-cache=false
+org.gradle.configuration-cache.problems=warn
diff --git a/settings.gradle b/settings.gradle
@@ -15,6 +15,8 @@ plugins {
     id "com.gradle.enterprise" version "3.14.1"
 }
 
+enableFeaturePreview "STABLE_CONFIGURATION_CACHE"
+
 boolean isCiServer = System.getenv().containsKey("CI")
 
 gradleEnterprise {