.github/workflows/ci-validate-typings.yml

@@ -1,24 +0,0 @@
-name: ci-validate-typings.yml
-on:
-  push:
-    branches:
-    - 'main'
-    - 'release/**'
-    paths-ignore:
-    - 'dist/**'
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  validate-typings:
-    runs-on: "ubuntu-latest"
-    steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-    - uses: typesafegithub/github-actions-typing@9ddf35b71a482be7d8922b28e8d00df16b77e315 # v2.2.2
-      with:
-        ignored-action-files: |
-          .github/actions/build-dist/action.yml
-          .github/actions/init-integ-test/action.yml
-          action.yml

.github/workflows/demo-job-summary.yml

@@ -131,38 +131,3 @@ jobs:
     - name: Build kotlin-dsl project
       working-directory: .github/workflow-samples/kotlin-dsl
       run: ./gradlew assemble
-
-  terms-of-use-accepted:
-    needs: build-distribution
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout sources
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-    - name: Initialize integ-test
-      uses: ./.github/actions/init-integ-test
-
-    - name: Setup Gradle
-      uses: ./setup-gradle
-      with:
-        build-scan-terms-of-use-url: https://gradle.com/help/legal-terms-of-use
-        build-scan-terms-of-use-agree: yes
-    - name: Build kotlin-dsl project
-      working-directory: .github/workflow-samples/kotlin-dsl
-      run: ./gradlew assemble
-
-  develocity-access-key-set:
-    needs: build-distribution
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout sources
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-    - name: Initialize integ-test
-      uses: ./.github/actions/init-integ-test
-
-    - name: Setup Gradle
-      uses: ./setup-gradle
-      with:
-        develocity-access-key: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
-    - name: Build kotlin-dsl project
-      working-directory: .github/workflow-samples/kotlin-dsl
-      run: ./gradlew assemble

README.md

@@ -15,9 +15,6 @@ This repository contains a set of GitHub Actions that are useful for building Gr
 > Use of the `gradle-actions-caching` component is subject to a separate license, available at https://gradle.com/legal/terms-of-use/. 
 > If you do not agree to these license terms, do not use the `gradle-actions-caching` component.
 
