Use develocity cache connector (#10953)

.github/workflows/build-common.yml

@@ -18,10 +18,6 @@ on:
     secrets:
       GRADLE_ENTERPRISE_ACCESS_KEY:
         required: false
-      GE_CACHE_USERNAME:
-        required: false
-      GE_CACHE_PASSWORD:
-        required: false
 
 permissions:
   contents: read
@@ -45,8 +41,6 @@ jobs:
         uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-          GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-          GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
         with:
           arguments: spotlessCheck ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
           cache-read-only: ${{ inputs.cache-read-only }}
@@ -78,8 +72,6 @@ jobs:
         uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-          GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-          GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
         with:
           # currently ignoring inputs.no-build-cache and always running with --no-build-cache
           # see https://github.com/jk1/Gradle-License-Report/issues/231
@@ -152,8 +144,6 @@ jobs:
         uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-          GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-          GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
         with:
           # javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
           arguments: check -x javadoc -x spotlessCheck -PskipTests=true ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
@@ -244,8 +234,6 @@ jobs:
       - name: List tests
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-          GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-          GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
         uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
         with:
           # "check" is needed to activate all tests for listing purposes
@@ -264,8 +252,6 @@ jobs:
       - name: Test
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-          GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-          GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
         uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
         with:
           # spotless is checked separately since it's a common source of failure
@@ -350,16 +336,12 @@ jobs:
       - name: Build
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-          GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-          GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
         # running suite "none" compiles everything needed by smoke tests without executing any tests
         run: ./gradlew :smoke-tests:test -PsmokeTestSuite=none --no-daemon ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
 
       - name: Test
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-          GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-          GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
         run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }}${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
 
       - name: Upload jvm crash dump files if any

.github/workflows/build-daily.yml

@@ -11,15 +11,11 @@ jobs:
     uses: ./.github/workflows/build-common.yml
     secrets:
       GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-      GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-      GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
 
   test-latest-deps:
     uses: ./.github/workflows/reusable-test-latest-deps.yml
     secrets:
       GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-      GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-      GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
 
   muzzle:
     uses: ./.github/workflows/reusable-muzzle.yml

.github/workflows/build.yml

@@ -12,8 +12,6 @@ jobs:
     uses: ./.github/workflows/build-common.yml
     secrets:
       GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-      GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-      GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
 
   test-latest-deps:
     # release branches are excluded
@@ -23,8 +21,6 @@ jobs:
     uses: ./.github/workflows/reusable-test-latest-deps.yml
     secrets:
       GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-      GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-      GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
 
   muzzle:
     # release branches are excluded

.github/workflows/reusable-test-indy.yml

@@ -12,10 +12,6 @@ on:
     secrets:
       GRADLE_ENTERPRISE_ACCESS_KEY:
         required: false
-      GE_CACHE_USERNAME:
-        required: false
-      GE_CACHE_PASSWORD:
-        required: false
 
 permissions:
   contents: read
@@ -65,8 +61,6 @@ jobs:
       - name: List tests
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-          GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-          GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
         uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
         with:
           arguments: >
@@ -83,8 +77,6 @@ jobs:
         uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-          GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-          GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
         with:
           arguments: >
             ${{ env.test-tasks }}

.github/workflows/reusable-test-latest-deps.yml

@@ -12,10 +12,6 @@ on:
     secrets:
       GRADLE_ENTERPRISE_ACCESS_KEY:
         required: false
-      GE_CACHE_USERNAME:
-        required: false
-      GE_CACHE_PASSWORD:
-        required: false
 
 permissions:
   contents: read
@@ -61,8 +57,6 @@ jobs:
       - name: List tests
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-          GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-          GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
         uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
         with:
           arguments: >
@@ -80,8 +74,6 @@ jobs:
         uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-          GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-          GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
         with:
           arguments: >
             ${{ env.test-tasks }}

settings.gradle.kts

@@ -71,17 +71,10 @@ if (useScansGradleCom) {
       }
     }
   }
-}
 
-val geCacheUsername = System.getenv("GE_CACHE_USERNAME") ?: ""
-val geCachePassword = System.getenv("GE_CACHE_PASSWORD") ?: ""
-buildCache {
-  remote<HttpBuildCache> {
-    url = uri("$gradleEnterpriseServer/cache/")
-    isPush = isCI && geCacheUsername.isNotEmpty()
-    credentials {
-      username = geCacheUsername
-      password = geCachePassword
+  buildCache {
+    remote(gradleEnterprise.buildCache) {
+      isPush = isCI && geAccessKey.isNotEmpty()
     }
   }
 }