Build outputs

When changing workflow names or when changing to the new 'dependency-submission'
action, it can be useful to clear existing dependency graph snapshots from previous
submissions. While the old graphs will eventually "age out", the 'clear' option will
submit an empty dependency graph for an existing Job correlator, ensuring that old
dependency graphs don't linger.

.github/workflow-samples/groovy-dsl/settings.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id "com.gradle.enterprise" version "3.16.1"
+    id "com.gradle.enterprise" version "3.15.1"
-    id "com.gradle.common-custom-user-data-gradle-plugin" version "1.12.1"
+    id "com.gradle.common-custom-user-data-gradle-plugin" version "1.12"
 }
 
 gradleEnterprise {

.github/workflow-samples/kotlin-dsl/build.gradle.kts

@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     api("org.apache.commons:commons-math3:3.6.1")
-    implementation("com.google.guava:guava:33.0.0-jre")
+    implementation("com.google.guava:guava:32.1.3-jre")
 
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
 }

.github/workflow-samples/kotlin-dsl/settings.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("com.gradle.enterprise") version "3.16.1"
+    id("com.gradle.enterprise") version "3.15.1"
-    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.1"
+    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12"
 }
 
 gradleEnterprise {

.github/workflow-samples/no-wrapper-gradle-5/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.build-scan" version "3.16.1" 
+    id "com.gradle.build-scan" version "3.15.1" 
 }
 
 gradleEnterprise {

.github/workflow-samples/no-wrapper/settings.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.16.1"
+    id "com.gradle.enterprise" version "3.15.1"
 }
 
 gradleEnterprise {

.github/workflows/ci-codeql.yml

@@ -42,7 +42,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v2

.github/workflows/ci-full-check.yml

@@ -9,6 +9,7 @@ on:
   push:
     branches: 
       - main
+      - release/**
     paths:
       - '.github/**'
       - 'dist/**'
@@ -25,7 +26,7 @@ jobs:
       cache-key-prefix: ${{github.run_number}}-
 
   caching-config:
-    uses: ./.github/workflows/integ-test-caching-config.yml
+    uses: ./.github/workflows/integ-test-action-inputs-caching.yml
     with:
       cache-key-prefix: ${{github.run_number}}-
 

.github/workflows/ci-init-script-check.yml

@@ -20,7 +20,7 @@ jobs:
         distribution: temurin
         java-version: 8
     - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2.11.0 # Use a released version to avoid breakages
+      uses: gradle/gradle-build-action@v2.10.0 # Use a released version to avoid breakages
     - name: Run integration tests
       working-directory: test/init-scripts
       run: ./gradlew check

.github/workflows/ci-quick-check.yml

@@ -3,7 +3,9 @@ name: CI-quick-check
 on:
   workflow_dispatch:
   push:
-    branches-ignore: main
+    branches-ignore: 
+    - main
+    - release/**
 
 jobs:
   build-distribution:
@@ -45,7 +47,7 @@ jobs:
 
   caching-config:
     needs: build-distribution
-    uses: ./.github/workflows/integ-test-caching-config.yml
+    uses: ./.github/workflows/integ-test-action-inputs-caching.yml
     with:
       runner-os: '["ubuntu-latest"]'
       download-dist: true
@@ -87,12 +89,12 @@ jobs:
       runner-os: '["ubuntu-latest"]'
       download-dist: true
 
-  restore-configuration-cache:
+  # restore-configuration-cache:
-    needs: build-distribution
+  #   needs: build-distribution
-    uses: ./.github/workflows/integ-test-restore-configuration-cache.yml
+  #   uses: ./.github/workflows/integ-test-restore-configuration-cache.yml
-    with:
+  #   with:
-      runner-os: '["ubuntu-latest"]'
+  #     runner-os: '["ubuntu-latest"]'
-      download-dist: true
+  #     download-dist: true
 
   restore-containerized-gradle-home:
     needs: build-distribution

.github/workflows/ci-verify-outputs.yml

@@ -8,6 +8,7 @@ on:
   push:
     branches: 
       - main
+      - release/**
       - dependabot/**
 
 jobs:
@@ -33,7 +34,7 @@ jobs:
       id: diff
 
     # If index.js was different than expected, upload the expected version as an artifact
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v3
       if: ${{ failure() && steps.diff.conclusion == 'failure' }}
       with:
         name: dist

.github/workflows/integ-test-action-inputs-caching.yml

@@ -1,4 +1,4 @@
-name: Test caching configuration
+name: Test action inputs for caching
 
 on:
   workflow_call:
@@ -38,8 +38,7 @@ jobs:
             enterprise
         # Exclude build-cache from main cache entry
         gradle-home-cache-excludes: |
-            caches/build-cache-*
+            caches/build-cache-1
-            caches/*/executionHistory
     - name: Build using Gradle wrapper
       working-directory: .github/workflow-samples/groovy-dsl
       run: ./gradlew test
@@ -64,8 +63,7 @@ jobs:
             caches
             enterprise
         gradle-home-cache-excludes: |
-            caches/build-cache-*
+            caches/build-cache-1
-            caches/*/executionHistory
         cache-read-only: true
     - name: Execute Gradle build with --offline
       working-directory: .github/workflow-samples/groovy-dsl

.github/workflows/integ-test-dependency-graph.yml

@@ -31,7 +31,7 @@ jobs:
     - name: Setup Gradle for dependency-graph generate
       uses: ./
       with:
-        dependency-graph: generate-and-upload
+        dependency-graph: generate
     - name: Run gradle build
       run: ./gradlew build
       working-directory: .github/workflow-samples/groovy-dsl
@@ -55,7 +55,7 @@ jobs:
       working-directory: .github/workflow-samples/kotlin-dsl
   
   submit:
-    needs: [groovy-generate]
+    needs: [groovy-generate, kotlin-generate]
     runs-on: "ubuntu-latest"
     steps:
     - name: Checkout sources
@@ -80,7 +80,7 @@ jobs:
     - name: Setup Gradle for dependency-graph generate
       uses: ./
       with:
-        dependency-graph: generate-and-submit
+        dependency-graph: generate
     - id: gradle-assemble
       run: ./gradlew assemble
       working-directory: .github/workflow-samples/groovy-dsl

.github/workflows/integ-test-inject-gradle-enterprise.yml

@@ -21,8 +21,8 @@ env:
   GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
   GRADLE_ENTERPRISE_INJECTION_ENABLED: true
   GRADLE_ENTERPRISE_URL: https://ge.solutions-team.gradle.com
-  GRADLE_ENTERPRISE_PLUGIN_VERSION: 3.16.1
+  GRADLE_ENTERPRISE_PLUGIN_VERSION: 3.15.1
-  GRADLE_ENTERPRISE_CCUD_PLUGIN_VERSION: 1.12.1
+  GRADLE_ENTERPRISE_CCUD_PLUGIN_VERSION: 1.12
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:

.github/workflows/integ-test-restore-configuration-cache.yml

@@ -34,11 +34,9 @@ jobs:
       uses: ./
       with:
         cache-read-only: false # For testing, allow writing cache entries on non-default branches
-        cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
-        gradle-version: release-nightly
     - name: Groovy build with configuration-cache enabled
       working-directory: .github/workflow-samples/groovy-dsl
-      run: gradle test --configuration-cache
+      run: ./gradlew test --configuration-cache
 
   verify-build-groovy:
     env:
@@ -57,12 +55,10 @@ jobs:
       uses: ./
       with:
         cache-read-only: true
-        cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
-        gradle-version: release-nightly
     - name: Groovy build with configuration-cache enabled
       id: execute
       working-directory: .github/workflow-samples/groovy-dsl
-      run: gradle test --configuration-cache
+      run: ./gradlew test --configuration-cache
     - name: Check that configuration-cache was used
       uses: actions/github-script@v7
       with:
@@ -92,11 +88,9 @@ jobs:
         GRADLE_BUILD_ACTION_SKIP_RESTORE: "generated-gradle-jars|wrapper-zips|java-toolchains|instrumented-jars|dependencies|kotlin-dsl"
       with:
         cache-read-only: true
-        cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
-        gradle-version: release-nightly
     - name: Check execute Gradle build with configuration cache enabled (but not restored)
       working-directory: .github/workflow-samples/groovy-dsl
-      run: gradle test --configuration-cache
+      run: ./gradlew test --configuration-cache
 
   seed-build-kotlin:
     env:
@@ -114,11 +108,9 @@ jobs:
       uses: ./
       with:
         cache-read-only: false # For testing, allow writing cache entries on non-default branches
-        cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
-        gradle-version: release-nightly
     - name: Execute 'help' with configuration-cache enabled
       working-directory: .github/workflow-samples/kotlin-dsl
-      run: gradle help --configuration-cache
+      run: ./gradlew help --configuration-cache
 
   modify-build-kotlin:
     env:
@@ -137,11 +129,9 @@ jobs:
       uses: ./
       with:
         cache-read-only: false # For testing, allow writing cache entries on non-default branches
-        cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
-        gradle-version: release-nightly
     - name: Execute 'test' with configuration-cache enabled
       working-directory: .github/workflow-samples/kotlin-dsl
-      run: gradle test --configuration-cache
+      run: ./gradlew test --configuration-cache
 
   # Test restore configuration-cache from the third build invocation
   verify-build-kotlin:
@@ -161,12 +151,10 @@ jobs:
       uses: ./
       with:
         cache-read-only: true
-        cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
-        gradle-version: release-nightly
     - name: Execute 'test' again with configuration-cache enabled
       id: execute
       working-directory: .github/workflow-samples/kotlin-dsl
-      run: gradle test --configuration-cache
+      run: ./gradlew test --configuration-cache
     - name: Check that configuration-cache was used
       uses: actions/github-script@v7
       with:

.tool-versions

@@ -1,3 +1,3 @@
 # Configuration file for asdf version manager
-nodejs 20.10.0
+nodejs 16.18.1
 gradle 8.5

README.md

@@ -97,6 +97,7 @@ jobs:
     - run: echo "The release-candidate version was ${{ steps.setup-gradle.outputs.gradle-version }}"
 ```
 
+
 ## Caching build state between Jobs
 
 The `gradle-build-action` will use the GitHub Actions cache to save and restore reusable state that may be speed up a subsequent build invocation. This includes most content that is downloaded from the internet as part of a build, as well as expensive to create content like compiled build scripts, transformed Jar files, etc.
@@ -160,30 +161,6 @@ If you want override the default and have the `gradle-build-action` caches overw
 cache-overwrite-existing: true
 ```
 
-### Saving configuration-cache data
-
-When Gradle is executed with the [configuration-cache](https://docs.gradle.org/current/userguide/configuration_cache.html) enabled, the configuration-cache data is stored
-in the project directory, at `<project-dir>/.gradle/configuration-cache`. Due to the way the configuration-cache works, [this file may contain stored credentials and other
-secrets](https://docs.gradle.org/release-nightly/userguide/configuration_cache.html#config_cache:secrets), and this data needs to be encrypted in order to be safely stored in the GitHub Actions cache.
-
-In order to benefit from configuration caching in your GitHub Actions workflow, you must:
-- Enable the configuration cache for your build
-- Execute your build with Gradle 8.6 or newer. This can be achieved directly, or via the Gradle Wrapper.
-- Provide a [valid Gradle encryption key](https://docs.gradle.org/release-nightly/userguide/configuration_cache.html#config_cache:secrets:configuring_encryption_key) via the `cache-encryption-key` action parameter
-
-```yaml
-jobs:
-  gradle-with-configuration-cache:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: gradle/gradle-build-action@v3
-      with:
-        gradle-version: 8.6
-        cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
-    - run: gradle build --configuration-cache
-```
-
 ### Incompatibility with other caching mechanisms
 
 When using `gradle-build-action` we recommend that you avoid using other mechanisms to save and restore the Gradle User Home. 
@@ -446,6 +423,103 @@ jobs:
         path: build/reports/
 ```
 
+## Use the action to invoke Gradle
+
+If the `gradle-build-action` is configured with an `arguments` input, then Gradle will execute a Gradle build with the arguments provided. NOTE: We recommend using the `gradle-build-action` as a "Setup Gradle" step as described above, with Gradle being invoked via a regular `run` command.
+
+If no `arguments` are provided, the action will not execute Gradle, but will still cache Gradle state and configure build-scan capture for all subsequent Gradle executions.
+
+```yaml
+name: Run Gradle on PRs
+on: pull_request
+jobs:
+  gradle:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v3
+      with:
+        distribution: temurin
+        java-version: 11
+    
+    - name: Setup and execute Gradle 'test' task
+      uses: gradle/gradle-build-action@v2
+      with:
+        arguments: test
+```
+
+### Multiple Gradle executions in the same Job
+
+It is possible to configure multiple Gradle executions to run sequentially in the same job. 
+The initial Action step will perform the Gradle setup.
+
+```yaml
+- uses: gradle/gradle-build-action@v2
+  with:
+    arguments: assemble
+- uses: gradle/gradle-build-action@v2
+  with:
+    arguments: check
+```
+
+### Gradle command-line arguments
+
+The `arguments` input can be used to pass arbitrary arguments to the `gradle` command line.
+Arguments can be supplied in a single line, or as a multi-line input.
+
+Here are some valid examples:
+```yaml
+arguments: build
+arguments: check --scan
+arguments: some arbitrary tasks
+arguments: build -PgradleProperty=foo
+arguments: |
+    build
+    --scan
+    -PgradleProperty=foo
+    -DsystemProperty=bar
+```
+
+If you need to pass environment variables, use the GitHub Actions workflow syntax:
+
+```yaml
+- uses: gradle/gradle-build-action@v2
+  env:
+    CI: true
+  with:
+    arguments: build
+```
+
+### Gradle build located in a subdirectory
+
+By default, the action will execute Gradle in the root directory of your project. 
+Use the `build-root-directory` input to target a Gradle build in a subdirectory.
+
+```yaml
+- uses: gradle/gradle-build-action@v2
+  with:
+    arguments: build
+    build-root-directory: some/subdirectory
+```
+
+### Using a specific Gradle executable
+
+The action will first look for a Gradle wrapper script in the root directory of your project. 
+If not found, `gradle` will be executed from the PATH.
+Use the `gradle-executable` input to execute using a specific Gradle installation.
+
+```yaml
+ - uses: gradle/gradle-build-action@v2
+   with:
+     arguments: build
+     gradle-executable: /path/to/installed/gradle
+```
+
+This mechanism can also be used to target a Gradle wrapper script that is located in a non-default location.
+
 ## Support for GitHub Enterprise Server (GHES)
 
 You can use the `gradle-build-action` on GitHub Enterprise Server, and benefit from the improved integration with Gradle. Depending on the version of GHES you are running, certain features may be limited:
@@ -795,7 +869,7 @@ name: Run build with Gradle Enterprise injection
 env:
   GRADLE_ENTERPRISE_INJECTION_ENABLED: true
   GRADLE_ENTERPRISE_URL: https://ge.gradle.org
-  GRADLE_ENTERPRISE_PLUGIN_VERSION: 3.16.1
+  GRADLE_ENTERPRISE_PLUGIN_VERSION: 3.15.1
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_KEY }} # Required to publish scans to ge.gradle.org
 
 jobs:
@@ -809,7 +883,7 @@ jobs:
       run: ./gradlew build
 ```
 
-This configuration will automatically apply `v3.16.1` of the [Gradle Enterprise Gradle plugin](https://docs.gradle.com/enterprise/gradle-plugin/), and publish build scans to https://ge.gradle.org.
+This configuration will automatically apply `v3.15.1` of the [Gradle Enterprise Gradle plugin](https://docs.gradle.com/enterprise/gradle-plugin/), and publish build scans to https://ge.gradle.org.
 
 Note that the `ge.gradle.org` server requires authentication in order to publish scans. The provided `GRADLE_ENTERPRISE_ACCESS_KEY` isn't required by the Gradle Enterprise injection script, 
 but will be used by the GE plugin in order to authenticate with the server.

action.yml

@@ -8,6 +8,14 @@ inputs:
     description: Gradle version to use. If specified, this Gradle version will be downloaded, added to the PATH and used for invoking Gradle.
     required: false
 
+  gradle-executable:
+    description: Path to the Gradle executable. If specified, this executable will be added to the PATH and used for invoking Gradle.
+    required: false
+
+  build-root-directory:
+    description: Path to the root directory of the build. Default is the root of the GitHub workspace.
+    required: false
+
   cache-disabled:
     description: When 'true', all caching is disabled. No entries will be written to or read from the cache.
     required: false
@@ -32,13 +40,6 @@ inputs:
     required: false
     default: false
 
-  cache-encryption-key:
-    description: |
-      A base64 encoded AES key used to encrypt the configuration-cache data. The key is exported as 'GRADLE_ENCRYPTION_KEY' for later steps. 
-      A suitable key can be generated with `openssl rand -base64 16`.
-      Configuration-cache data will not be saved/restored without an encryption key being provided.
-    required: false
-
   gradle-home-cache-includes:
     description: Paths within Gradle User Home to cache.
     required: false
@@ -58,13 +59,17 @@ inputs:
     required: false
     default: false
 
+  arguments:
+    description: Gradle command line arguments (supports multi-line input)
+    required: false
+
   generate-job-summary:
     description: When 'false', no Job Summary will be generated for the Job.
     required: false
     default: true
 
   dependency-graph:
-    description: Specifies if a GitHub dependency snapshot should be generated for each Gradle build, and if so, how. Valid values are 'disabled' (default), 'generate', 'generate-and-submit', 'generate-and-upload' and 'download-and-submit'.
+    description: Specifies if a GitHub dependency snapshot should be generated for each Gradle build, and if so, how. Valid values are 'disabled' (default), 'generate', 'generate-and-submit', 'download-and-submit' and 'clear'.
     required: false
     default: 'disabled'
 
@@ -72,22 +77,6 @@ inputs:
     description: Specifies the number of days to retain any artifacts generated by the action. If not set, the default retention settings for the repository will apply.
     required: false
 
-  # DEPRECATED ACTION INPUTS
-  arguments:
-    description: Gradle command line arguments (supports multi-line input)
-    required: false
-    deprecation-message: Using the action to execute Gradle directly is deprecated in favor of using the action to setup Gradle, and executing Gradle in a subsequent Step. See https://github.com/gradle/gradle-build-action?tab=readme-ov-file#use-the-action-to-setup-gradle. 
-
-  build-root-directory:
-    description: Path to the root directory of the build. Default is the root of the GitHub workspace.
-    required: false
-    deprecation-message: Using the action to execute Gradle directly is deprecated in favor of using the action to setup Gradle, and executing Gradle in a subsequent Step. See https://github.com/gradle/gradle-build-action?tab=readme-ov-file#use-the-action-to-setup-gradle. 
-
-  gradle-executable:
-    description: Path to the Gradle executable. If specified, this executable will be added to the PATH and used for invoking Gradle.
-    required: false
-    deprecation-message: Using the action to execute Gradle directly is deprecated in favor of using the action to setup Gradle, and executing Gradle in a subsequent Step. See https://github.com/gradle/gradle-build-action?tab=readme-ov-file#use-the-action-to-setup-gradle. 
-
   # EXPERIMENTAL & INTERNAL ACTION INPUTS
   # The following action properties allow fine-grained tweaking of the action caching behaviour.
   # These properties are experimental and not (yet) designed for production use, and may change without notice in a subsequent release of `gradle-build-action`.
@@ -96,7 +85,6 @@ inputs:
     description: When 'true', the action will not attempt to restore the Gradle User Home entries from other Jobs.
     required: false
     default: false
-    
   workflow-job-context:
     description: Used to uniquely identify the current job invocation. Defaults to the matrix values for this job; this should not be overridden by users (INTERNAL).
     required: false
@@ -116,7 +104,7 @@ outputs:
     description: Version of Gradle that was setup by the action
 
 runs:
-  using: 'node20'
+  using: 'node16'
   main: 'dist/main/index.js'
   post: 'dist/post/index.js'
 

actions/clear-dependency-graph/action.yml

@@ -1,24 +0,0 @@
-name: 'Clear dependency graph for a correlator'
-
-inputs:
-  job-correlator:
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-  - name: Set current timestamp as env variable
-    shell: bash
-    run: echo "NOW=$(date -Iseconds)" >> $GITHUB_ENV
-  - name: Submit empty dependency graph
-    shell: bash
-    run: |
-      curl -L \
-      -X POST \
-      -H "Accept: application/vnd.github+json" \
-      -H "Authorization: Bearer ${{ github.token }}" \
-      -H "X-GitHub-Api-Version: 2022-11-28" \
-      https://api.github.com/repos/${{ github.repository }}/dependency-graph/snapshots \
-      -d '{ "version" : 0, "job" : { "id" : "${{ github.run_id }}", "correlator" : "${{ inputs.job-correlator }} " }, "sha" : "${{ github.sha }}", "ref" : "${{ github.ref }}",  "detector" : { "name" : "GitHub Dependency Graph Gradle Plugin", "version" : "0.0.3", "url" : "https://github.com/gradle/github-dependency-graph-gradle-plugin" }, "manifests" : {}, "scanned" : "${{ env.NOW }}" }'
-  - run: echo "::notice ::Cleared dependency graph for job correlator '${{ inputs.job-correlator }}'"
-    shell: bash

package.json

@@ -8,9 +8,11 @@
     "format": "prettier --write **/*.ts",
     "format-check": "prettier --check **/*.ts",
     "lint": "eslint src/**/*.ts",
+
     "compile-main": "ncc build src/main.ts --out dist/main --source-map --no-source-map-register",
     "compile-post": "ncc build src/post.ts --out dist/post --source-map --no-source-map-register",
     "compile": "npm run compile-main && npm run compile-post",
+
     "test": "jest",
     "check": "npm run format && npm run lint",
     "build": "npm run check && npm run compile",
@@ -28,29 +30,28 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@actions/artifact": "2.0.0",
+    "@actions/artifact": "1.1.2",
     "@actions/cache": "3.2.2",
     "@actions/core": "1.10.1",
     "@actions/exec": "1.1.1",
-    "@actions/github": "6.0.0",
+    "@actions/github": "5.1.1",
     "@actions/glob": "0.4.0",
     "@actions/http-client": "2.2.0",
     "@actions/tool-cache": "2.0.1",
     "@octokit/rest": "19.0.13",
     "@octokit/webhooks-types": "7.3.1",
-    "semver": "7.5.4",
     "string-argv": "0.3.2"
   },
   "devDependencies": {
+    "@types/node": "16.18.38",
     "@types/jest": "29.5.11",
-    "@types/node": "20.10.0",
     "@types/unzipper": "0.10.9",
-    "@typescript-eslint/parser": "6.15.0",
+    "@typescript-eslint/parser": "6.14.0",
     "@vercel/ncc": "0.38.1",
-    "eslint": "8.56.0",
+    "eslint": "8.55.0",
     "eslint-plugin-github": "4.10.1",
     "eslint-plugin-jest": "27.6.0",
-    "eslint-plugin-prettier": "5.1.1",
+    "eslint-plugin-prettier": "5.0.1",
     "jest": "29.7.0",
     "js-yaml": "4.1.0",
     "patch-package": "8.0.0",

src/cache-base.ts

@@ -1,13 +1,11 @@
 import * as core from '@actions/core'
 import * as exec from '@actions/exec'
-import * as glob from '@actions/glob'
-
 import path from 'path'
 import fs from 'fs'
 import * as params from './input-params'
 import {CacheListener} from './cache-reporting'
 import {saveCache, restoreCache, cacheDebug, isCacheDebuggingEnabled, tryDelete, generateCacheKey} from './cache-utils'
-import {GradleHomeEntryExtractor, ConfigurationCacheEntryExtractor} from './cache-extract-entries'
+import {GradleHomeEntryExtractor} from './cache-extract-entries'
 
 const RESTORED_CACHE_KEY_KEY = 'restored-cache-key'
 
@@ -81,7 +79,7 @@ export class GradleStateCache {
     async afterRestore(listener: CacheListener): Promise<void> {
         await this.debugReportGradleUserHomeSize('as restored from cache')
         await new GradleHomeEntryExtractor(this.gradleUserHome).restore(listener)
-        await new ConfigurationCacheEntryExtractor(this.gradleUserHome).restore(listener)
+        // await new ConfigurationCacheEntryExtractor(this.gradleUserHome).restore(listener)
         await this.debugReportGradleUserHomeSize('after restoring common artifacts')
     }
 
@@ -129,10 +127,10 @@ export class GradleStateCache {
      */
     async beforeSave(listener: CacheListener): Promise<void> {
         await this.debugReportGradleUserHomeSize('before saving common artifacts')
-        await this.deleteExcludedPaths()
+        this.deleteExcludedPaths()
         await Promise.all([
-            new GradleHomeEntryExtractor(this.gradleUserHome).extract(listener),
+            new GradleHomeEntryExtractor(this.gradleUserHome).extract(listener)
-            new ConfigurationCacheEntryExtractor(this.gradleUserHome).extract(listener)
+            // new ConfigurationCacheEntryExtractor(this.gradleUserHome).extract(listener)
         ])
         await this.debugReportGradleUserHomeSize(
             "after extracting common artifacts (only 'caches' and 'notifications' will be stored)"
@@ -142,21 +140,13 @@ export class GradleStateCache {
     /**
      * Delete any file paths that are excluded by the `gradle-home-cache-excludes` parameter.
      */
-    private async deleteExcludedPaths(): Promise<void> {
+    private deleteExcludedPaths(): void {
         const rawPaths: string[] = params.getCacheExcludes()
-        rawPaths.push('caches/*/cc-keystore')
         const resolvedPaths = rawPaths.map(x => path.resolve(this.gradleUserHome, x))
 
         for (const p of resolvedPaths) {
-            cacheDebug(`Removing excluded path: ${p}`)
+            cacheDebug(`Deleting excluded path: ${p}`)
-            const globber = await glob.create(p, {
+            tryDelete(p)
-                implicitDescendants: false
-            })
-
-            for (const toDelete of await globber.glob()) {
-                cacheDebug(`Removing excluded file: ${toDelete}`)
-                await tryDelete(toDelete)
-            }
         }
     }
 

src/cache-extract-entries.ts

@@ -1,16 +1,14 @@
 import path from 'path'
 import fs from 'fs'
-import crypto from 'crypto'
 import * as core from '@actions/core'
 import * as glob from '@actions/glob'
-import * as semver from 'semver'
 
 import * as params from './input-params'
 
 import {META_FILE_DIR} from './cache-base'
 import {CacheEntryListener, CacheListener} from './cache-reporting'
 import {cacheDebug, getCacheKeyPrefix, hashFileNames, restoreCache, saveCache, tryDelete} from './cache-utils'
-import {BuildResult, loadBuildResults} from './build-results'
+import {loadBuildResults} from './build-results'
 
 const SKIP_RESTORE_VAR = 'GRADLE_BUILD_ACTION_SKIP_RESTORE'
 
@@ -48,7 +46,6 @@ class ExtractedCacheEntryDefinition {
     pattern: string
     bundle: boolean
     uniqueFileNames = true
-    notCacheableReason: string | undefined
 
     constructor(artifactType: string, pattern: string, bundle: boolean) {
         this.artifactType = artifactType
@@ -56,24 +53,10 @@ class ExtractedCacheEntryDefinition {
         this.bundle = bundle
     }
 
-    /**
-     * Indicate that the file names matching the cache entry pattern are NOT sufficient to uniquely identify the contents.
-     * If the file names are sufficient, then we use a hash of the file names to identify the entry.
-     * With non-unique-file-names, we hash the file contents to identify the cache entry.
-     */
     withNonUniqueFileNames(): ExtractedCacheEntryDefinition {
         this.uniqueFileNames = false
         return this
     }
-
-    /**
-     * Specify that the cache entry, should not be saved for some reason, even though the contents exist.
-     * This is used to prevent configuration-cache entries being cached when they were generated by Gradle < 8.6,
-     */
-    notCacheableBecause(reason: string): ExtractedCacheEntryDefinition {
-        this.notCacheableReason = reason
-        return this
-    }
 }
 
 /**
@@ -159,11 +142,6 @@ abstract class AbstractEntryExtractor {
             const artifactType = cacheEntryDefinition.artifactType
             const pattern = cacheEntryDefinition.pattern
 
-            if (cacheEntryDefinition.notCacheableReason) {
-                listener.entry(pattern).markNotSaved(cacheEntryDefinition.notCacheableReason)
-                continue
-            }
-
             // Find all matching files for this cache entry definition
             const globber = await glob.create(pattern, {
                 implicitDescendants: false
@@ -278,7 +256,7 @@ abstract class AbstractEntryExtractor {
         }
 
         const filedata = fs.readFileSync(cacheMetadataFile, 'utf-8')
-        cacheDebug(`Loaded cache metadata for ${this.extractorName}: ${filedata}`)
+        cacheDebug(`Loaded cache metadata: ${filedata}`)
         const extractedCacheEntryMetadata = JSON.parse(filedata) as ExtractedCacheEntryMetadata
         return extractedCacheEntryMetadata.entries
     }
@@ -286,12 +264,12 @@ abstract class AbstractEntryExtractor {
     /**
      * Saves information about the extracted cache entries into the 'cache-metadata.json' file.
      */
-    protected saveMetadataForCacheResults(results: ExtractedCacheEntry[]): void {
+    private saveMetadataForCacheResults(results: ExtractedCacheEntry[]): void {
         const extractedCacheEntryMetadata = new ExtractedCacheEntryMetadata()
         extractedCacheEntryMetadata.entries = results.filter(x => x.cacheKey !== undefined)
 
         const filedata = JSON.stringify(extractedCacheEntryMetadata)
-        cacheDebug(`Saving cache metadata for ${this.extractorName}: ${filedata}`)
+        cacheDebug(`Saving cache metadata: ${filedata}`)
 
         fs.writeFileSync(this.getCacheMetadataFile(), filedata, 'utf-8')
     }
@@ -373,104 +351,37 @@ export class ConfigurationCacheEntryExtractor extends AbstractEntryExtractor {
      * entry is not reusable.
      */
     async restore(listener: CacheListener): Promise<void> {
-        if (!listener.fullyRestored) {
+        if (listener.fullyRestored) {
-            this.markNotRestored(listener, 'Gradle User Home was not fully restored')
+            return super.restore(listener)
-            return
         }
 
-        if (!params.getCacheEncryptionKey()) {
+        core.info('Not restoring configuration-cache state, as Gradle User Home was not fully restored')
-            this.markNotRestored(listener, 'Encryption Key was not provided')
+        for (const cacheEntry of this.loadExtractedCacheEntries()) {
-            return
+            listener.entry(cacheEntry.pattern).markRequested('NOT_RESTORED')
         }
-
-        const encryptionKey = this.getAESEncryptionKey()
-        core.exportVariable('GRADLE_ENCRYPTION_KEY', encryptionKey)
-        return await super.restore(listener)
-    }
-
-    private markNotRestored(listener: CacheListener, reason: string): void {
-        const cacheEntries = this.loadExtractedCacheEntries()
-        if (cacheEntries.length > 0) {
-            core.info(`Not restoring configuration-cache state, as ${reason}`)
-            for (const cacheEntry of cacheEntries) {
-                listener.entry(cacheEntry.pattern).markNotRestored(reason)
-            }
-
-            // Update the results file based on no entries restored
-            this.saveMetadataForCacheResults([])
-        }
-    }
-
-    async extract(listener: CacheListener): Promise<void> {
-        if (!params.getCacheEncryptionKey()) {
-            const cacheEntryDefinitions = this.getExtractedCacheEntryDefinitions()
-            if (cacheEntryDefinitions.length > 0) {
-                core.info('Not saving configuration-cache state, as no encryption key was provided')
-                for (const cacheEntry of cacheEntryDefinitions) {
-                    listener.entry(cacheEntry.pattern).markNotSaved('No encryption key provided')
-                }
-            }
-            return
-        }
-
-        await super.extract(listener)
-    }
-
-    private getAESEncryptionKey(): string | undefined {
-        const secret = params.getCacheEncryptionKey()
-        const key = crypto.pbkdf2Sync(secret, '', 1000, 16, 'sha256')
-        return key.toString('base64')
     }
 
     /**
      * Extract cache entries for the configuration cache in each project.
      */
     protected getExtractedCacheEntryDefinitions(): ExtractedCacheEntryDefinition[] {
-        // Group BuildResult by existing configCacheDir
+        return this.getProjectRoots().map(projectRoot => {
-        const groupedResults = this.getConfigCacheDirectoriesWithAssociatedBuildResults()
+            const configCachePath = path.resolve(projectRoot, '.gradle/configuration-cache')
-
+            return new ExtractedCacheEntryDefinition(
-        return Object.entries(groupedResults).map(([configCachePath, pathResults]) => {
-            // Create a entry definition for each unique configuration cache directory
-            const definition = new ExtractedCacheEntryDefinition(
                 'configuration-cache',
                 configCachePath,
                 true
             ).withNonUniqueFileNames()
-
-            // If any associated build result used Gradle < 8.6, then mark it as not cacheable
-            if (
-                pathResults.find(result => {
-                    const gradleVersion = semver.coerce(result.gradleVersion)
-                    return gradleVersion && semver.lt(gradleVersion, '8.6.0')
-                })
-            ) {
-                core.info(
-                    `Not saving config-cache data for ${configCachePath}. Configuration cache data is only saved for Gradle 8.6+`
-                )
-                definition.notCacheableBecause('Configuration cache data only saved for Gradle 8.6+')
-            }
-            return definition
         })
     }
 
-    private getConfigCacheDirectoriesWithAssociatedBuildResults(): Record<string, BuildResult[]> {
+    /**
-        return loadBuildResults().reduce(
+     * For every Gradle invocation, we record the project root directory. This method returns the entire
-            (acc, buildResult) => {
+     * set of project roots, to allow saving of configuration-cache entries for each.
-                // For each build result, find the config-cache dir
+     */
-                const configCachePath = path.resolve(buildResult.rootProjectDir, '.gradle/configuration-cache')
+    private getProjectRoots(): string[] {
-                // Ignore case where config-cache dir doesn't exist
+        const buildResults = loadBuildResults()
-                if (!fs.existsSync(configCachePath)) {
+        const projectRootDirs = buildResults.map(x => x.rootProjectDir)
-                    return acc
+        return [...new Set(projectRootDirs)] // Remove duplicates
-                }
-
-                // Group by unique config cache directories and collect associated build results
-                if (!acc[configCachePath]) {
-                    acc[configCachePath] = []
-                }
-                acc[configCachePath].push(buildResult)
-                return acc
-            },
-            {} as Record<string, BuildResult[]>
-        )
     }
 }

src/cache-reporting.ts

@@ -198,9 +198,6 @@ function getSavedMessage(entry: CacheEntryListener, cacheReadOnly: boolean): str
         if (cacheReadOnly) {
             return '(Entry not saved: cache is read-only)'
         }
-        if (entry.notRestored) {
-            return '(Entry not saved: not restored)'
-        }
         return '(Entry not saved: reason unknown)'
     }
     if (entry.savedSize === 0) {

src/cache-utils.ts

@@ -11,7 +11,7 @@ import * as params from './input-params'
 
 import {CacheEntryListener} from './cache-reporting'
 
-const CACHE_PROTOCOL_VERSION = 'v9-'
+const CACHE_PROTOCOL_VERSION = 'v8-'
 
 const CACHE_KEY_PREFIX_VAR = 'GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX'
 const CACHE_KEY_OS_VAR = 'GRADLE_BUILD_ACTION_CACHE_KEY_ENVIRONMENT'

src/dependency-graph.ts

@@ -1,7 +1,8 @@
 import * as core from '@actions/core'
+import * as artifact from '@actions/artifact'
 import * as github from '@actions/github'
 import * as glob from '@actions/glob'
-import {DefaultArtifactClient} from '@actions/artifact'
+import * as toolCache from '@actions/tool-cache'
 import {GitHub} from '@actions/github/lib/utils'
 import {RequestError} from '@octokit/request-error'
 import type {PullRequestEvent} from '@octokit/webhooks-types'
@@ -12,7 +13,7 @@ import fs from 'fs'
 import * as layout from './repository-layout'
 import {DependencyGraphOption, getJobMatrix, getArtifactRetentionDays} from './input-params'
 
-const DEPENDENCY_GRAPH_PREFIX = 'dependency-graph_'
+const DEPENDENCY_GRAPH_ARTIFACT = 'dependency-graph'
 
 export async function setup(option: DependencyGraphOption): Promise<void> {
     if (option === DependencyGraphOption.Disabled) {
@@ -35,51 +36,47 @@ export async function setup(option: DependencyGraphOption): Promise<void> {
         'DEPENDENCY_GRAPH_REPORT_DIR',
         path.resolve(layout.workspaceDirectory(), 'dependency-graph-reports')
     )
+
+    // To clear the dependency graph, we generate an empty graph by excluding all projects and configurations
+    if (option === DependencyGraphOption.Clear) {
+        core.exportVariable('DEPENDENCY_GRAPH_INCLUDE_PROJECTS', '')
+        core.exportVariable('DEPENDENCY_GRAPH_INCLUDE_CONFIGURATIONS', '')
+    }
 }
 
 export async function complete(option: DependencyGraphOption): Promise<void> {
-    try {
     switch (option) {
         case DependencyGraphOption.Disabled:
-            case DependencyGraphOption.Generate: // Performed via init-script: nothing to do here
         case DependencyGraphOption.DownloadAndSubmit: // Performed in setup
             return
-            case DependencyGraphOption.GenerateAndSubmit:
+        case DependencyGraphOption.Generate:
-                await submitDependencyGraphs(await findGeneratedDependencyGraphFiles())
+            await uploadDependencyGraphs()
+            return
+        case DependencyGraphOption.GenerateAndSubmit:
+        case DependencyGraphOption.Clear: // Submit the empty dependency graph
+            await submitDependencyGraphs(await uploadDependencyGraphs())
             return
-            case DependencyGraphOption.GenerateAndUpload:
-                await uploadDependencyGraphs(await findGeneratedDependencyGraphFiles())
-        }
-    } catch (e) {
-        core.warning(`Failed to ${option} dependency graph. Will continue. ${String(e)}`)
     }
 }
 
-async function findGeneratedDependencyGraphFiles(): Promise<string[]> {
+async function uploadDependencyGraphs(): Promise<string[]> {
     const workspaceDirectory = layout.workspaceDirectory()
-    return await findDependencyGraphFiles(workspaceDirectory)
+    const graphFiles = await findDependencyGraphFiles(workspaceDirectory)
-}
 
-async function uploadDependencyGraphs(dependencyGraphFiles: string[]): Promise<void> {
+    const relativeGraphFiles = graphFiles.map(x => getRelativePathFromWorkspace(x))
-    const workspaceDirectory = layout.workspaceDirectory()
+    core.info(`Uploading dependency graph files: ${relativeGraphFiles}`)
 
-    const artifactClient = new DefaultArtifactClient()
+    const artifactClient = artifact.create()
-    for (const dependencyGraphFile of dependencyGraphFiles) {
+    artifactClient.uploadArtifact(DEPENDENCY_GRAPH_ARTIFACT, graphFiles, workspaceDirectory, {
-        const relativePath = getRelativePathFromWorkspace(dependencyGraphFile)
-        core.info(`Uploading dependency graph file: ${relativePath}`)
-        const artifactName = `${DEPENDENCY_GRAPH_PREFIX}${path.basename(dependencyGraphFile)}`
-        await artifactClient.uploadArtifact(artifactName, [dependencyGraphFile], workspaceDirectory, {
         retentionDays: getArtifactRetentionDays()
     })
-    }
+
+    return graphFiles
 }
 
 async function downloadAndSubmitDependencyGraphs(): Promise<void> {
-    try {
+    const workspaceDirectory = layout.workspaceDirectory()
-        await submitDependencyGraphs(await downloadDependencyGraphs())
+    submitDependencyGraphs(await retrieveDependencyGraphs(workspaceDirectory))
-    } catch (e) {
-        core.warning(`Download and submit dependency graph failed. Will continue. ${String(e)}`)
-    }
 }
 
 async function submitDependencyGraphs(dependencyGraphFiles: string[]): Promise<void> {
@@ -121,37 +118,56 @@ async function submitDependencyGraphFile(jsonFile: string): Promise<void> {
     core.notice(`Submitted ${relativeJsonFile}: ${response.data.message}`)
 }
 
-async function downloadDependencyGraphs(): Promise<string[]> {
+async function retrieveDependencyGraphs(workspaceDirectory: string): Promise<string[]> {
-    const workspaceDirectory = layout.workspaceDirectory()
+    if (github.context.payload.workflow_run) {
-
+        return await retrieveDependencyGraphsForWorkflowRun(github.context.payload.workflow_run.id, workspaceDirectory)
-    const findBy = github.context.payload.workflow_run
-        ? {
-              token: getGithubToken(),
-              workflowRunId: github.context.payload.workflow_run.id,
-              repositoryName: github.context.repo.repo,
-              repositoryOwner: github.context.repo.owner
     }
-        : undefined
+    return retrieveDependencyGraphsForCurrentWorkflow(workspaceDirectory)
+}
 
-    const artifactClient = new DefaultArtifactClient()
+async function retrieveDependencyGraphsForWorkflowRun(runId: number, workspaceDirectory: string): Promise<string[]> {
+    const octokit = getOctokit()
+
+    // Find the workflow run artifacts named "dependency-graph"
+    const artifacts = await octokit.rest.actions.listWorkflowRunArtifacts({
+        owner: github.context.repo.owner,
+        repo: github.context.repo.repo,
+        run_id: runId
+    })
+
+    const matchArtifact = artifacts.data.artifacts.find(candidate => {
+        return candidate.name === DEPENDENCY_GRAPH_ARTIFACT
+    })
+
+    if (matchArtifact === undefined) {
+        throw new Error(`Dependency graph artifact not found. Has it been generated by workflow run '${runId}'?`)
+    }
+
+    // Download the dependency-graph artifact
+    const download = await octokit.rest.actions.downloadArtifact({
+        owner: github.context.repo.owner,
+        repo: github.context.repo.repo,
+        artifact_id: matchArtifact.id,
+        archive_format: 'zip'
+    })
+
+    const downloadBuffer = download.data as ArrayBuffer
+    const downloadZip = path.resolve(workspaceDirectory, 'dependency-graph.zip')
+    fs.writeFileSync(downloadZip, Buffer.from(downloadBuffer))
+
+    // Expance the dependency-graph zip and locate each dependency-graph JSON file
+    const extractDir = path.resolve(workspaceDirectory, 'dependency-graph')
+    const extracted = await toolCache.extractZip(downloadZip, extractDir)
+    core.info(`Extracted dependency graph artifacts to ${extracted}: ${fs.readdirSync(extracted)}`)
+
+    return findDependencyGraphFiles(extracted)
+}
+
+async function retrieveDependencyGraphsForCurrentWorkflow(workspaceDirectory: string): Promise<string[]> {
+    const artifactClient = artifact.create()
     const downloadPath = path.resolve(workspaceDirectory, 'dependency-graph')
-
+    await artifactClient.downloadArtifact(DEPENDENCY_GRAPH_ARTIFACT, downloadPath)
-    const dependencyGraphArtifacts = (
+    return await findDependencyGraphFiles(downloadPath)
-        await artifactClient.listArtifacts({
-            latest: true,
-            findBy
-        })
-    ).artifacts.filter(candidate => candidate.name.startsWith(DEPENDENCY_GRAPH_PREFIX))
-
-    for (const artifact of dependencyGraphArtifacts) {
-        const downloadedArtifact = await artifactClient.downloadArtifact(artifact.id, {
-            path: downloadPath,
-            findBy
-        })
-        core.info(`Downloading dependency-graph artifact ${artifact.name} to ${downloadedArtifact.downloadPath}`)
-    }
-
-    return findDependencyGraphFiles(downloadPath)
 }
 
 async function findDependencyGraphFiles(dir: string): Promise<string[]> {

src/input-params.ts

@@ -29,10 +29,6 @@ export function isCacheCleanupEnabled(): boolean {
     return getBooleanInput('gradle-home-cache-cleanup')
 }
 
-export function getCacheEncryptionKey(): string {
-    return core.getInput('cache-encryption-key')
-}
-
 export function getCacheIncludes(): string[] {
     return core.getMultilineInput('gradle-home-cache-includes')
 }
@@ -84,13 +80,13 @@ export function getDependencyGraphOption(): DependencyGraphOption {
             return DependencyGraphOption.Generate
         case 'generate-and-submit':
             return DependencyGraphOption.GenerateAndSubmit
-        case 'generate-and-upload':
-            return DependencyGraphOption.GenerateAndUpload
         case 'download-and-submit':
             return DependencyGraphOption.DownloadAndSubmit
+        case 'clear':
+            return DependencyGraphOption.Clear
     }
     throw TypeError(
-        `The value '${val} is not valid for 'dependency-graph. Valid values are: [disabled, generate, generate-and-submit, generate-and-upload, download-and-submit]. The default value is 'disabled'.`
+        `The value '${val} is not valid for 'dependency-graph. Valid values are: [disabled, generate-and-upload, generate-and-submit, download-and-submit]. The default value is 'disabled'.`
     )
 }
 
@@ -125,9 +121,9 @@ function getBooleanInput(paramName: string, paramDefault = false): boolean {
 }
 
 export enum DependencyGraphOption {
-    Disabled = 'disabled',
+    Disabled,
-    Generate = 'generate',
+    Generate,
-    GenerateAndSubmit = 'generate-and-submit',
+    GenerateAndSubmit,
-    GenerateAndUpload = 'generate-and-upload',
+    DownloadAndSubmit,
-    DownloadAndSubmit = 'download-and-submit'
+    Clear
 }

src/resources/init-scripts/gradle-build-action.github-dependency-graph.init.gradle

@@ -27,6 +27,7 @@ if (isTopLevelBuild) {
       new File(githubOutput) << "dependency-graph-file=${reportFile.absolutePath}\n"
   }
 
+
   println "Generating dependency graph into '${reportFile}'"
 }
 

src/setup-gradle.ts

@@ -46,7 +46,7 @@ export async function complete(): Promise<void> {
         core.info('Gradle setup post-action only performed for first gradle-build-action step in workflow.')
         return
     }
-    core.info('In post-action step')
+    core.info('In final post-action step, saving state and writing summary')
 
     const buildResults = loadBuildResults()
 
@@ -63,8 +63,6 @@ export async function complete(): Promise<void> {
     }
 
     await dependencyGraph.complete(params.getDependencyGraphOption())
-
-    core.info('Completed post-action step')
 }
 
 async function determineGradleUserHome(): Promise<string> {

test/init-scripts/settings.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id "com.gradle.enterprise" version "3.16.1"
+    id "com.gradle.enterprise" version "3.15.1"
-    id "com.gradle.common-custom-user-data-gradle-plugin" version "1.12.1"
+    id "com.gradle.common-custom-user-data-gradle-plugin" version "1.12"
 }
 
 gradleEnterprise {

test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy

@@ -16,8 +16,8 @@ import java.nio.file.Files
 import java.util.zip.GZIPOutputStream
 
 class BaseInitScriptTest extends Specification {
-    static final String GE_PLUGIN_VERSION = '3.16.1'
+    static final String GE_PLUGIN_VERSION = '3.15.1'
-    static final String CCUD_PLUGIN_VERSION = '1.12.1'
+    static final String CCUD_PLUGIN_VERSION = '1.12'
 
     static final TestGradleVersion GRADLE_3_X = new TestGradleVersion(GradleVersion.version('3.5.1'), 7, 9)
     static final TestGradleVersion GRADLE_4_X = new TestGradleVersion(GradleVersion.version('4.10.3'), 7, 10)

test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy

@@ -171,7 +171,7 @@ class TestBuildResultRecorder extends BaseInitScriptTest {
         when:
         settingsFile.text = """
             plugins {
-                id 'com.gradle.enterprise' version '3.16.1' apply(false)
+                id 'com.gradle.enterprise' version '3.15.1' apply(false)
             }
             gradle.settingsEvaluated {
                 apply plugin: 'com.gradle.enterprise'