-This license notice will be displayed in workflow logs and each job summary. To suppress this message, 
-either [accept the terms of use](docs/setup-gradle.md#publishing-to-scansgradlecom) in your workflow, or [provide a Develocity access key](docs/setup-gradle.md#managing-develocity-access-keys).
-
 ## The `setup-gradle` action
 
 The `setup-gradle` action can be used to configure Gradle for optimal execution on any platform supported by GitHub Actions.
@@ -39,9 +36,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout sources
-      uses: actions/checkout@v6
+      uses: actions/checkout@v4
     - name: Setup Java
-      uses: actions/setup-java@v5
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: 17
@@ -77,9 +74,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout sources
-      uses: actions/checkout@v6
+      uses: actions/checkout@v4
     - name: Setup Java
-      uses: actions/setup-java@v5
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: 17
@@ -112,7 +109,7 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - uses: gradle/actions/wrapper-validation@v5
 ```
 

RELEASING.md

@@ -20,9 +20,8 @@
   - Include a Full changelog link in the format https://github.com/gradle/actions/compare/v2.12.0...v3.0.0
 - Publish the release.
 - Force push the `v5` tag (or current major version) to point to the new release. It is conventional for users to bind to a major release version using this tag.
-  - From CLI: `git tag -f -s -a -m "v5.0.0" v5 && git push -f --tags`
+  - From CLI: `git tag -f -s -a -m "v5.0.0" v5 v5.0.0 && git push -f --tags`
   - Note that we sign the tag and set the commit message for the tag to the newly released version.
-  - Your HEAD must point at the commit to be tagged.
 
 ## Post release steps
 

dependency-submission/README.md

@@ -22,9 +22,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout sources
-      uses: actions/checkout@v6
+      uses: actions/checkout@v4
     - name: Setup Java
-      uses: actions/setup-java@v5
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: 17

dependency-submission/action-types.yml

@@ -1,146 +0,0 @@
-# Type descriptors based on https://github.com/typesafegithub/github-actions-typing
-inputs:
-  # Gradle execution configuration
-  gradle-version:
-    type: string
-
-  build-root-directory:
-    type: string
-
-  dependency-resolution-task:
-    type: string
-
-  additional-arguments:
-    type: string
-
-  # Cache configuration
-  cache-disabled:
-    type: boolean
-
-  cache-read-only:
-    type: boolean
-
-  cache-write-only:
-    type: boolean
-
-  cache-overwrite-existing:
-    type: boolean
-
-  cache-encryption-key:
-    type: string
-
-  cache-cleanup:
-    type: enum
-    allowed-values:
-      - never
-      - on-success
-      - always
-
-  gradle-home-cache-cleanup:
-    type: boolean
-
-  gradle-home-cache-includes:
-    type: list
-    separator: '\n'
-    list-item:
-      type: string
-
-  gradle-home-cache-excludes:
-    type: list
-    separator: '\n'
-    list-item:
-      type: string
-
-  # Job summary configuration
-  add-job-summary:
-    type: enum
-    allowed-values:
-      - never
-      - always
-      - on-failure
-
-  add-job-summary-as-pr-comment:
-    type: enum
-    allowed-values:
-      - never
-      - always
-      - on-failure
-
-  # Dependency Graph configuration
-  dependency-graph:
-    type: enum
-    allowed-values:
-      - generate-and-submit
-      - generate-submit-and-upload
-      - generate-and-upload
-      - download-and-submit
-
-  dependency-graph-report-dir:
-    type: string
-
-  dependency-graph-continue-on-failure:
-    type: boolean
-
-  dependency-graph-exclude-projects:
-    type: string
-
-  dependency-graph-include-projects:
-    type: string
-
-  dependency-graph-exclude-configurations:
-    type: string
-
-  dependency-graph-include-configurations:
-    type: string
-
-  artifact-retention-days:
-    type: integer
-
-  # Build Scan configuration
-  build-scan-publish:
-    type: boolean
-
-  build-scan-terms-of-use-url:
-    type: enum
-    allowed-values:
-      - https://gradle.com/terms-of-service
-      - https://gradle.com/help/legal-terms-of-use
-
-  build-scan-terms-of-use-agree:
-    type: enum
-    allowed-values:
-      - 'yes'
-
-  develocity-access-key:
-    type: string
-
-  develocity-token-expiry:
-    type: integer
-
-  # Wrapper validation configuration
-  validate-wrappers:
-    type: boolean
-
-  allow-snapshot-wrappers:
-    type: boolean
-
-  # Experimental action inputs
-  gradle-home-cache-strict-match:
-    type: boolean
-
-  # Internal action inputs
-  workflow-job-context:
-    type: string
-
-  github-token:
-    type: string
-
-outputs:
-  build-scan-url:
-    type: string
-
-  dependency-graph-file:
-    type: string
-
-  gradle-version:
-    type: string

docs/dependency-submission.md

@@ -28,9 +28,6 @@ If you're confused by the behaviour you're seeing or have specific questions, pl
 > Use of the `gradle-actions-caching` component is subject to a separate license, available at https://gradle.com/legal/terms-of-use/. 
 > If you do not agree to these license terms, do not use the `gradle-actions-caching` component.
 
-This license notice will be displayed in workflow logs and each job summary. To suppress this message, 
-either [accept the terms of use](setup-gradle.md#publishing-to-scansgradlecom) in your workflow, or [provide a Develocity access key](setup-gradle.md#managing-develocity-access-keys).
-
 ## General usage
 
 The following workflow will generate a dependency graph for a Gradle project and submit it immediately to the repository via the
@@ -52,8 +49,8 @@ jobs:
   dependency-submission:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v5
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 17
@@ -366,8 +363,8 @@ jobs:
   dependency-submission:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v5
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 17
@@ -428,8 +425,8 @@ jobs:
   dependency-submission:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v5
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 17
@@ -466,7 +463,7 @@ jobs:
 # Gradle version compatibility
 
 Dependency-graph generation is compatible with most versions of Gradle >= `5.2`, and is tested regularly against 
-Gradle versions `5.2.1`, `5.6.4`, `6.0.1`, `6.9.4`, `7.1.1`, `7.6.6`, `8.0.2` and `8.14.4`, as well as all patched versions of Gradle 9.x.
+Gradle versions `5.2.1`, `5.6.4`, `6.0.1`, `6.9.4`, `7.1.1` and `7.6.3`, as well as all patched versions of Gradle 8.x.
 
 A known exception to this is that Gradle `7.0`, `7.0.1` and `7.0.2` are not supported.
 

docs/setup-gradle.md

@@ -15,12 +15,9 @@ This GitHub Action can be used to configure Gradle for optimal execution on any
 > Use of the `gradle-actions-caching` component is subject to a separate license, available at https://gradle.com/legal/terms-of-use/. 
 > If you do not agree to these license terms, do not use the `gradle-actions-caching` component.
 
-This license notice will be displayed in workflow logs and each job summary. To suppress this message, 
-either [accept the terms of use](#publishing-to-scansgradlecom) in your workflow, or [provide a Develocity access key](#managing-develocity-access-keys).
-
 ## Why use the `setup-gradle` action?
 
-It is possible to directly invoke Gradle in your workflow, and the `actions/setup-java@v5` action provides a simple way to cache Gradle dependencies.
+It is possible to directly invoke Gradle in your workflow, and the `actions/setup-java@v4` action provides a simple way to cache Gradle dependencies.
 
 However, the `setup-gradle` action offers a several advantages over this approach:
 
@@ -54,8 +51,8 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v5
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 17
@@ -106,8 +103,8 @@ jobs:
   gradle-rc:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v5
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 17
@@ -228,8 +225,8 @@ jobs:
   gradle-with-configuration-cache:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v5
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 17
@@ -481,8 +478,8 @@ jobs:
   run-gradle-build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v5
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 17
@@ -518,8 +515,8 @@ jobs:
   gradle:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v5
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 17
@@ -626,8 +623,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v5
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 17
@@ -678,8 +675,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v5
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 17
@@ -708,8 +705,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v5
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 17

docs/wrapper-validation.md

@@ -72,7 +72,7 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - uses: gradle/actions/wrapper-validation@v5
 ```
 
@@ -120,7 +120,7 @@ restore these Jars on checkout. Without this, only a pointer to the Wrapper Jar
 
 ```
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           lfs: true  # gradle-wrapper.jar verification will fail without this
 ```

setup-gradle/README.md

@@ -19,9 +19,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout sources
-      uses: actions/checkout@v6
+      uses: actions/checkout@v4
     - name: Setup Java
-      uses: actions/setup-java@v5
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: 17

setup-gradle/action-types.yml

@@ -1,171 +0,0 @@
-# Type descriptors based on https://github.com/typesafegithub/github-actions-typing
-inputs:
-  gradle-version:
-    type: string
-
-  # Cache configuration
-  cache-disabled:
-    type: boolean
-
-  cache-read-only:
-    type: boolean
-
-  cache-write-only:
-    type: boolean
-
-  cache-overwrite-existing:
-    type: boolean
-
-  cache-encryption-key:
-    type: string
-
-  cache-cleanup:
-    type: enum
-    allowed-values:
-      - never
-      - on-success
-      - always
-
-  gradle-home-cache-cleanup:
-    type: boolean
-
-  gradle-home-cache-includes:
-    type: list
-    separator: '\n'
-    list-item:
-      type: string
-
-  gradle-home-cache-excludes:
-    type: list
-    separator: '\n'
-    list-item:
-      type: string
-
-  # Job summary configuration
-  add-job-summary:
-    type: enum
-    allowed-values:
-      - never
-      - always
-      - on-failure
-
-  add-job-summary-as-pr-comment:
-    type: enum
-    allowed-values:
-      - never
-      - always
-      - on-failure
-
-  # Dependency Graph configuration
-  dependency-graph:
-    type: enum
-    allowed-values:
-      - disabled
-      - generate
-      - generate-and-submit
-      - generate-and-upload
-      - download-and-submit
-
-  dependency-graph-report-dir:
-    type: string
-
-  dependency-graph-continue-on-failure:
-    type: boolean
-
-  dependency-graph-exclude-projects:
-    type: string
-
-  dependency-graph-include-projects:
-    type: string
-
-  dependency-graph-exclude-configurations:
-    type: string
-
-  dependency-graph-include-configurations:
-    type: string
-
-  artifact-retention-days:
-    type: integer
-
-  # Build Scan configuration
-  build-scan-publish:
-    type: boolean
-
-  build-scan-terms-of-use-url:
-    type: enum
-    allowed-values:
-      - https://gradle.com/terms-of-service
-      - https://gradle.com/help/legal-terms-of-use
-
-  build-scan-terms-of-use-agree:
-    type: enum
-    allowed-values:
-      - 'yes'
-
-  develocity-access-key:
-    type: string
-
-  develocity-token-expiry:
-    type: integer
-
-  develocity-injection-enabled:
-    type: boolean
-
-  develocity-url:
-    type: string
-
-  develocity-allow-untrusted-server:
-    type: boolean
-
-  develocity-capture-file-fingerprints:
-    type: boolean
-
-  develocity-enforce-url:
-    type: boolean
-
-  develocity-plugin-version:
-    type: string
-
-  develocity-ccud-plugin-version:
-    type: string
-
-  gradle-plugin-repository-url:
-    type: string
-
-  gradle-plugin-repository-username:
-    type: string
-
-  gradle-plugin-repository-password:
-    type: string
-
-  # Wrapper validation configuration
-  validate-wrappers:
-    type: boolean
-
-  allow-snapshot-wrappers:
-    type: boolean
-
-  # Deprecated action inputs
-  arguments:
-    type: string
-
-  # Experimental action inputs
-  gradle-home-cache-strict-match:
-    type: boolean
-
-  # Internal action inputs
-  workflow-job-context:
-    type: string
-
-  github-token:
-    type: string
-
-outputs:
-  build-scan-url:
-    type: string
-
-  dependency-graph-file:
-    type: string
-
-  gradle-version:
-    type: string

sources/src/actions/dependency-submission/main.ts

@@ -5,7 +5,7 @@ import * as dependencyGraph from '../../dependency-graph'
 
 import {parseArgsStringToArgv} from 'string-argv'
 import {
-    DevelocityConfig,
+    BuildScanConfig,
     CacheConfig,
     DependencyGraphConfig,
     DependencyGraphOption,
@@ -25,7 +25,7 @@ export async function run(): Promise<void> {
         setActionId('gradle/actions/dependency-submission')
 
         // Configure Gradle environment (Gradle User Home)
-        await setupGradle.setup(new CacheConfig(), new DevelocityConfig(), new WrapperValidationConfig())
+        await setupGradle.setup(new CacheConfig(), new BuildScanConfig(), new WrapperValidationConfig())
 
         // Capture the enabled state of dependency-graph
         const originallyEnabled = process.env['GITHUB_DEPENDENCY_GRAPH_ENABLED']

sources/src/actions/setup-gradle/main.ts

@@ -2,7 +2,7 @@ import * as setupGradle from '../../setup-gradle'
 import * as provisioner from '../../execution/provision'
 import * as dependencyGraph from '../../dependency-graph'
 import {
-    DevelocityConfig,
+    BuildScanConfig,
     CacheConfig,
     DependencyGraphConfig,
     GradleExecutionConfig,
@@ -28,7 +28,7 @@ export async function run(): Promise<void> {
         setActionId('gradle/actions/setup-gradle')
 
         // Configure Gradle environment (Gradle User Home)
-        await setupGradle.setup(new CacheConfig(), new DevelocityConfig(), new WrapperValidationConfig())
+        await setupGradle.setup(new CacheConfig(), new BuildScanConfig(), new WrapperValidationConfig())
 
         // Configure the dependency graph submission
         await dependencyGraph.setup(new DependencyGraphConfig())

sources/src/cache-service-loader.ts

@@ -21,8 +21,6 @@ The \`gradle-actions-caching\` component is used only when caching is enabled an
 
 Use of the \`gradle-actions-caching\` component is subject to a separate license, available at https://gradle.com/legal/terms-of-use/. 
 If you do not agree to these license terms, do not use the \`gradle-actions-caching\` component.
-
-You can suppress this message by accepting the terms in your action configuration: see https://github.com/gradle/actions/blob/main/README.md
 ***********************************************************
 `
 
@@ -37,8 +35,6 @@ const CACHE_LICENSE_SUMMARY = `
 >
 > Use of the \`gradle-actions-caching\` component is subject to a separate license, available at https://gradle.com/legal/terms-of-use/. 
 > If you do not agree to these license terms, do not use the \`gradle-actions-caching\` component.
->
->You can suppress this message by [accepting the terms in your action configuration](https://github.com/gradle/actions/blob/main/README.md).
 `
 
 class NoOpCacheService implements CacheService {
@@ -72,14 +68,8 @@ export async function getCacheService(cacheConfig: CacheConfig): Promise<CacheSe
     if (cacheConfig.isCacheDisabled()) {
         return new NoOpCacheService()
     }
-
-    const cacheService = await loadVendoredCacheService()
-    if (cacheConfig.isCacheLicenseAccepted()) {
-        return cacheService
-    }
-
     await logCacheLicenseWarning()
-    return new LicenseWarningCacheService(cacheService)
+    return new LicenseWarningCacheService(await loadVendoredCacheService())
 }
 
 export async function loadVendoredCacheService(): Promise<CacheService> {
@@ -100,5 +90,5 @@ function findVendoredLibraryPath(): string {
 }
 
 export async function logCacheLicenseWarning(): Promise<void> {
-    console.info(CACHE_LICENSE_WARNING)
+    console.warn(CACHE_LICENSE_WARNING)
 }

sources/src/configuration.ts

@@ -166,11 +166,6 @@ export class CacheConfig {
     getCacheExcludes(): string[] {
         return core.getMultilineInput('gradle-home-cache-excludes')
     }
-
-    isCacheLicenseAccepted(): boolean {
-        const dvConfig = new DevelocityConfig()
-        return dvConfig.getDevelocityAccessKey() !== '' || dvConfig.hasTermsOfUseAgreement()
-    }
 }
 
 export enum CacheCleanupOption {
@@ -234,7 +229,7 @@ export enum JobSummaryOption {
     OnFailure = 'on-failure'
 }
 
-export class DevelocityConfig {
+export class BuildScanConfig {
     static DevelocityAccessKeyEnvVar = 'DEVELOCITY_ACCESS_KEY'
     static GradleEnterpriseAccessKeyEnvVar = 'GRADLE_ENTERPRISE_ACCESS_KEY'
 
@@ -242,19 +237,19 @@ export class DevelocityConfig {
         return getBooleanInput('build-scan-publish') && this.verifyTermsOfUseAgreement()
     }
 
-    getTermsOfUseUrl(): string {
+    getBuildScanTermsOfUseUrl(): string {
         return core.getInput('build-scan-terms-of-use-url')
     }
 
-    getTermsOfUseAgree(): string {
+    getBuildScanTermsOfUseAgree(): string {
         return core.getInput('build-scan-terms-of-use-agree')
     }
 
     getDevelocityAccessKey(): string {
         return (
             core.getInput('develocity-access-key') ||
-            process.env[DevelocityConfig.DevelocityAccessKeyEnvVar] ||
+            process.env[BuildScanConfig.DevelocityAccessKeyEnvVar] ||
-            process.env[DevelocityConfig.GradleEnterpriseAccessKeyEnvVar] ||
+            process.env[BuildScanConfig.GradleEnterpriseAccessKeyEnvVar] ||
             ''
         )
     }
@@ -295,17 +290,12 @@ export class DevelocityConfig {
         return new PluginRepositoryConfig()
     }
 
-    hasTermsOfUseAgreement(): boolean {
-        const develocityAccessKeySet = this.getDevelocityAccessKey() !== ''
-        const termsUrlSet =
-            this.getTermsOfUseUrl() === 'https://gradle.com/terms-of-service' ||
-            this.getTermsOfUseUrl() === 'https://gradle.com/help/legal-terms-of-use'
-        const termsAgreed = this.getTermsOfUseAgree() === 'yes'
-        return develocityAccessKeySet || (termsUrlSet && termsAgreed)
-    }
-
     private verifyTermsOfUseAgreement(): boolean {
-        if (!this.hasTermsOfUseAgreement()) {
+        if (
+            (this.getBuildScanTermsOfUseUrl() !== 'https://gradle.com/terms-of-service' &&
+                this.getBuildScanTermsOfUseUrl() !== 'https://gradle.com/help/legal-terms-of-use') ||
+            this.getBuildScanTermsOfUseAgree() !== 'yes'
+        ) {
             core.warning(
                 `Terms of use at 'https://gradle.com/help/legal-terms-of-use' must be agreed in order to publish build scans.`
             )

sources/src/develocity/build-scan.ts

@@ -1,8 +1,8 @@
 import * as core from '@actions/core'
-import {DevelocityConfig} from '../configuration'
+import {BuildScanConfig} from '../configuration'
 import {setupToken} from './short-lived-token'
 
-export async function setup(config: DevelocityConfig): Promise<void> {
+export async function setup(config: BuildScanConfig): Promise<void> {
     maybeExportVariable('DEVELOCITY_INJECTION_INIT_SCRIPT_NAME', 'gradle-actions.inject-develocity.init.gradle')
     maybeExportVariable('DEVELOCITY_INJECTION_CUSTOM_VALUE', 'gradle-actions')
 
@@ -36,8 +36,8 @@ export async function setup(config: DevelocityConfig): Promise<void> {
         maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true')
         maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.3.2')
         maybeExportVariable('DEVELOCITY_INJECTION_CCUD_PLUGIN_VERSION', '2.1')
-        maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_URL', config.getTermsOfUseUrl())
+        maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl())
-        maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_AGREE', config.getTermsOfUseAgree())
+        maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree())
     }
 
     return setupToken(

sources/src/develocity/short-lived-token.ts

@@ -1,6 +1,6 @@
 import * as core from '@actions/core'
 import * as httpm from '@actions/http-client'
-import {DevelocityConfig} from '../configuration'
+import {BuildScanConfig} from '../configuration'
 import {recordDeprecation} from '../deprecation-collector'
 
 export async function setupToken(
@@ -28,7 +28,7 @@ export async function setupToken(
 }
 
 function exportAccessKeyEnvVars(value: string): void {
-    ;[DevelocityConfig.DevelocityAccessKeyEnvVar, DevelocityConfig.GradleEnterpriseAccessKeyEnvVar].forEach(key =>
+    ;[BuildScanConfig.DevelocityAccessKeyEnvVar, BuildScanConfig.GradleEnterpriseAccessKeyEnvVar].forEach(key =>
         core.exportVariable(key, value)
     )
 }
@@ -36,14 +36,12 @@ function exportAccessKeyEnvVars(value: string): void {
 function handleMissingAccessToken(): void {
     core.warning(`Failed to fetch short-lived token for Develocity`)
 
-    if (process.env[DevelocityConfig.GradleEnterpriseAccessKeyEnvVar]) {
+    if (process.env[BuildScanConfig.GradleEnterpriseAccessKeyEnvVar]) {
         // We do not clear the GRADLE_ENTERPRISE_ACCESS_KEY env var in v3, to let the users upgrade to DV 2024.1
-        recordDeprecation(`The ${DevelocityConfig.GradleEnterpriseAccessKeyEnvVar} env var is deprecated`)
+        recordDeprecation(`The ${BuildScanConfig.GradleEnterpriseAccessKeyEnvVar} env var is deprecated`)
     }
-    if (process.env[DevelocityConfig.DevelocityAccessKeyEnvVar]) {
+    if (process.env[BuildScanConfig.DevelocityAccessKeyEnvVar]) {
-        core.warning(
+        core.warning(`The ${BuildScanConfig.DevelocityAccessKeyEnvVar} env var should be mapped to a short-lived token`)
-            `The ${DevelocityConfig.DevelocityAccessKeyEnvVar} env var should be mapped to a short-lived token`
-        )
     }
 }
 

sources/src/setup-gradle.ts

@@ -10,7 +10,7 @@ import {loadBuildResults, markBuildResultsProcessed} from './build-results'
 import {getCacheService} from './cache-service-loader'
 import {CacheOptions} from './cache-service'
 import {
-    DevelocityConfig,
+    BuildScanConfig,
     CacheConfig,
     SummaryConfig,
     WrapperValidationConfig,
@@ -24,7 +24,7 @@ const GRADLE_USER_HOME = 'GRADLE_USER_HOME'
 
 export async function setup(
     cacheConfig: CacheConfig,
-    develocityConfig: DevelocityConfig,
+    buildScanConfig: BuildScanConfig,
     wrapperValidationConfig: WrapperValidationConfig
 ): Promise<boolean> {
     const userHome = await determineUserHome()
@@ -49,7 +49,7 @@ export async function setup(
 
     await wrapperValidator.validateWrappers(wrapperValidationConfig, getWorkspaceDirectory(), gradleUserHome)
 
-    await buildScan.setup(develocityConfig)
+    await buildScan.setup(buildScanConfig)
 
     return true
 }

sources/test/init-scripts/build.gradle

@@ -20,7 +20,7 @@ dependencies {
     testImplementation ('io.ratpack:ratpack-groovy-test:1.9.0') {
         exclude group: 'org.codehaus.groovy', module: 'groovy-all'
     }
-    testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2'
+    testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.1'
 
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }

wrapper-validation/README.md

@@ -24,7 +24,7 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - uses: gradle/actions/wrapper-validation@v5
 ```
 

wrapper-validation/action-types.yml

@@ -1,17 +0,0 @@
-# Type descriptors based on https://github.com/typesafegithub/github-actions-typing
-inputs:
-  min-wrapper-count:
-    type: integer
-
-  allow-snapshots:
-    type: boolean
-
-  allow-checksums:
-    type: list
-    separator: ','
-    list-item:
-      type: string
-
-outputs:
-  failed-wrapper:
-    type: string