Adapt Gradle config according to Gradle Enterprise Trial experiments (#4705)

We are now utilizing the Gradle Enterprise remote cache.

Author: kiview

.github/workflows/ci-examples.yml

@@ -8,6 +8,7 @@ env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
 
 jobs:
   find_gradle_jobs:

.github/workflows/ci.yml

@@ -8,6 +8,7 @@ env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
 
 jobs:
   thundra_test_initializer:

.gitignore

@@ -64,3 +64,6 @@ src/mkdocs-codeinclude-plugin
 src/pip-delete-this-directory.txt
 
 .DS_Store
+
+# Codespaces / VSCode
+/.vscode/

build.gradle

@@ -46,9 +46,14 @@ subprojects {
     task delombok(type: io.franzbecker.gradle.lombok.task.DelombokTask) {
         def outputDir = file("$buildDir/delombok")
         outputs.dir(outputDir)
+        outputs.cacheIf {
+            true
+        }
         for (srcDir in project.sourceSets.main.java.srcDirs) {
+            // TODO: named input and relative path for `srcDir` to make task more cacheable
             inputs.dir(srcDir)
-            args(srcDir, "-d", outputDir)
+            // TODO: `outputDir` as relative path to make task more cacheable 
+            args(srcDir, "-d", outputDir, "-f", "generateDelombokComment:skip")
         }
     }
     delombok.onlyIf {

examples/settings.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.6.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.7.2"
     }
 }
 

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.parallel=false
 org.gradle.caching=true
-
+org.gradle.configureondemand=true

settings.gradle

@@ -5,13 +5,11 @@ buildscript {
         }
     }
     dependencies {
-        classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.6.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.2.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.7.2"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.6.1"
     }
 }
 
-apply plugin: 'ch.myniva.s3-build-cache'
 apply plugin: 'com.gradle.enterprise'
 apply plugin: "com.gradle.common-custom-user-data-gradle-plugin"
 
@@ -38,21 +36,20 @@ ext.isMasterBuild = false ||
     (System.getenv("GITHUB_REF") == "refs/heads/master") ||
     (System.getenv("BUILD_SOURCEBRANCHNAME") == "master")
 
+ext.isCI = System.getenv("CI") != null
+
 buildCache {
     local {
-        enabled = !isMasterBuild
+        enabled = !isCI
     }
-
-    remote(ch.myniva.gradle.caching.s3.AwsS3BuildCache) {
-        endpoint = 'fra1.digitaloceanspaces.com'
-        region = 'fra1'
-        bucket = 'testcontainers'
-        path = 'cache'
-        reducedRedundancy = false
-        push = isMasterBuild && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE")
-        headers = [
-            'x-amz-acl': 'public-read'
-        ]
+    remote(HttpBuildCache) { 
+        push = isCI
+        enabled = true
+        url = 'https://ge.testcontainers.org/cache/' 
+        credentials {
+            username = 'ci'
+            password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
+        }
     }
 }
 
@@ -61,7 +58,7 @@ gradleEnterprise {
         server = "https://ge.testcontainers.org/"
         publishAlways()
         publishIfAuthenticated()
-        uploadInBackground = System.getenv("CI") == null
+        uploadInBackground = !isCI
         captureTaskInputFiles = true
     }