Upgrade init script tests to Gradle 9

Release notes of Gradle 9.0.0 can be found here:
https://docs.gradle.org/9.0.0/release-notes.html

Signed-off-by: bot-githubaction <bot-githubaction@gradle.com>

.github/actions/init-integ-test/action.yml

@@ -4,7 +4,7 @@ inputs:
   java-version:
     description: 'Java version to use'
     required: false
-    default: '11'
+    default: '17'
 
 runs:
   using: "composite"

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

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.develocity" version "4.0.2"
+    id "com.gradle.develocity" version "4.1"
     id "com.gradle.common-custom-user-data-gradle-plugin" version "2.3"
 }
 

.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
+distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

.github/workflow-samples/kotlin-dsl/gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 plugins {
-    id("com.gradle.develocity") version "4.0.2"
+    id("com.gradle.develocity") version "4.1"
     id("com.gradle.common-custom-user-data-gradle-plugin") version "2.3"
 }
 

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

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.develocity" version "4.0.2" 
+    id "com.gradle.develocity" version "4.1" 
 }
 
 develocity {

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

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.develocity" version "4.0.2"
+    id "com.gradle.develocity" version "4.1"
 }
 
 develocity {

.github/workflow-samples/non-executable-wrapper/settings.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.develocity" version "4.0.2"
+    id "com.gradle.develocity" version "4.1"
 }
 
 develocity {

.github/workflows/ci-check-and-unit-test.yml

@@ -43,7 +43,7 @@ jobs:
         npm run compile
       working-directory: sources
       env:
-        NODE_OPTIONS: '-r @gradle/develocity-agent/preload'
+        NODE_OPTIONS: '-r @gradle-tech/develocity-agent/preload'
         DEVELOCITY_URL: 'https://ge.solutions-team.gradle.com'
         DEVELOCITY_ACCESS_KEY: '${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}'
 
@@ -52,6 +52,6 @@ jobs:
         npm test
       working-directory: sources
       env:
-        NODE_OPTIONS: '-r @gradle/develocity-agent/preload'
+        NODE_OPTIONS: '-r @gradle-tech/develocity-agent/preload'
         DEVELOCITY_URL: 'https://ge.solutions-team.gradle.com'
         DEVELOCITY_ACCESS_KEY: '${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}'

.github/workflows/ci-codeql.yml

@@ -35,7 +35,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+      uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
       with:
         languages: ${{ matrix.language }}
         config: |
@@ -43,4 +43,4 @@ jobs:
           - sources/src
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+      uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4

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

@@ -27,7 +27,7 @@ jobs:
       uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         distribution: temurin
-        java-version: 11
+        java-version: 17
     - name: Setup Gradle
       # Use a released version to avoid breakages
       uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1

.github/workflows/ci-ossf-scorecard.yml

@@ -52,6 +52,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: 'Upload to code-scanning'
-        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
         with:
           sarif_file: results.sarif

.github/workflows/ci-update-dist.yml

@@ -3,7 +3,7 @@ name: CI-update-dist
 on:
   workflow_dispatch:
   push:
-    branches: 
+    branches:
     - 'main'
     - 'prerelease/**'
     - 'release/**'
@@ -45,7 +45,7 @@ jobs:
         npm run compile
       working-directory: sources
       env:
-        NODE_OPTIONS: '-r @gradle/develocity-agent/preload'
+        NODE_OPTIONS: '-r @gradle-tech/develocity-agent/preload'
         DEVELOCITY_URL: 'https://ge.solutions-team.gradle.com'
         DEVELOCITY_ACCESS_KEY: '${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}'
 
@@ -61,7 +61,7 @@ jobs:
         git_user_signingkey: true
         git_commit_gpgsign: true
         git_config_global: true
-    
+
     # Commit and push changes; has no effect if the files did not change
     # Important: The push event will not trigger any other workflows, see
     # https://github.com/stefanzweifel/git-auto-commit-action?tab=readme-ov-file#commits-made-by-this-action-do-not-trigger-new-workflow-runs

.github/workflows/integ-test-build-scan-publish.yml

@@ -25,14 +25,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
+        gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
         os: ${{fromJSON(inputs.runner-os)}}
+        include:
+          - java-version: 17
+          - gradle: '8.14.3'
+            java-version: 11
+          - gradle: '7.6.2'
+            java-version: 11
+          - gradle: '6.9.4'
+            java-version: 11
+          - gradle: '5.6.4'
+            java-version: 11
+
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout sources
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Initialize integ-test
       uses: ./.github/actions/init-integ-test
+      with:
+        java-version: ${{ matrix.java-version }}
 
     - name: Setup Gradle
       id: setup-gradle

.github/workflows/integ-test-caching-config.yml

@@ -34,6 +34,7 @@ jobs:
     - name: Initialize integ-test
       uses: ./.github/actions/init-integ-test
 
+
     - name: Setup Gradle
       uses: ./setup-gradle
       with:

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

@@ -231,11 +231,26 @@ jobs:
       fail-fast: false
       matrix:
         os: ${{fromJSON(inputs.runner-os)}}
-        gradle: ['8.0.2', '7.6.4', '7.1.1', '6.9.4', '6.0.1', '5.6.4', '5.2.1']
+        gradle: ['9.0.0', '8.14.3', '8.0.2', '7.6.4', '7.1.1', '6.9.4', '6.0.1', '5.6.4', '5.2.1']
         include:
+          - java-version: 17
+          - gradle: '8.14.3'
+            java-version: 11
+          - gradle: '8.0.2'
+            java-version: 11
+          - gradle: '7.6.4'
+            java-version: 11
+          - gradle: '7.1.1'
+            java-version: 11
+          - gradle: '6.9.4'
+            java-version: 11
+          - gradle: '6.0.1'
+            java-version: 11
           - gradle: '5.6.4'
+            java-version: 11
             build-root-suffix: -gradle-5
           - gradle: '5.2.1'
+            java-version: 11
             build-root-suffix: -gradle-5
     runs-on: ${{ matrix.os }}
     steps:
@@ -243,7 +258,8 @@ jobs:
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Initialize integ-test
       uses: ./.github/actions/init-integ-test
-
+      with:
+        java-version: ${{ matrix.java-version }}
     - name: Generate and submit dependencies
       uses: ./dependency-submission
       with:

.github/workflows/integ-test-detect-toolchains.yml

@@ -46,7 +46,7 @@ jobs:
       shell: bash
       working-directory: .github/workflow-samples/groovy-dsl
       run: | 
-        grep -q 'Eclipse Temurin JDK 1.8' output.txt || (echo "::error::Did not detect preinstalled JDK 1.8" && exit 1)
+        grep -q 'Eclipse Temurin JDK 8' output.txt || (echo "::error::Did not detect preinstalled JDK 8" && exit 1)
         grep -q 'Eclipse Temurin JDK 11' output.txt || (echo "::error::Did not detect preinstalled JDK 11" && exit 1)
         grep -q 'Eclipse Temurin JDK 17' output.txt || (echo "::error::Did not detect preinstalled JDK 17" && exit 1)
         grep -q 'Eclipse Temurin JDK 21' output.txt || (echo "::error::Did not detect preinstalled JDK 21" && exit 1)
@@ -64,16 +64,16 @@ jobs:
     - name: Initialize integ-test
       uses: ./.github/actions/init-integ-test
 
-    - name: Setup Java 20
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-      with:
-        distribution: 'temurin'
-        java-version: 20
     - name: Setup Java 16
       uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         distribution: 'temurin'
         java-version: 16
+    - name: Setup Java 20
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      with:
+        distribution: 'temurin'
+        java-version: 20
     - name: Setup Gradle
       uses: ./setup-gradle
     - name: List detected toolchains
@@ -92,7 +92,7 @@ jobs:
       shell: bash
       working-directory: .github/workflow-samples/groovy-dsl
       run: | 
-        grep -q 'Eclipse Temurin JDK 1.8' output.txt || (echo "::error::Did not detect preinstalled JDK 1.8" && exit 1)
+        grep -q 'Eclipse Temurin JDK 8' output.txt || (echo "::error::Did not detect preinstalled JDK 8" && exit 1)
         grep -q 'Eclipse Temurin JDK 11' output.txt || (echo "::error::Did not detect preinstalled JDK 11" && exit 1)
         grep -q 'Eclipse Temurin JDK 17' output.txt || (echo "::error::Did not detect preinstalled JDK 17" && exit 1)
         grep -q 'Eclipse Temurin JDK 21' output.txt || (echo "::error::Did not detect preinstalled JDK 21" && exit 1)

.github/workflows/integ-test-inject-develocity.yml

@@ -28,14 +28,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
+        gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
         os: ${{fromJSON(inputs.runner-os)}}
-        plugin-version: ['3.16.2', '4.0.2']
+        plugin-version: ['3.16.2', '4.1']
         include:
-        - plugin-version: '3.16.2'
+          - java-version: 17
-          accessKeyEnv: GRADLE_ENTERPRISE_ACCESS_KEY
+          - gradle: '8.14.3'
-        - plugin-version: '4.0.2'
+            java-version: 11
-          accessKeyEnv: DEVELOCITY_ACCESS_KEY
+          - gradle: '7.6.2'
+            java-version: 11
+          - gradle: '6.9.4'
+            java-version: 11
+          - gradle: '5.6.4'
+            java-version: 11
+          - plugin-version: '3.16.2'
+            accessKeyEnv: GRADLE_ENTERPRISE_ACCESS_KEY
+          - plugin-version: '4.1'
+            accessKeyEnv: DEVELOCITY_ACCESS_KEY
     runs-on: ${{ matrix.os }}
     env:
       DEVELOCITY_INJECTION_ENABLED: true
@@ -49,7 +58,8 @@ jobs:
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Initialize integ-test
       uses: ./.github/actions/init-integ-test
-
+      with:
+        java-version: ${{ matrix.java-version }}
     - name: Setup Gradle
       id: setup-gradle
       uses: ./setup-gradle
@@ -80,15 +90,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
+        gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
         os: ${{fromJSON(inputs.runner-os)}}
-        plugin-version: ['3.16.2', '4.0.2']
+        plugin-version: ['3.16.2', '4.1']
+        include:
+          - java-version: 17
+          - gradle: '8.14.3'
+            java-version: 11
+          - gradle: '7.6.2'
+            java-version: 11
+          - gradle: '6.9.4'
+            java-version: 11
+          - gradle: '5.6.4'
+            java-version: 11
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout sources
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Initialize integ-test
         uses: ./.github/actions/init-integ-test
+        with:
+          java-version: ${{ matrix.java-version }}
       - name: Setup Gradle
         id: setup-gradle
         uses: ./setup-gradle
@@ -124,16 +146,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
+        gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
         os: ${{fromJSON(inputs.runner-os)}}
-        plugin-version: [ '3.16.2', '4.0.2' ]
+        plugin-version: [ '3.16.2', '4.1' ]
+        include:
+          - java-version: 17
+          - gradle: '8.14.3'
+            java-version: 11
+          - gradle: '7.6.2'
+            java-version: 11
+          - gradle: '6.9.4'
+            java-version: 11
+          - gradle: '5.6.4'
+            java-version: 11
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Initialize integ-test
         uses: ./.github/actions/init-integ-test
-
+        with:
+          java-version: ${{ matrix.java-version }}
       - name: Setup Gradle
         id: setup-gradle
         uses: ./setup-gradle
@@ -155,15 +188,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
+        gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
         os: ${{fromJSON(inputs.runner-os)}}
-        plugin-version: [ '3.16.2', '4.0.2' ]
+        plugin-version: [ '3.16.2', '4.1' ]
+        include:
+          - java-version: 17
+          - gradle: '8.14.3'
+            java-version: 11
+          - gradle: '7.6.2'
+            java-version: 11
+          - gradle: '6.9.4'
+            java-version: 11
+          - gradle: '5.6.4'
+            java-version: 11
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout sources
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Initialize integ-test
         uses: ./.github/actions/init-integ-test
+        with:
+          java-version: ${{ matrix.java-version }}
       - name: Setup Gradle
         id: setup-gradle
         uses: ./setup-gradle

.github/workflows/integ-test-provision-gradle-versions.yml

@@ -36,6 +36,8 @@ jobs:
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Initialize integ-test
       uses: ./.github/actions/init-integ-test
+      with:
+        java-version: '11'
 
     - name: Setup Gradle with v6.9
       uses: ./setup-gradle
@@ -52,6 +54,19 @@ jobs:
     - name: Test uses Gradle v7.1.1
       working-directory: .github/workflow-samples/no-wrapper
       run: gradle help "-DgradleVersionCheck=7.1.1"
+    # Configure JDK 17 for Gradle 9 and later
+    - name: Setup Java
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      with:
+        distribution: temurin
+        java-version: 17
+    - name: Setup Gradle with release-candidate
+      uses: ./setup-gradle
+      with:
+        gradle-version: release-candidate
+    - name: Test use release-candidate
+      working-directory: .github/workflow-samples/no-wrapper
+      run: gradle help
     - name: Setup Gradle with current
       id: gradle-current
       uses: ./setup-gradle
@@ -61,43 +76,22 @@ jobs:
       working-directory: .github/workflow-samples/no-wrapper
       run: gradle help
     - name: Check current version output parameter
-      if: ${{ !startsWith(steps.gradle-current.outputs.gradle-version , '8.') }}
+      if: ${{ !startsWith(steps.gradle-current.outputs.gradle-version , '9.') }}
       uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
       with:
         script: |
           core.setFailed('Gradle version parameter not set correctly: value was "${{ steps.gradle-current.outputs.gradle-version }}"')    
 
-  provision-gradle-with-jdk-17:
-    strategy:
-      max-parallel: 1
-      fail-fast: false
-      matrix:
-        os: ${{fromJSON(inputs.runner-os)}}
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - name: Initialize integ-test
-        uses: ./.github/actions/init-integ-test
-        with:
-          java-version: '17'
-
-      - name: Setup Gradle with release-candidate
-        uses: ./setup-gradle
-        with:
-          gradle-version: release-candidate
-      - name: Test use release-candidate
-        working-directory: .github/workflow-samples/no-wrapper
-        run: gradle help
-  
   provision-gradle-version:
     strategy:
       fail-fast: false
       matrix:
-        gradle: ['8.14.2', '8.12', '8.12-rc-1', '8.9', '8.1', '7.6.4', '6.9.4', '5.6.4', '4.10.3', '3.5.1']
+        gradle: ['9.0.0', '8.14.2', '8.12', '8.12-rc-1', '8.9', '8.1', '7.6.4', '6.9.4', '5.6.4', '4.10.3', '3.5.1']
         os: ${{fromJSON(inputs.runner-os)}}
         include:
           - java-version: 11
+          - gradle: '9.0.0'
+            java-version: 17
           - gradle: '5.6.4'
             build-root-suffix: -gradle-5
           - gradle: '4.10.3'

build

@@ -3,7 +3,7 @@
 cd sources
 
 if [[ -f ~/.gradle/develocity/keys.properties ]]; then
-    export NODE_OPTIONS='-r @gradle/develocity-agent/preload'
+    export NODE_OPTIONS='-r @gradle-tech/develocity-agent/preload'
     export DEVELOCITY_URL=https://ge.solutions-team.gradle.com
     export DEVELOCITY_ACCESS_KEY=$(paste -sd ';' ~/.gradle/develocity/keys.properties)
 fi

docs/setup-gradle.md

@@ -847,7 +847,7 @@ Here's a minimal example:
       run: ./gradlew build
 ```
 
-This configuration will automatically apply `v4.0.2` of the [Develocity Gradle plugin](https://docs.gradle.com/develocity/gradle-plugin/), and publish build scans to https://develocity.your-server.com.
+This configuration will automatically apply `v4.1` of the [Develocity Gradle plugin](https://docs.gradle.com/develocity/gradle-plugin/), and publish build scans to https://develocity.your-server.com.
 
 This example assumes that the `develocity.your-server.com` server allows anonymous publishing of build scans.
 In the likely scenario that your Develocity server requires authentication, you will also need to pass a valid [Develocity access key](https://docs.gradle.com/develocity/gradle-plugin/#via_environment_variable) taken from a secret:

sources/jest.config.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   reporters: [
       'default',
-      '@gradle/develocity-agent/jest-reporter',
+      '@gradle-tech/develocity-agent/jest-reporter',
   ],
   verbose: true
 }

sources/package.json

@@ -41,32 +41,31 @@
     "@actions/http-client": "2.2.3",
     "@actions/tool-cache": "2.0.2",
     "@octokit/webhooks-types": "7.6.1",
-    "cheerio": "1.1.0",
+    "cheerio": "1.1.2",
     "semver": "7.7.2",
     "string-argv": "0.3.2",
-    "typed-rest-client": "2.1.0",
     "unhomoglyph": "1.0.6",
     "which": "5.0.0"
   },
   "devDependencies": {
-    "@gradle/develocity-agent": "https://develocity-npm-pkgs.gradle.com/gradle-develocity-agent-0.10.0.tgz",
+    "@gradle-tech/develocity-agent": "1.0.1",
-    "@jest/globals": "29.7.0",
+    "@jest/globals": "30.0.5",
-    "@types/jest": "29.5.14",
+    "@types/jest": "30.0.0",
-    "@types/node": "20.19.0",
+    "@types/node": "24.1.0",
     "@types/semver": "7.7.0",
     "@types/unzipper": "0.10.11",
     "@types/which": "3.0.4",
-    "@typescript-eslint/eslint-plugin": "8.34.0",
+    "@typescript-eslint/eslint-plugin": "8.38.0",
     "@vercel/ncc": "0.38.3",
     "dedent": "1.6.0",
     "eslint": "9.24.0",
-    "globals": "16.2.0",
+    "globals": "16.3.0",
-    "jest": "29.7.0",
+    "jest": "30.0.5",
     "nock": "13.5.6",
     "npm-run-all": "4.1.5",
     "patch-package": "8.0.0",
-    "prettier": "3.5.3",
+    "prettier": "3.6.2",
-    "ts-jest": "29.3.4",
+    "ts-jest": "29.4.0",
     "typescript": "5.8.3"
   },
   "overrides": {

sources/src/develocity/build-scan.ts

@@ -34,7 +34,7 @@ export async function setup(config: BuildScanConfig): Promise<void> {
     // except if they are defined in the configuration
     if (config.getBuildScanPublishEnabled()) {
         maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true')
-        maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.0.2')
+        maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.1')
         maybeExportVariable('DEVELOCITY_INJECTION_CCUD_PLUGIN_VERSION', '2.1')
         maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl())
         maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree())

sources/src/wrapper-validation/checksums.ts

@@ -1,7 +1,6 @@
-import * as httpm from 'typed-rest-client/HttpClient'
 import * as cheerio from 'cheerio'
 import * as core from '@actions/core'
-//import * as httpm from '@actions/http-client'
+import * as httpm from '@actions/http-client'
 
 import fileWrapperChecksums from './wrapper-checksums.json'
 
@@ -70,23 +69,20 @@ async function httpGetJsonArray(url: string): Promise<unknown[]> {
 }
 
 async function httpGetText(url: string): Promise<string> {
-    const response = await httpc.get(url)
+    const maxAttempts = 4
-    return await response.readBody()
+    let attempts = 0
-
+    while (attempts < maxAttempts) {
-    // const maxAttempts = 4
+        try {
-    // let attempts = 0
+            const response = await httpc.get(url)
-    // while (attempts < maxAttempts) {
+            return await response.readBody()
-    //     try {
+        } catch (error) {
-    //         const response = await httpc.get(url)
+            attempts++
-    //         return await response.readBody()
+            if (attempts === maxAttempts) {
-    //     } catch (error) {
+                return new Promise((_resolve, reject) => reject(error))
-    //         attempts++
+            }
-    //         if (attempts === maxAttempts) {
+        }
-    //             return new Promise((_resolve, reject) => reject(error))
+    }
-    //         }
+    return new Promise((_resolve, reject) => reject(new Error('Illegal state')))
-    //     }
-    // }
-    // return new Promise((_resolve, reject) => reject(new Error('Illegal state')))
 }
 
 async function addDistributionSnapshotChecksumUrls(checksumUrls: [string, string][]): Promise<void> {

sources/src/wrapper-validation/validate.ts

@@ -1,5 +1,3 @@
-import * as core from '@actions/core'
-
 import * as find from './find'
 import * as checksums from './checksums'
 import * as hash from './hash'
@@ -23,16 +21,6 @@ export async function findInvalidWrapperJars(
                 previouslyValidatedChecksums.includes(sha) ||
                 knownValidChecksums.checksums.has(sha)
             ) {
-                if (allowedChecksums.includes(sha)) {
-                    core.info("Found allowed Gradle Wrapper JAR file: " + sha)
-                }
-                if (previouslyValidatedChecksums.includes(sha)) {
-                    core.info(`Found previously validated Gradle Wrapper JAR file: ${sha}`)
-                }
-                if(knownValidChecksums.checksums.has(sha)) {
-                    core.info(`Found known valid Gradle Wrapper JAR file: ${sha}`)
-                }
-                
                 result.valid.push(new WrapperJar(wrapperJar, sha))
             } else {
                 notYetValidatedWrappers.push(new WrapperJar(wrapperJar, sha))
@@ -48,7 +36,6 @@ export async function findInvalidWrapperJars(
                 if (!fetchedValidChecksums.checksums.has(wrapperJar.checksum)) {
                     result.invalid.push(wrapperJar)
                 } else {
-                    core.info(`Fall back - Found valid Gradle Wrapper JAR file: ${wrapperJar.checksum}`)
                     result.valid.push(wrapperJar)
                 }
             }

sources/src/wrapper-validation/wrapper-validator.ts

@@ -17,9 +17,7 @@ export async function validateWrappers(
 
     const allowedChecksums = process.env['ALLOWED_GRADLE_WRAPPER_CHECKSUMS']?.split(',') || []
     const previouslyValidatedChecksums = checksumCache.load()
-    core.info(`gradleUserHome = ${gradleUserHome}`)
+
-    core.info(`Previously validated checksums loaded from cache: ${previouslyValidatedChecksums.join(', ')}`)
-    
     const result = await findInvalidWrapperJars(
         workspaceRoot,
         config.allowSnapshotWrappers(),

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.19.1'
+    testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.19.2'
 }
 
 test {

sources/test/init-scripts/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
+distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

sources/test/init-scripts/gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

sources/test/init-scripts/settings.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.develocity" version "4.0.2"
+    id "com.gradle.develocity" version "4.1"
     id "com.gradle.common-custom-user-data-gradle-plugin" version "2.3"
 }
 

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

@@ -16,7 +16,7 @@ import java.nio.file.Files
 import java.util.zip.GZIPOutputStream
 
 class BaseInitScriptTest extends Specification {
-    static final String DEVELOCITY_PLUGIN_VERSION = '4.0.2'
+    static final String DEVELOCITY_PLUGIN_VERSION = '4.1'
     static final String CCUD_PLUGIN_VERSION = '2.1'
 
     static final TestGradleVersion GRADLE_3_X = new TestGradleVersion(GradleVersion.version('3.5.1'), 7, 9)

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

@@ -248,7 +248,7 @@ task expectFailure {
         when:
         settingsFile.text = """
             plugins {
-                id 'com.gradle.develocity' version '4.0.2' apply(false)
+                id 'com.gradle.develocity' version '4.1' apply(false)
             }
             gradle.settingsEvaluated {
                 apply plugin: 'com.gradle.develocity'