From 7713224ab6bf6f50c90447da1b184d76e754c5d9 Mon Sep 17 00:00:00 2001
From: Tyler Bertrand <121591679+tylerbertrand@users.noreply.github.com>
Date: Mon, 22 Jul 2024 15:33:03 -0500
Subject: [PATCH] Use Develocity build cache configuration and access key
 authentication (#8964)

---
 .github/workflows/ci.yml   | 3 +--
 examples/settings.gradle   | 9 ++-------
 settings.gradle            | 9 ++-------
 smoke-test/settings.gradle | 9 ++-------
 4 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fccc9caab04..fcdebaee5cc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,8 +43,7 @@ permissions:
 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 }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
   core:
diff --git a/examples/settings.gradle b/examples/settings.gradle
index 577a4298c7b..8aed2430fb5 100644
--- a/examples/settings.gradle
+++ b/examples/settings.gradle
@@ -43,14 +43,9 @@ buildCache {
     local {
         enabled = !isCI
     }
-    remote(HttpBuildCache) {
-        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
+    remote(develocity.buildCache) {
+        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("DEVELOCITY_ACCESS_KEY")
         enabled = true
-        url = 'https://ge.testcontainers.org/cache/'
-        credentials {
-            username = 'ci'
-            password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
-        }
     }
 }
 
diff --git a/settings.gradle b/settings.gradle
index 69d0e489a9a..d60d222c079 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -40,14 +40,9 @@ buildCache {
     local {
         enabled = !isCI
     }
-    remote(HttpBuildCache) {
-        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
+    remote(develocity.buildCache) {
+        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("DEVELOCITY_ACCESS_KEY")
         enabled = true
-        url = 'https://ge.testcontainers.org/cache/'
-        credentials {
-            username = 'ci'
-            password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
-        }
     }
 }
 
diff --git a/smoke-test/settings.gradle b/smoke-test/settings.gradle
index 8642e528279..e79fb0d5c94 100644
--- a/smoke-test/settings.gradle
+++ b/smoke-test/settings.gradle
@@ -27,14 +27,9 @@ buildCache {
     local {
         enabled = !isCI
     }
-    remote(HttpBuildCache) {
-        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
+    remote(develocity.buildCache) {
+        push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") && System.getenv("DEVELOCITY_ACCESS_KEY")
         enabled = true
-        url = 'https://ge.testcontainers.org/cache/'
-        credentials {
-            username = 'ci'
-            password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
-        }
     }
 }