Bump path-to-regexp from 6.2.1 to 6.3.0 in /sources

Bumps [path-to-regexp](https://github.com/pillarjs/path-to-regexp) from 6.2.1 to 6.3.0.
- [Release notes](https://github.com/pillarjs/path-to-regexp/releases)
- [Changelog](https://github.com/pillarjs/path-to-regexp/blob/master/History.md)
- [Commits](https://github.com/pillarjs/path-to-regexp/compare/v6.2.1...v6.3.0)

---
updated-dependencies:
- dependency-name: path-to-regexp
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

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

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.develocity" version "3.18"
+    id "com.gradle.develocity" version "3.18.1"
     id "com.gradle.common-custom-user-data-gradle-plugin" version "2.0.1"
 }
 

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

@@ -1,5 +1,5 @@
 plugins {
-    id("com.gradle.develocity") version "3.18"
+    id("com.gradle.develocity") version "3.18.1"
     id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0.1"
 }
 

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

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

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

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

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

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

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

@@ -21,7 +21,7 @@ jobs:
 
     - name: Get changed files
       id: changed-files
-      uses: tj-actions/changed-files@v44
+      uses: tj-actions/changed-files@v45
       with:
         files: |
           dist/**

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

@@ -94,3 +94,20 @@ jobs:
     - name: Run build
       working-directory: .github/workflow-samples/groovy-dsl
       run: ./gradlew assemble
+
+  cache-read-only:
+    needs: build-distribution
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout sources
+      uses: actions/checkout@v4
+    - name: Initialize integ-test
+      uses: ./.github/actions/init-integ-test
+
+    - name: Setup Gradle
+      uses: ./setup-gradle
+      with:
+        cache-read-only: true
+    - name: Build kotlin-dsl project
+      working-directory: .github/workflow-samples/kotlin-dsl
+      run: ./gradlew assemble

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

@@ -33,11 +33,11 @@ jobs:
       matrix:
         gradle: [current, 7.6.2, 6.9.4, 5.6.4]
         os: ${{fromJSON(inputs.runner-os)}}
-        plugin-version: [3.16.2, 3.18]
+        plugin-version: [3.16.2, 3.18.1]
         include:
         - plugin-version: 3.16.2
           accessKeyEnv: GRADLE_ENTERPRISE_ACCESS_KEY
-        - plugin-version: 3.18
+        - plugin-version: 3.18.1
           accessKeyEnv: DEVELOCITY_ACCESS_KEY
 
     runs-on: ${{ matrix.os }}
@@ -84,7 +84,7 @@ jobs:
       matrix:
         gradle: [current, 7.6.2, 6.9.4, 5.6.4]
         os: ${{fromJSON(inputs.runner-os)}}
-        plugin-version: [3.16.2, 3.18]
+        plugin-version: [3.16.2, 3.18.1]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout sources
@@ -133,7 +133,7 @@ jobs:
       matrix:
         gradle: [ current, 7.6.2, 6.9.4, 5.6.4 ]
         os: ${{fromJSON(inputs.runner-os)}}
-        plugin-version: [ 3.16.2, 3.18 ]
+        plugin-version: [ 3.16.2, 3.18.1 ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
@@ -169,7 +169,7 @@ jobs:
       matrix:
         gradle: [ current, 7.6.2, 6.9.4, 5.6.4 ]
         os: ${{fromJSON(inputs.runner-os)}}
-        plugin-version: [ 3.16.2, 3.18 ]
+        plugin-version: [ 3.16.2, 3.18.1 ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout sources

.github/workflows/update-checksums-file.yml

@@ -37,7 +37,7 @@ jobs:
 
       # If there are no changes, this action will not create a pull request
       - name: Create or update pull request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           branch: bot/wrapper-checksums-update
           commit-message: Update known wrapper checksums

dist/dependency-submission/main/index.js

@@ -15352,7 +15352,7 @@ class HttpClient {
         }
         const usingSsl = parsedUrl.protocol === 'https:';
         proxyAgent = new undici_1.ProxyAgent(Object.assign({ uri: proxyUrl.href, pipelining: !this._keepAlive ? 0 : 1 }, ((proxyUrl.username || proxyUrl.password) && {
-            token: `${proxyUrl.username}:${proxyUrl.password}`
+            token: `Basic ${Buffer.from(`${proxyUrl.username}:${proxyUrl.password}`).toString('base64')}`
         })));
         this._proxyAgentDispatcher = proxyAgent;
         if (usingSsl && this._ignoreSslError) {
@@ -179917,7 +179917,7 @@ class CacheCleaner {
             }
             `);
         fs_1.default.writeFileSync(path_1.default.resolve(cleanupProjectDir, 'build.gradle'), 'task("noop") {}');
-        const executable = await provisioner.provisionGradle('current');
+        const executable = await provisioner.provisionGradleAtLeast('8.9');
         await core.group('Executing Gradle to clean up caches', async () => {
             core.info(`Cleaning up caches last used before ${cleanTimestamp}`);
             await this.executeCleanupBuild(executable, cleanupProjectDir);
@@ -180599,11 +180599,11 @@ const path_1 = __importDefault(__nccwpck_require__(71017));
 const fs_1 = __importDefault(__nccwpck_require__(57147));
 const core = __importStar(__nccwpck_require__(42186));
 const glob = __importStar(__nccwpck_require__(28090));
-const semver = __importStar(__nccwpck_require__(11383));
 const cache_utils_1 = __nccwpck_require__(11044);
 const build_results_1 = __nccwpck_require__(82107);
 const configuration_1 = __nccwpck_require__(15778);
 const cache_key_1 = __nccwpck_require__(50100);
+const gradle_1 = __nccwpck_require__(94475);
 const SKIP_RESTORE_VAR = 'GRADLE_BUILD_ACTION_SKIP_RESTORE';
 const CACHE_PROTOCOL_VERSION = 'v1';
 class ExtractedCacheEntry {
@@ -180842,8 +180842,7 @@ class ConfigurationCacheEntryExtractor extends AbstractEntryExtractor {
         return Object.entries(groupedResults).map(([configCachePath, pathResults]) => {
             const definition = new ExtractedCacheEntryDefinition('configuration-cache', configCachePath, true).withNonUniqueFileNames();
             if (pathResults.find(result => {
-                const gradleVersion = semver.coerce(result.gradleVersion);
-                return gradleVersion && semver.lt(gradleVersion, '8.6.0');
+                return !(0, gradle_1.versionIsAtLeast)(result.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+');
@@ -182026,7 +182025,7 @@ async function setup(config) {
     maybeExportVariable('DEVELOCITY_AUTO_INJECTION_CUSTOM_VALUE', 'gradle-actions');
     if (config.getBuildScanPublishEnabled()) {
         maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true');
-        maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.18');
+        maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.18.1');
         maybeExportVariable('DEVELOCITY_CCUD_PLUGIN_VERSION', '2.0');
         maybeExportVariable('DEVELOCITY_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl());
         maybeExportVariable('DEVELOCITY_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree());
@@ -182156,7 +182155,7 @@ class ShortLivedTokenClient {
         this.retryInterval = 1000;
     }
     async fetchToken(serverUrl, accessKey, expiry) {
-        const queryParams = expiry ? `?expiresInHours${expiry}` : '';
+        const queryParams = expiry ? `?expiresInHours=${expiry}` : '';
         const sanitizedServerUrl = !serverUrl.endsWith('/') ? `${serverUrl}/` : serverUrl;
         const headers = {
             'Content-Type': 'application/json',
@@ -182339,10 +182338,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.provisionAndMaybeExecute = provisionAndMaybeExecute;
+exports.versionIsAtLeast = versionIsAtLeast;
+exports.findGradleVersionOnPath = findGradleVersionOnPath;
+exports.parseGradleVersionFromOutput = parseGradleVersionFromOutput;
 const core = __importStar(__nccwpck_require__(42186));
 const exec = __importStar(__nccwpck_require__(71514));
+const which_1 = __importDefault(__nccwpck_require__(6143));
+const semver = __importStar(__nccwpck_require__(11383));
 const provisioner = __importStar(__nccwpck_require__(14042));
 const gradlew = __importStar(__nccwpck_require__(46807));
 async function provisionAndMaybeExecute(gradleVersion, buildRootDirectory, args) {
@@ -182361,6 +182368,39 @@ async function executeGradleBuild(executable, root, args) {
         core.setFailed(`Gradle build failed: see console output for details`);
     }
 }
+function versionIsAtLeast(actualVersion, requiredVersion) {
+    const splitVersion = actualVersion.split('-');
+    const coreVersion = splitVersion[0];
+    const prerelease = splitVersion.length > 1;
+    const actualSemver = semver.coerce(coreVersion);
+    const comparisonSemver = semver.coerce(requiredVersion);
+    if (prerelease) {
+        return semver.gt(actualSemver, comparisonSemver);
+    }
+    else {
+        return semver.gte(actualSemver, comparisonSemver);
+    }
+}
+async function findGradleVersionOnPath() {
+    const gradleExecutable = await (0, which_1.default)('gradle', { nothrow: true });
+    if (gradleExecutable) {
+        const output = await exec.getExecOutput(gradleExecutable, ['-v'], { silent: true });
+        const version = parseGradleVersionFromOutput(output.stdout);
+        return version ? new GradleExecutable(version, gradleExecutable) : undefined;
+    }
+    return undefined;
+}
+function parseGradleVersionFromOutput(output) {
+    const regex = /Gradle (\d+\.\d+(\.\d+)?(-.*)?)/;
+    const versionString = output.match(regex)?.[1];
+    return versionString;
+}
+class GradleExecutable {
+    constructor(version, executable) {
+        this.version = version;
+        this.executable = executable;
+    }
+}
 
 
 /***/ }),
@@ -182467,20 +182507,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.provisionGradle = provisionGradle;
+exports.provisionGradleAtLeast = provisionGradleAtLeast;
 const fs = __importStar(__nccwpck_require__(57147));
 const os = __importStar(__nccwpck_require__(22037));
 const path = __importStar(__nccwpck_require__(71017));
-const which_1 = __importDefault(__nccwpck_require__(6143));
 const httpm = __importStar(__nccwpck_require__(96255));
 const core = __importStar(__nccwpck_require__(42186));
 const cache = __importStar(__nccwpck_require__(27799));
-const exec = __importStar(__nccwpck_require__(71514));
 const toolCache = __importStar(__nccwpck_require__(27784));
+const gradle_1 = __nccwpck_require__(94475);
 const gradlew = __importStar(__nccwpck_require__(46807));
 const cache_utils_1 = __nccwpck_require__(11044);
 const configuration_1 = __nccwpck_require__(15778);
@@ -182491,6 +182528,10 @@ async function provisionGradle(gradleVersion) {
     }
     return undefined;
 }
+async function provisionGradleAtLeast(gradleVersion) {
+    const installedVersion = await installGradleVersionAtLeast(await gradleRelease(gradleVersion));
+    return addToPath(installedVersion);
+}
 async function addToPath(executable) {
     core.addPath(path.dirname(executable));
     return executable;
@@ -182514,7 +182555,7 @@ async function resolveGradleVersion(version) {
         case 'release-nightly':
             return gradleReleaseNightly();
         default:
-            return gradle(version);
+            return gradleRelease(version);
     }
 }
 async function gradleCurrent() {
@@ -182534,7 +182575,7 @@ async function gradleNightly() {
 async function gradleReleaseNightly() {
     return await gradleVersionDeclaration(`${gradleVersionsBaseUrl}/release-nightly`);
 }
-async function gradle(version) {
+async function gradleRelease(version) {
     const versionInfo = await findGradleVersionDeclaration(version);
     if (!versionInfo) {
         throw new Error(`Gradle version ${version} does not exists`);
@@ -182552,10 +182593,20 @@ async function findGradleVersionDeclaration(version) {
 }
 async function installGradleVersion(versionInfo) {
     return core.group(`Provision Gradle ${versionInfo.version}`, async () => {
-        const preInstalledGradle = await findGradleVersionOnPath(versionInfo);
-        if (preInstalledGradle !== undefined) {
+        const gradleOnPath = await (0, gradle_1.findGradleVersionOnPath)();
+        if (gradleOnPath?.version === versionInfo.version) {
             core.info(`Gradle version ${versionInfo.version} is already available on PATH. Not installing.`);
-            return preInstalledGradle;
+            return gradleOnPath.executable;
+        }
+        return locateGradleAndDownloadIfRequired(versionInfo);
+    });
+}
+async function installGradleVersionAtLeast(versionInfo) {
+    return core.group(`Provision Gradle >= ${versionInfo.version}`, async () => {
+        const gradleOnPath = await (0, gradle_1.findGradleVersionOnPath)();
+        if (gradleOnPath && (0, gradle_1.versionIsAtLeast)(gradleOnPath.version, versionInfo.version)) {
+            core.info(`Gradle version ${gradleOnPath.version} is available on PATH and >= ${versionInfo.version}. Not installing.`);
+            return gradleOnPath.executable;
         }
         return locateGradleAndDownloadIfRequired(versionInfo);
     });
@@ -182627,16 +182678,6 @@ async function httpGetString(url) {
     const response = await httpClient.get(url);
     return response.readBody();
 }
-async function findGradleVersionOnPath(versionInfo) {
-    const gradleExecutable = await (0, which_1.default)('gradle', { nothrow: true });
-    if (gradleExecutable) {
-        const output = await exec.getExecOutput(gradleExecutable, ['-v'], { silent: true });
-        if (output.stdout.includes(`\nGradle ${versionInfo.version}\n`)) {
-            return gradleExecutable;
-        }
-    }
-    return undefined;
-}
 
 
 /***/ }),

dist/dependency-submission/post/index.js

@@ -8917,7 +8917,7 @@ class HttpClient {
         }
         const usingSsl = parsedUrl.protocol === 'https:';
         proxyAgent = new undici_1.ProxyAgent(Object.assign({ uri: proxyUrl.href, pipelining: !this._keepAlive ? 0 : 1 }, ((proxyUrl.username || proxyUrl.password) && {
-            token: `${proxyUrl.username}:${proxyUrl.password}`
+            token: `Basic ${Buffer.from(`${proxyUrl.username}:${proxyUrl.password}`).toString('base64')}`
         })));
         this._proxyAgentDispatcher = proxyAgent;
         if (usingSsl && this._ignoreSslError) {
@@ -133523,7 +133523,7 @@ class CacheCleaner {
             }
             `);
         fs_1.default.writeFileSync(path_1.default.resolve(cleanupProjectDir, 'build.gradle'), 'task("noop") {}');
-        const executable = await provisioner.provisionGradle('current');
+        const executable = await provisioner.provisionGradleAtLeast('8.9');
         await core.group('Executing Gradle to clean up caches', async () => {
             core.info(`Cleaning up caches last used before ${cleanTimestamp}`);
             await this.executeCleanupBuild(executable, cleanupProjectDir);
@@ -134205,11 +134205,11 @@ const path_1 = __importDefault(__nccwpck_require__(71017));
 const fs_1 = __importDefault(__nccwpck_require__(57147));
 const core = __importStar(__nccwpck_require__(42186));
 const glob = __importStar(__nccwpck_require__(28090));
-const semver = __importStar(__nccwpck_require__(11383));
 const cache_utils_1 = __nccwpck_require__(11044);
 const build_results_1 = __nccwpck_require__(82107);
 const configuration_1 = __nccwpck_require__(15778);
 const cache_key_1 = __nccwpck_require__(50100);
+const gradle_1 = __nccwpck_require__(94475);
 const SKIP_RESTORE_VAR = 'GRADLE_BUILD_ACTION_SKIP_RESTORE';
 const CACHE_PROTOCOL_VERSION = 'v1';
 class ExtractedCacheEntry {
@@ -134448,8 +134448,7 @@ class ConfigurationCacheEntryExtractor extends AbstractEntryExtractor {
         return Object.entries(groupedResults).map(([configCachePath, pathResults]) => {
             const definition = new ExtractedCacheEntryDefinition('configuration-cache', configCachePath, true).withNonUniqueFileNames();
             if (pathResults.find(result => {
-                const gradleVersion = semver.coerce(result.gradleVersion);
-                return gradleVersion && semver.lt(gradleVersion, '8.6.0');
+                return !(0, gradle_1.versionIsAtLeast)(result.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+');
@@ -135363,7 +135362,7 @@ async function setup(config) {
     maybeExportVariable('DEVELOCITY_AUTO_INJECTION_CUSTOM_VALUE', 'gradle-actions');
     if (config.getBuildScanPublishEnabled()) {
         maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true');
-        maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.18');
+        maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.18.1');
         maybeExportVariable('DEVELOCITY_CCUD_PLUGIN_VERSION', '2.0');
         maybeExportVariable('DEVELOCITY_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl());
         maybeExportVariable('DEVELOCITY_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree());
@@ -135493,7 +135492,7 @@ class ShortLivedTokenClient {
         this.retryInterval = 1000;
     }
     async fetchToken(serverUrl, accessKey, expiry) {
-        const queryParams = expiry ? `?expiresInHours${expiry}` : '';
+        const queryParams = expiry ? `?expiresInHours=${expiry}` : '';
         const sanitizedServerUrl = !serverUrl.endsWith('/') ? `${serverUrl}/` : serverUrl;
         const headers = {
             'Content-Type': 'application/json',
@@ -135646,6 +135645,101 @@ function handlePostActionError(error) {
 }
 
 
+/***/ }),
+
+/***/ 94475:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.provisionAndMaybeExecute = provisionAndMaybeExecute;
+exports.versionIsAtLeast = versionIsAtLeast;
+exports.findGradleVersionOnPath = findGradleVersionOnPath;
+exports.parseGradleVersionFromOutput = parseGradleVersionFromOutput;
+const core = __importStar(__nccwpck_require__(42186));
+const exec = __importStar(__nccwpck_require__(71514));
+const which_1 = __importDefault(__nccwpck_require__(6143));
+const semver = __importStar(__nccwpck_require__(11383));
+const provisioner = __importStar(__nccwpck_require__(14042));
+const gradlew = __importStar(__nccwpck_require__(46807));
+async function provisionAndMaybeExecute(gradleVersion, buildRootDirectory, args) {
+    const executable = await provisioner.provisionGradle(gradleVersion);
+    if (args.length > 0) {
+        await executeGradleBuild(executable, buildRootDirectory, args);
+    }
+}
+async function executeGradleBuild(executable, root, args) {
+    const toExecute = executable ?? gradlew.gradleWrapperScript(root);
+    const status = await exec.exec(toExecute, args, {
+        cwd: root,
+        ignoreReturnCode: true
+    });
+    if (status !== 0) {
+        core.setFailed(`Gradle build failed: see console output for details`);
+    }
+}
+function versionIsAtLeast(actualVersion, requiredVersion) {
+    const splitVersion = actualVersion.split('-');
+    const coreVersion = splitVersion[0];
+    const prerelease = splitVersion.length > 1;
+    const actualSemver = semver.coerce(coreVersion);
+    const comparisonSemver = semver.coerce(requiredVersion);
+    if (prerelease) {
+        return semver.gt(actualSemver, comparisonSemver);
+    }
+    else {
+        return semver.gte(actualSemver, comparisonSemver);
+    }
+}
+async function findGradleVersionOnPath() {
+    const gradleExecutable = await (0, which_1.default)('gradle', { nothrow: true });
+    if (gradleExecutable) {
+        const output = await exec.getExecOutput(gradleExecutable, ['-v'], { silent: true });
+        const version = parseGradleVersionFromOutput(output.stdout);
+        return version ? new GradleExecutable(version, gradleExecutable) : undefined;
+    }
+    return undefined;
+}
+function parseGradleVersionFromOutput(output) {
+    const regex = /Gradle (\d+\.\d+(\.\d+)?(-.*)?)/;
+    const versionString = output.match(regex)?.[1];
+    return versionString;
+}
+class GradleExecutable {
+    constructor(version, executable) {
+        this.version = version;
+        this.executable = executable;
+    }
+}
+
+
 /***/ }),
 
 /***/ 46807:
@@ -135750,20 +135844,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.provisionGradle = provisionGradle;
+exports.provisionGradleAtLeast = provisionGradleAtLeast;
 const fs = __importStar(__nccwpck_require__(57147));
 const os = __importStar(__nccwpck_require__(22037));
 const path = __importStar(__nccwpck_require__(71017));
-const which_1 = __importDefault(__nccwpck_require__(6143));
 const httpm = __importStar(__nccwpck_require__(96255));
 const core = __importStar(__nccwpck_require__(42186));
 const cache = __importStar(__nccwpck_require__(27799));
-const exec = __importStar(__nccwpck_require__(71514));
 const toolCache = __importStar(__nccwpck_require__(27784));
+const gradle_1 = __nccwpck_require__(94475);
 const gradlew = __importStar(__nccwpck_require__(46807));
 const cache_utils_1 = __nccwpck_require__(11044);
 const configuration_1 = __nccwpck_require__(15778);
@@ -135774,6 +135865,10 @@ async function provisionGradle(gradleVersion) {
     }
     return undefined;
 }
+async function provisionGradleAtLeast(gradleVersion) {
+    const installedVersion = await installGradleVersionAtLeast(await gradleRelease(gradleVersion));
+    return addToPath(installedVersion);
+}
 async function addToPath(executable) {
     core.addPath(path.dirname(executable));
     return executable;
@@ -135797,7 +135892,7 @@ async function resolveGradleVersion(version) {
         case 'release-nightly':
             return gradleReleaseNightly();
         default:
-            return gradle(version);
+            return gradleRelease(version);
     }
 }
 async function gradleCurrent() {
@@ -135817,7 +135912,7 @@ async function gradleNightly() {
 async function gradleReleaseNightly() {
     return await gradleVersionDeclaration(`${gradleVersionsBaseUrl}/release-nightly`);
 }
-async function gradle(version) {
+async function gradleRelease(version) {
     const versionInfo = await findGradleVersionDeclaration(version);
     if (!versionInfo) {
         throw new Error(`Gradle version ${version} does not exists`);
@@ -135835,10 +135930,20 @@ async function findGradleVersionDeclaration(version) {
 }
 async function installGradleVersion(versionInfo) {
     return core.group(`Provision Gradle ${versionInfo.version}`, async () => {
-        const preInstalledGradle = await findGradleVersionOnPath(versionInfo);
-        if (preInstalledGradle !== undefined) {
+        const gradleOnPath = await (0, gradle_1.findGradleVersionOnPath)();
+        if (gradleOnPath?.version === versionInfo.version) {
             core.info(`Gradle version ${versionInfo.version} is already available on PATH. Not installing.`);
-            return preInstalledGradle;
+            return gradleOnPath.executable;
+        }
+        return locateGradleAndDownloadIfRequired(versionInfo);
+    });
+}
+async function installGradleVersionAtLeast(versionInfo) {
+    return core.group(`Provision Gradle >= ${versionInfo.version}`, async () => {
+        const gradleOnPath = await (0, gradle_1.findGradleVersionOnPath)();
+        if (gradleOnPath && (0, gradle_1.versionIsAtLeast)(gradleOnPath.version, versionInfo.version)) {
+            core.info(`Gradle version ${gradleOnPath.version} is available on PATH and >= ${versionInfo.version}. Not installing.`);
+            return gradleOnPath.executable;
         }
         return locateGradleAndDownloadIfRequired(versionInfo);
     });
@@ -135910,16 +136015,6 @@ async function httpGetString(url) {
     const response = await httpClient.get(url);
     return response.readBody();
 }
-async function findGradleVersionOnPath(versionInfo) {
-    const gradleExecutable = await (0, which_1.default)('gradle', { nothrow: true });
-    if (gradleExecutable) {
-        const output = await exec.getExecOutput(gradleExecutable, ['-v'], { silent: true });
-        if (output.stdout.includes(`\nGradle ${versionInfo.version}\n`)) {
-            return gradleExecutable;
-        }
-    }
-    return undefined;
-}
 
 
 /***/ }),

dist/setup-gradle/main/index.js

@@ -15352,7 +15352,7 @@ class HttpClient {
         }
         const usingSsl = parsedUrl.protocol === 'https:';
         proxyAgent = new undici_1.ProxyAgent(Object.assign({ uri: proxyUrl.href, pipelining: !this._keepAlive ? 0 : 1 }, ((proxyUrl.username || proxyUrl.password) && {
-            token: `${proxyUrl.username}:${proxyUrl.password}`
+            token: `Basic ${Buffer.from(`${proxyUrl.username}:${proxyUrl.password}`).toString('base64')}`
         })));
         this._proxyAgentDispatcher = proxyAgent;
         if (usingSsl && this._ignoreSslError) {
@@ -179902,7 +179902,7 @@ class CacheCleaner {
             }
             `);
         fs_1.default.writeFileSync(path_1.default.resolve(cleanupProjectDir, 'build.gradle'), 'task("noop") {}');
-        const executable = await provisioner.provisionGradle('current');
+        const executable = await provisioner.provisionGradleAtLeast('8.9');
         await core.group('Executing Gradle to clean up caches', async () => {
             core.info(`Cleaning up caches last used before ${cleanTimestamp}`);
             await this.executeCleanupBuild(executable, cleanupProjectDir);
@@ -180584,11 +180584,11 @@ const path_1 = __importDefault(__nccwpck_require__(71017));
 const fs_1 = __importDefault(__nccwpck_require__(57147));
 const core = __importStar(__nccwpck_require__(42186));
 const glob = __importStar(__nccwpck_require__(28090));
-const semver = __importStar(__nccwpck_require__(11383));
 const cache_utils_1 = __nccwpck_require__(11044);
 const build_results_1 = __nccwpck_require__(82107);
 const configuration_1 = __nccwpck_require__(15778);
 const cache_key_1 = __nccwpck_require__(50100);
+const gradle_1 = __nccwpck_require__(94475);
 const SKIP_RESTORE_VAR = 'GRADLE_BUILD_ACTION_SKIP_RESTORE';
 const CACHE_PROTOCOL_VERSION = 'v1';
 class ExtractedCacheEntry {
@@ -180827,8 +180827,7 @@ class ConfigurationCacheEntryExtractor extends AbstractEntryExtractor {
         return Object.entries(groupedResults).map(([configCachePath, pathResults]) => {
             const definition = new ExtractedCacheEntryDefinition('configuration-cache', configCachePath, true).withNonUniqueFileNames();
             if (pathResults.find(result => {
-                const gradleVersion = semver.coerce(result.gradleVersion);
-                return gradleVersion && semver.lt(gradleVersion, '8.6.0');
+                return !(0, gradle_1.versionIsAtLeast)(result.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+');
@@ -182011,7 +182010,7 @@ async function setup(config) {
     maybeExportVariable('DEVELOCITY_AUTO_INJECTION_CUSTOM_VALUE', 'gradle-actions');
     if (config.getBuildScanPublishEnabled()) {
         maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true');
-        maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.18');
+        maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.18.1');
         maybeExportVariable('DEVELOCITY_CCUD_PLUGIN_VERSION', '2.0');
         maybeExportVariable('DEVELOCITY_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl());
         maybeExportVariable('DEVELOCITY_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree());
@@ -182141,7 +182140,7 @@ class ShortLivedTokenClient {
         this.retryInterval = 1000;
     }
     async fetchToken(serverUrl, accessKey, expiry) {
-        const queryParams = expiry ? `?expiresInHours${expiry}` : '';
+        const queryParams = expiry ? `?expiresInHours=${expiry}` : '';
         const sanitizedServerUrl = !serverUrl.endsWith('/') ? `${serverUrl}/` : serverUrl;
         const headers = {
             'Content-Type': 'application/json',
@@ -182294,6 +182293,101 @@ function handlePostActionError(error) {
 }
 
 
+/***/ }),
+
+/***/ 94475:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.provisionAndMaybeExecute = provisionAndMaybeExecute;
+exports.versionIsAtLeast = versionIsAtLeast;
+exports.findGradleVersionOnPath = findGradleVersionOnPath;
+exports.parseGradleVersionFromOutput = parseGradleVersionFromOutput;
+const core = __importStar(__nccwpck_require__(42186));
+const exec = __importStar(__nccwpck_require__(71514));
+const which_1 = __importDefault(__nccwpck_require__(6143));
+const semver = __importStar(__nccwpck_require__(11383));
+const provisioner = __importStar(__nccwpck_require__(14042));
+const gradlew = __importStar(__nccwpck_require__(46807));
+async function provisionAndMaybeExecute(gradleVersion, buildRootDirectory, args) {
+    const executable = await provisioner.provisionGradle(gradleVersion);
+    if (args.length > 0) {
+        await executeGradleBuild(executable, buildRootDirectory, args);
+    }
+}
+async function executeGradleBuild(executable, root, args) {
+    const toExecute = executable ?? gradlew.gradleWrapperScript(root);
+    const status = await exec.exec(toExecute, args, {
+        cwd: root,
+        ignoreReturnCode: true
+    });
+    if (status !== 0) {
+        core.setFailed(`Gradle build failed: see console output for details`);
+    }
+}
+function versionIsAtLeast(actualVersion, requiredVersion) {
+    const splitVersion = actualVersion.split('-');
+    const coreVersion = splitVersion[0];
+    const prerelease = splitVersion.length > 1;
+    const actualSemver = semver.coerce(coreVersion);
+    const comparisonSemver = semver.coerce(requiredVersion);
+    if (prerelease) {
+        return semver.gt(actualSemver, comparisonSemver);
+    }
+    else {
+        return semver.gte(actualSemver, comparisonSemver);
+    }
+}
+async function findGradleVersionOnPath() {
+    const gradleExecutable = await (0, which_1.default)('gradle', { nothrow: true });
+    if (gradleExecutable) {
+        const output = await exec.getExecOutput(gradleExecutable, ['-v'], { silent: true });
+        const version = parseGradleVersionFromOutput(output.stdout);
+        return version ? new GradleExecutable(version, gradleExecutable) : undefined;
+    }
+    return undefined;
+}
+function parseGradleVersionFromOutput(output) {
+    const regex = /Gradle (\d+\.\d+(\.\d+)?(-.*)?)/;
+    const versionString = output.match(regex)?.[1];
+    return versionString;
+}
+class GradleExecutable {
+    constructor(version, executable) {
+        this.version = version;
+        this.executable = executable;
+    }
+}
+
+
 /***/ }),
 
 /***/ 46807:
@@ -182398,20 +182492,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.provisionGradle = provisionGradle;
+exports.provisionGradleAtLeast = provisionGradleAtLeast;
 const fs = __importStar(__nccwpck_require__(57147));
 const os = __importStar(__nccwpck_require__(22037));
 const path = __importStar(__nccwpck_require__(71017));
-const which_1 = __importDefault(__nccwpck_require__(6143));
 const httpm = __importStar(__nccwpck_require__(96255));
 const core = __importStar(__nccwpck_require__(42186));
 const cache = __importStar(__nccwpck_require__(27799));
-const exec = __importStar(__nccwpck_require__(71514));
 const toolCache = __importStar(__nccwpck_require__(27784));
+const gradle_1 = __nccwpck_require__(94475);
 const gradlew = __importStar(__nccwpck_require__(46807));
 const cache_utils_1 = __nccwpck_require__(11044);
 const configuration_1 = __nccwpck_require__(15778);
@@ -182422,6 +182513,10 @@ async function provisionGradle(gradleVersion) {
     }
     return undefined;
 }
+async function provisionGradleAtLeast(gradleVersion) {
+    const installedVersion = await installGradleVersionAtLeast(await gradleRelease(gradleVersion));
+    return addToPath(installedVersion);
+}
 async function addToPath(executable) {
     core.addPath(path.dirname(executable));
     return executable;
@@ -182445,7 +182540,7 @@ async function resolveGradleVersion(version) {
         case 'release-nightly':
             return gradleReleaseNightly();
         default:
-            return gradle(version);
+            return gradleRelease(version);
     }
 }
 async function gradleCurrent() {
@@ -182465,7 +182560,7 @@ async function gradleNightly() {
 async function gradleReleaseNightly() {
     return await gradleVersionDeclaration(`${gradleVersionsBaseUrl}/release-nightly`);
 }
-async function gradle(version) {
+async function gradleRelease(version) {
     const versionInfo = await findGradleVersionDeclaration(version);
     if (!versionInfo) {
         throw new Error(`Gradle version ${version} does not exists`);
@@ -182483,10 +182578,20 @@ async function findGradleVersionDeclaration(version) {
 }
 async function installGradleVersion(versionInfo) {
     return core.group(`Provision Gradle ${versionInfo.version}`, async () => {
-        const preInstalledGradle = await findGradleVersionOnPath(versionInfo);
-        if (preInstalledGradle !== undefined) {
+        const gradleOnPath = await (0, gradle_1.findGradleVersionOnPath)();
+        if (gradleOnPath?.version === versionInfo.version) {
             core.info(`Gradle version ${versionInfo.version} is already available on PATH. Not installing.`);
-            return preInstalledGradle;
+            return gradleOnPath.executable;
+        }
+        return locateGradleAndDownloadIfRequired(versionInfo);
+    });
+}
+async function installGradleVersionAtLeast(versionInfo) {
+    return core.group(`Provision Gradle >= ${versionInfo.version}`, async () => {
+        const gradleOnPath = await (0, gradle_1.findGradleVersionOnPath)();
+        if (gradleOnPath && (0, gradle_1.versionIsAtLeast)(gradleOnPath.version, versionInfo.version)) {
+            core.info(`Gradle version ${gradleOnPath.version} is available on PATH and >= ${versionInfo.version}. Not installing.`);
+            return gradleOnPath.executable;
         }
         return locateGradleAndDownloadIfRequired(versionInfo);
     });
@@ -182558,16 +182663,6 @@ async function httpGetString(url) {
     const response = await httpClient.get(url);
     return response.readBody();
 }
-async function findGradleVersionOnPath(versionInfo) {
-    const gradleExecutable = await (0, which_1.default)('gradle', { nothrow: true });
-    if (gradleExecutable) {
-        const output = await exec.getExecOutput(gradleExecutable, ['-v'], { silent: true });
-        if (output.stdout.includes(`\nGradle ${versionInfo.version}\n`)) {
-            return gradleExecutable;
-        }
-    }
-    return undefined;
-}
 
 
 /***/ }),

dist/setup-gradle/post/index.js

@@ -15352,7 +15352,7 @@ class HttpClient {
         }
         const usingSsl = parsedUrl.protocol === 'https:';
         proxyAgent = new undici_1.ProxyAgent(Object.assign({ uri: proxyUrl.href, pipelining: !this._keepAlive ? 0 : 1 }, ((proxyUrl.username || proxyUrl.password) && {
-            token: `${proxyUrl.username}:${proxyUrl.password}`
+            token: `Basic ${Buffer.from(`${proxyUrl.username}:${proxyUrl.password}`).toString('base64')}`
         })));
         this._proxyAgentDispatcher = proxyAgent;
         if (usingSsl && this._ignoreSslError) {
@@ -179897,7 +179897,7 @@ class CacheCleaner {
             }
             `);
         fs_1.default.writeFileSync(path_1.default.resolve(cleanupProjectDir, 'build.gradle'), 'task("noop") {}');
-        const executable = await provisioner.provisionGradle('current');
+        const executable = await provisioner.provisionGradleAtLeast('8.9');
         await core.group('Executing Gradle to clean up caches', async () => {
             core.info(`Cleaning up caches last used before ${cleanTimestamp}`);
             await this.executeCleanupBuild(executable, cleanupProjectDir);
@@ -180579,11 +180579,11 @@ const path_1 = __importDefault(__nccwpck_require__(71017));
 const fs_1 = __importDefault(__nccwpck_require__(57147));
 const core = __importStar(__nccwpck_require__(42186));
 const glob = __importStar(__nccwpck_require__(28090));
-const semver = __importStar(__nccwpck_require__(11383));
 const cache_utils_1 = __nccwpck_require__(11044);
 const build_results_1 = __nccwpck_require__(82107);
 const configuration_1 = __nccwpck_require__(15778);
 const cache_key_1 = __nccwpck_require__(50100);
+const gradle_1 = __nccwpck_require__(94475);
 const SKIP_RESTORE_VAR = 'GRADLE_BUILD_ACTION_SKIP_RESTORE';
 const CACHE_PROTOCOL_VERSION = 'v1';
 class ExtractedCacheEntry {
@@ -180822,8 +180822,7 @@ class ConfigurationCacheEntryExtractor extends AbstractEntryExtractor {
         return Object.entries(groupedResults).map(([configCachePath, pathResults]) => {
             const definition = new ExtractedCacheEntryDefinition('configuration-cache', configCachePath, true).withNonUniqueFileNames();
             if (pathResults.find(result => {
-                const gradleVersion = semver.coerce(result.gradleVersion);
-                return gradleVersion && semver.lt(gradleVersion, '8.6.0');
+                return !(0, gradle_1.versionIsAtLeast)(result.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+');
@@ -182006,7 +182005,7 @@ async function setup(config) {
     maybeExportVariable('DEVELOCITY_AUTO_INJECTION_CUSTOM_VALUE', 'gradle-actions');
     if (config.getBuildScanPublishEnabled()) {
         maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true');
-        maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.18');
+        maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.18.1');
         maybeExportVariable('DEVELOCITY_CCUD_PLUGIN_VERSION', '2.0');
         maybeExportVariable('DEVELOCITY_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl());
         maybeExportVariable('DEVELOCITY_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree());
@@ -182136,7 +182135,7 @@ class ShortLivedTokenClient {
         this.retryInterval = 1000;
     }
     async fetchToken(serverUrl, accessKey, expiry) {
-        const queryParams = expiry ? `?expiresInHours${expiry}` : '';
+        const queryParams = expiry ? `?expiresInHours=${expiry}` : '';
         const sanitizedServerUrl = !serverUrl.endsWith('/') ? `${serverUrl}/` : serverUrl;
         const headers = {
             'Content-Type': 'application/json',
@@ -182289,6 +182288,101 @@ function handlePostActionError(error) {
 }
 
 
+/***/ }),
+
+/***/ 94475:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.provisionAndMaybeExecute = provisionAndMaybeExecute;
+exports.versionIsAtLeast = versionIsAtLeast;
+exports.findGradleVersionOnPath = findGradleVersionOnPath;
+exports.parseGradleVersionFromOutput = parseGradleVersionFromOutput;
+const core = __importStar(__nccwpck_require__(42186));
+const exec = __importStar(__nccwpck_require__(71514));
+const which_1 = __importDefault(__nccwpck_require__(6143));
+const semver = __importStar(__nccwpck_require__(11383));
+const provisioner = __importStar(__nccwpck_require__(14042));
+const gradlew = __importStar(__nccwpck_require__(46807));
+async function provisionAndMaybeExecute(gradleVersion, buildRootDirectory, args) {
+    const executable = await provisioner.provisionGradle(gradleVersion);
+    if (args.length > 0) {
+        await executeGradleBuild(executable, buildRootDirectory, args);
+    }
+}
+async function executeGradleBuild(executable, root, args) {
+    const toExecute = executable ?? gradlew.gradleWrapperScript(root);
+    const status = await exec.exec(toExecute, args, {
+        cwd: root,
+        ignoreReturnCode: true
+    });
+    if (status !== 0) {
+        core.setFailed(`Gradle build failed: see console output for details`);
+    }
+}
+function versionIsAtLeast(actualVersion, requiredVersion) {
+    const splitVersion = actualVersion.split('-');
+    const coreVersion = splitVersion[0];
+    const prerelease = splitVersion.length > 1;
+    const actualSemver = semver.coerce(coreVersion);
+    const comparisonSemver = semver.coerce(requiredVersion);
+    if (prerelease) {
+        return semver.gt(actualSemver, comparisonSemver);
+    }
+    else {
+        return semver.gte(actualSemver, comparisonSemver);
+    }
+}
+async function findGradleVersionOnPath() {
+    const gradleExecutable = await (0, which_1.default)('gradle', { nothrow: true });
+    if (gradleExecutable) {
+        const output = await exec.getExecOutput(gradleExecutable, ['-v'], { silent: true });
+        const version = parseGradleVersionFromOutput(output.stdout);
+        return version ? new GradleExecutable(version, gradleExecutable) : undefined;
+    }
+    return undefined;
+}
+function parseGradleVersionFromOutput(output) {
+    const regex = /Gradle (\d+\.\d+(\.\d+)?(-.*)?)/;
+    const versionString = output.match(regex)?.[1];
+    return versionString;
+}
+class GradleExecutable {
+    constructor(version, executable) {
+        this.version = version;
+        this.executable = executable;
+    }
+}
+
+
 /***/ }),
 
 /***/ 46807:
@@ -182393,20 +182487,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.provisionGradle = provisionGradle;
+exports.provisionGradleAtLeast = provisionGradleAtLeast;
 const fs = __importStar(__nccwpck_require__(57147));
 const os = __importStar(__nccwpck_require__(22037));
 const path = __importStar(__nccwpck_require__(71017));
-const which_1 = __importDefault(__nccwpck_require__(6143));
 const httpm = __importStar(__nccwpck_require__(96255));
 const core = __importStar(__nccwpck_require__(42186));
 const cache = __importStar(__nccwpck_require__(27799));
-const exec = __importStar(__nccwpck_require__(71514));
 const toolCache = __importStar(__nccwpck_require__(27784));
+const gradle_1 = __nccwpck_require__(94475);
 const gradlew = __importStar(__nccwpck_require__(46807));
 const cache_utils_1 = __nccwpck_require__(11044);
 const configuration_1 = __nccwpck_require__(15778);
@@ -182417,6 +182508,10 @@ async function provisionGradle(gradleVersion) {
     }
     return undefined;
 }
+async function provisionGradleAtLeast(gradleVersion) {
+    const installedVersion = await installGradleVersionAtLeast(await gradleRelease(gradleVersion));
+    return addToPath(installedVersion);
+}
 async function addToPath(executable) {
     core.addPath(path.dirname(executable));
     return executable;
@@ -182440,7 +182535,7 @@ async function resolveGradleVersion(version) {
         case 'release-nightly':
             return gradleReleaseNightly();
         default:
-            return gradle(version);
+            return gradleRelease(version);
     }
 }
 async function gradleCurrent() {
@@ -182460,7 +182555,7 @@ async function gradleNightly() {
 async function gradleReleaseNightly() {
     return await gradleVersionDeclaration(`${gradleVersionsBaseUrl}/release-nightly`);
 }
-async function gradle(version) {
+async function gradleRelease(version) {
     const versionInfo = await findGradleVersionDeclaration(version);
     if (!versionInfo) {
         throw new Error(`Gradle version ${version} does not exists`);
@@ -182478,10 +182573,20 @@ async function findGradleVersionDeclaration(version) {
 }
 async function installGradleVersion(versionInfo) {
     return core.group(`Provision Gradle ${versionInfo.version}`, async () => {
-        const preInstalledGradle = await findGradleVersionOnPath(versionInfo);
-        if (preInstalledGradle !== undefined) {
+        const gradleOnPath = await (0, gradle_1.findGradleVersionOnPath)();
+        if (gradleOnPath?.version === versionInfo.version) {
             core.info(`Gradle version ${versionInfo.version} is already available on PATH. Not installing.`);
-            return preInstalledGradle;
+            return gradleOnPath.executable;
+        }
+        return locateGradleAndDownloadIfRequired(versionInfo);
+    });
+}
+async function installGradleVersionAtLeast(versionInfo) {
+    return core.group(`Provision Gradle >= ${versionInfo.version}`, async () => {
+        const gradleOnPath = await (0, gradle_1.findGradleVersionOnPath)();
+        if (gradleOnPath && (0, gradle_1.versionIsAtLeast)(gradleOnPath.version, versionInfo.version)) {
+            core.info(`Gradle version ${gradleOnPath.version} is available on PATH and >= ${versionInfo.version}. Not installing.`);
+            return gradleOnPath.executable;
         }
         return locateGradleAndDownloadIfRequired(versionInfo);
     });
@@ -182553,16 +182658,6 @@ async function httpGetString(url) {
     const response = await httpClient.get(url);
     return response.readBody();
 }
-async function findGradleVersionOnPath(versionInfo) {
-    const gradleExecutable = await (0, which_1.default)('gradle', { nothrow: true });
-    if (gradleExecutable) {
-        const output = await exec.getExecOutput(gradleExecutable, ['-v'], { silent: true });
-        if (output.stdout.includes(`\nGradle ${versionInfo.version}\n`)) {
-            return gradleExecutable;
-        }
-    }
-    return undefined;
-}
 
 
 /***/ }),

dist/wrapper-validation/main/index.js

@@ -7684,7 +7684,7 @@ class HttpClient {
         }
         const usingSsl = parsedUrl.protocol === 'https:';
         proxyAgent = new undici_1.ProxyAgent(Object.assign({ uri: proxyUrl.href, pipelining: !this._keepAlive ? 0 : 1 }, ((proxyUrl.username || proxyUrl.password) && {
-            token: `${proxyUrl.username}:${proxyUrl.password}`
+            token: `Basic ${Buffer.from(`${proxyUrl.username}:${proxyUrl.password}`).toString('base64')}`
         })));
         this._proxyAgentDispatcher = proxyAgent;
         if (usingSsl && this._ignoreSslError) {

docs/setup-gradle.md

@@ -753,7 +753,8 @@ To publish to https://scans.gradle.com, you must specify in your workflow that y
 ## Managing Develocity access keys
 
 Develocity access keys are long-lived, creating risks if they are leaked. To mitigate this risk this, 
-the `setup-gradle` action can automatically attempt to obtain a short-lived access token to authenticate with Develocity. 
+the `setup-gradle` action can automatically attempt to obtain a [short-lived access token](https://docs.gradle.com/develocity/gradle-plugin/current/#short_lived_access_tokens)
+to use when authenticating with Develocity. 
 The short-lived access token will then be used wherever a Develocity access key is required.
 
 ```yaml
@@ -767,6 +768,21 @@ The short-lived access token will then be used wherever a Develocity access key
       run: ./gradlew build
 ```
 
+### Increasing the expiry time for Develocity access tokens
+
+By default, a short-lived Develocity access token will be valid for 2 hours from the time it is generated. If your workflows take longer than
+2 hours to complete, you may see failure to publish Build Scans due to access token expiry.
+
+To avoid this, use the `develocity-token-expiry` parameter to specify a different token expiry in hours.
+
+```yaml
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
+      with:
+        develocity-access-key: ${{ secrets.MY_DEVELOCITY_ACCESS_KEY }}
+        develocity-token-expiry: 8 # The number of hours that the access token should remain valid (max 24).
+```
+
 ### Develocity access key supplied as environment variable
 
 The preferred mechanism is to supply the long-lived Develocity access key directly to `setup-gradle` via 
@@ -825,7 +841,7 @@ Here's a minimal example:
       run: ./gradlew build
 ```
 
-This configuration will automatically apply `v3.18` 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 `v3.18.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:
@@ -891,7 +907,7 @@ Here's an example using the env vars:
         DEVELOCITY_INJECTION_ENABLED: true
         DEVELOCITY_URL: https://develocity.your-server.com
         DEVELOCITY_ENFORCE_URL: true
-        DEVELOCITY_PLUGIN_VERSION: "3.18"
+        DEVELOCITY_PLUGIN_VERSION: "3.18.1"
         DEVELOCITY_CCUD_PLUGIN_VERSION: "2.0.2"
 ```
 

sources/package-lock.json

@@ -16,7 +16,7 @@
         "@actions/exec": "1.1.1",
         "@actions/github": "6.0.0",
         "@actions/glob": "0.5.0",
-        "@actions/http-client": "2.2.2",
+        "@actions/http-client": "2.2.3",
         "@actions/tool-cache": "2.0.1",
         "@octokit/rest": "21.0.2",
         "@octokit/webhooks-types": "7.5.1",
@@ -28,23 +28,23 @@
         "which": "4.0.0"
       },
       "devDependencies": {
-        "@types/jest": "29.5.12",
-        "@types/node": "20.16.1",
+        "@types/jest": "29.5.13",
+        "@types/node": "20.16.5",
         "@types/unzipper": "0.10.10",
         "@types/which": "3.0.4",
         "@typescript-eslint/parser": "7.18.0",
         "@vercel/ncc": "0.38.1",
         "eslint": "8.57.0",
-        "eslint-plugin-github": "5.0.1",
-        "eslint-plugin-jest": "28.8.0",
+        "eslint-plugin-github": "5.0.2",
+        "eslint-plugin-jest": "28.8.3",
         "jest": "29.7.0",
         "js-yaml": "4.1.0",
-        "nock": "13.5.4",
+        "nock": "13.5.5",
         "npm-run-all": "4.1.5",
         "patch-package": "8.0.0",
         "prettier": "3.3.3",
-        "ts-jest": "29.2.4",
-        "typescript": "5.5.4"
+        "ts-jest": "29.2.5",
+        "typescript": "5.6.2"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -279,9 +279,9 @@
       }
     },
     "node_modules/@actions/http-client": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.2.tgz",
-      "integrity": "sha512-2TvX5LskKQzDDQI+bobIDGAjkn0NJiQlg4MTrKnZ8HfQ7nDEUbtJ1ytxPDb2bfk3Hr2XD99X8oAJISAmIoiSAQ==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.3.tgz",
+      "integrity": "sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA==",
       "dependencies": {
         "tunnel": "^0.0.6",
         "undici": "^5.25.4"
@@ -1199,9 +1199,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
-      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
+      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -2356,9 +2356,9 @@
       }
     },
     "node_modules/@types/jest": {
-      "version": "29.5.12",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz",
-      "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
+      "version": "29.5.13",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.13.tgz",
+      "integrity": "sha512-wd+MVEZCHt23V0/L642O5APvspWply/rGY5BcW4SUETo2UzPU3Z26qr8jC2qxpimI2jjx9h7+2cj2FwIr01bXg==",
       "dev": true,
       "dependencies": {
         "expect": "^29.0.0",
@@ -2369,7 +2369,9 @@
       "version": "7.0.12",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
       "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/@types/json5": {
       "version": "0.0.29",
@@ -2378,9 +2380,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.16.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.1.tgz",
-      "integrity": "sha512-zJDo7wEadFtSyNz5QITDfRcrhqDvQI1xQNQ0VoizPjM/dVAODqqIUWbJPkvsxmTI0MYRGRikcdjMPhOssnPejQ==",
+      "version": "20.16.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz",
+      "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==",
       "dependencies": {
         "undici-types": "~6.19.2"
       }
@@ -2411,7 +2413,9 @@
       "version": "7.5.0",
       "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
       "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/@types/stack-utils": {
       "version": "2.0.1",
@@ -2462,6 +2466,8 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.2.0.tgz",
       "integrity": "sha512-mdekAHOqS9UjlmyF/LSs6AIEvfceV749GFxoBAjwAv0nkevfKHWQFDMcBZWUiIC5ft6ePWivXoS36aKQ0Cy3sw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
         "@typescript-eslint/scope-manager": "7.2.0",
@@ -2497,6 +2503,8 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz",
       "integrity": "sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/types": "7.2.0",
         "@typescript-eslint/visitor-keys": "7.2.0"
@@ -2514,6 +2522,8 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.2.0.tgz",
       "integrity": "sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
       },
@@ -2527,6 +2537,8 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz",
       "integrity": "sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/types": "7.2.0",
         "@typescript-eslint/visitor-keys": "7.2.0",
@@ -2555,6 +2567,8 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.2.0.tgz",
       "integrity": "sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
@@ -2580,6 +2594,8 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz",
       "integrity": "sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/types": "7.2.0",
         "eslint-visitor-keys": "^3.4.1"
@@ -2597,6 +2613,8 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -2606,6 +2624,8 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
       "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -2744,13 +2764,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.0.1.tgz",
-      "integrity": "sha512-NpixInP5dm7uukMiRyiHjRKkom5RIFA4dfiHvalanD2cF0CLUuQqxfg8PtEUo9yqJI2bBhF+pcSafqnG3UBnRQ==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.5.0.tgz",
+      "integrity": "sha512-06JOQ9Qgj33yvBEx6tpC8ecP9o860rsR22hWMEd12WcTRrfaFgHr2RB/CA/B+7BMhHkXT4chg2MyboGdFGawYg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/visitor-keys": "8.0.1"
+        "@typescript-eslint/types": "8.5.0",
+        "@typescript-eslint/visitor-keys": "8.5.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2765,6 +2785,8 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.2.0.tgz",
       "integrity": "sha512-xHi51adBHo9O9330J8GQYQwrKBqbIPJGZZVQTHHmy200hvkLZFWJIFtAG/7IYTWUyun6DE6w5InDReePJYJlJA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/typescript-estree": "7.2.0",
         "@typescript-eslint/utils": "7.2.0",
@@ -2792,6 +2814,8 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz",
       "integrity": "sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/types": "7.2.0",
         "@typescript-eslint/visitor-keys": "7.2.0"
@@ -2809,6 +2833,8 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.2.0.tgz",
       "integrity": "sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
       },
@@ -2822,6 +2848,8 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz",
       "integrity": "sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/types": "7.2.0",
         "@typescript-eslint/visitor-keys": "7.2.0",
@@ -2850,6 +2878,8 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.2.0.tgz",
       "integrity": "sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
@@ -2875,6 +2905,8 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz",
       "integrity": "sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/types": "7.2.0",
         "eslint-visitor-keys": "^3.4.1"
@@ -2892,6 +2924,8 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -2901,6 +2935,8 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
       "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -2912,9 +2948,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.0.1.tgz",
-      "integrity": "sha512-PpqTVT3yCA/bIgJ12czBuE3iBlM3g4inRSC5J0QOdQFAn07TYrYEQBBKgXH1lQpglup+Zy6c1fxuwTk4MTNKIw==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.5.0.tgz",
+      "integrity": "sha512-qjkormnQS5wF9pjSi6q60bKUHH44j2APxfh9TQRXK8wbYVeDYYdYJGIROL87LGZZ2gz3Rbmjc736qyL8deVtdw==",
       "dev": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2925,15 +2961,15 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.0.1.tgz",
-      "integrity": "sha512-8V9hriRvZQXPWU3bbiUV4Epo7EvgM6RTs+sUmxp5G//dBGy402S7Fx0W0QkB2fb4obCF8SInoUzvTYtc3bkb5w==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.5.0.tgz",
+      "integrity": "sha512-vEG2Sf9P8BPQ+d0pxdfndw3xIXaoSjliG0/Ejk7UggByZPKXmJmw3GW5jV2gHNQNawBUyfahoSiCFVov0Ruf7Q==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/visitor-keys": "8.0.1",
+        "@typescript-eslint/types": "8.5.0",
+        "@typescript-eslint/visitor-keys": "8.5.0",
         "debug": "^4.3.4",
-        "globby": "^11.1.0",
+        "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
@@ -2977,15 +3013,15 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.0.1.tgz",
-      "integrity": "sha512-CBFR0G0sCt0+fzfnKaciu9IBsKvEKYwN9UZ+eeogK1fYHg4Qxk1yf/wLQkLXlq8wbU2dFlgAesxt8Gi76E8RTA==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.5.0.tgz",
+      "integrity": "sha512-6yyGYVL0e+VzGYp60wvkBHiqDWOpT63pdMV2CVG4LVDd5uR6q1qQN/7LafBZtAtNIn/mqXjsSeS5ggv/P0iECw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.0.1",
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/typescript-estree": "8.0.1"
+        "@typescript-eslint/scope-manager": "8.5.0",
+        "@typescript-eslint/types": "8.5.0",
+        "@typescript-eslint/typescript-estree": "8.5.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2999,12 +3035,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.0.1.tgz",
-      "integrity": "sha512-W5E+o0UfUcK5EgchLZsyVWqARmsM7v54/qEq6PY3YI5arkgmCzHiuk0zKSJJbm71V0xdRna4BGomkCTXz2/LkQ==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.5.0.tgz",
+      "integrity": "sha512-yTPqMnbAZJNy2Xq2XU8AdtOW9tJIr+UQb64aXB9f3B1498Zx9JorVgFJcZpEc9UBuCCrdzKID2RGAMkYcDtZOw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.0.1",
+        "@typescript-eslint/types": "8.5.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -4668,14 +4704,14 @@
       }
     },
     "node_modules/eslint-plugin-github": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-github/-/eslint-plugin-github-5.0.1.tgz",
-      "integrity": "sha512-qbXG3wL5Uh2JB92EKeX2hPtO9c/t75qVxQjVLYuTFfhHifLZzv9CBvLCvoaBhLrAC/xTMVht7DK/NofYK8X4Dg==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-github/-/eslint-plugin-github-5.0.2.tgz",
+      "integrity": "sha512-nMdzWJQ5CimjQDY6SFeJ0KIXuNFf0dgDWEd4eP3UWfuTuP/dXcZJDg7MQRvAFt743T1zUi4+/HdOihfu8xJkLA==",
       "dev": true,
       "dependencies": {
         "@github/browserslist-config": "^1.0.0",
-        "@typescript-eslint/eslint-plugin": "^7.0.1",
-        "@typescript-eslint/parser": "^7.0.1",
+        "@typescript-eslint/eslint-plugin": "^8.0.0",
+        "@typescript-eslint/parser": "^8.0.0",
         "aria-query": "^5.3.0",
         "eslint-config-prettier": ">=8.0.0",
         "eslint-plugin-escompat": "^3.3.3",
@@ -4698,6 +4734,91 @@
         "eslint": "^8.0.1"
       }
     },
+    "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.5.0.tgz",
+      "integrity": "sha512-lHS5hvz33iUFQKuPFGheAB84LwcJ60G8vKnEhnfcK1l8kGVLro2SFYW6K0/tj8FUhRJ0VHyg1oAfg50QGbPPHw==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.5.0",
+        "@typescript-eslint/type-utils": "8.5.0",
+        "@typescript-eslint/utils": "8.5.0",
+        "@typescript-eslint/visitor-keys": "8.5.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.3.1",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "eslint": "^8.57.0 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/parser": {
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.5.0.tgz",
+      "integrity": "sha512-gF77eNv0Xz2UJg/NbpWJ0kqAm35UMsvZf1GHj8D9MRFTj/V3tAciIWXfmPLsAAF/vUlpWPvUDyH1jjsr0cMVWw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "8.5.0",
+        "@typescript-eslint/types": "8.5.0",
+        "@typescript-eslint/typescript-estree": "8.5.0",
+        "@typescript-eslint/visitor-keys": "8.5.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/type-utils": {
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.5.0.tgz",
+      "integrity": "sha512-N1K8Ix+lUM+cIDhL2uekVn/ZD7TZW+9/rwz8DclQpcQ9rk4sIL5CAlBC0CugWKREmDjBzI/kQqU4wkg46jWLYA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "8.5.0",
+        "@typescript-eslint/utils": "8.5.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/eslint-plugin-i18n-text": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/eslint-plugin-i18n-text/-/eslint-plugin-i18n-text-1.0.1.tgz",
@@ -4767,9 +4888,9 @@
       }
     },
     "node_modules/eslint-plugin-jest": {
-      "version": "28.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.0.tgz",
-      "integrity": "sha512-Tubj1hooFxCl52G4qQu0edzV/+EZzPUeN8p2NnW5uu4fbDs+Yo7+qDVDc4/oG3FbCqEBmu/OC3LSsyiU22oghw==",
+      "version": "28.8.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.3.tgz",
+      "integrity": "sha512-HIQ3t9hASLKm2IhIOqnu+ifw7uLZkIlR7RYNv7fMcEi/p0CIiJmfriStQS2LDkgtY4nyLbIZAD+JL347Yc2ETQ==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/utils": "^6.0.0 || ^7.0.0 || ^8.0.0"
@@ -5060,9 +5181,9 @@
       "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="
     },
     "node_modules/fast-glob": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz",
-      "integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -5667,9 +5788,9 @@
       ]
     },
     "node_modules/ignore": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -7285,9 +7406,9 @@
       }
     },
     "node_modules/nock": {
-      "version": "13.5.4",
-      "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.4.tgz",
-      "integrity": "sha512-yAyTfdeNJGGBFxWdzSKCBYxs5FxLbCg5X5Q4ets974hcQzG1+qCxvIyOo4j2Ry6MUlhWVMX4OoYDefAIIwupjw==",
+      "version": "13.5.5",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.5.tgz",
+      "integrity": "sha512-XKYnqUrCwXC8DGG1xX4YH5yNIrlh9c065uaMZZHUoeUUINTOyt+x/G+ezYk0Ft6ExSREVIs+qBJDK503viTfFA==",
       "dev": true,
       "dependencies": {
         "debug": "^4.1.0",
@@ -7928,9 +8049,9 @@
       "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
     },
     "node_modules/path-to-regexp": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz",
-      "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw=="
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ=="
     },
     "node_modules/path-type": {
       "version": "4.0.0",
@@ -9029,20 +9150,20 @@
       }
     },
     "node_modules/ts-jest": {
-      "version": "29.2.4",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.4.tgz",
-      "integrity": "sha512-3d6tgDyhCI29HlpwIq87sNuI+3Q6GLTTCeYRHCs7vDz+/3GCMwEtV9jezLyl4ZtnBgx00I7hm8PCP8cTksMGrw==",
+      "version": "29.2.5",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.5.tgz",
+      "integrity": "sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==",
       "dev": true,
       "dependencies": {
-        "bs-logger": "0.x",
+        "bs-logger": "^0.2.6",
         "ejs": "^3.1.10",
-        "fast-json-stable-stringify": "2.x",
+        "fast-json-stable-stringify": "^2.1.0",
         "jest-util": "^29.0.0",
         "json5": "^2.2.3",
-        "lodash.memoize": "4.x",
-        "make-error": "1.x",
-        "semver": "^7.5.3",
-        "yargs-parser": "^21.0.1"
+        "lodash.memoize": "^4.1.2",
+        "make-error": "^1.3.6",
+        "semver": "^7.6.3",
+        "yargs-parser": "^21.1.1"
       },
       "bin": {
         "ts-jest": "cli.js"
@@ -9295,9 +9416,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
+      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -9941,9 +10062,9 @@
       }
     },
     "@actions/http-client": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.2.tgz",
-      "integrity": "sha512-2TvX5LskKQzDDQI+bobIDGAjkn0NJiQlg4MTrKnZ8HfQ7nDEUbtJ1ytxPDb2bfk3Hr2XD99X8oAJISAmIoiSAQ==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.3.tgz",
+      "integrity": "sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA==",
       "requires": {
         "tunnel": "^0.0.6",
         "undici": "^5.25.4"
@@ -10659,9 +10780,9 @@
       }
     },
     "@eslint-community/regexpp": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
-      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
+      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
       "dev": true
     },
     "@eslint/eslintrc": {
@@ -11563,9 +11684,9 @@
       }
     },
     "@types/jest": {
-      "version": "29.5.12",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz",
-      "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
+      "version": "29.5.13",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.13.tgz",
+      "integrity": "sha512-wd+MVEZCHt23V0/L642O5APvspWply/rGY5BcW4SUETo2UzPU3Z26qr8jC2qxpimI2jjx9h7+2cj2FwIr01bXg==",
       "dev": true,
       "requires": {
         "expect": "^29.0.0",
@@ -11576,7 +11697,9 @@
       "version": "7.0.12",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
       "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "@types/json5": {
       "version": "0.0.29",
@@ -11585,9 +11708,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "20.16.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.1.tgz",
-      "integrity": "sha512-zJDo7wEadFtSyNz5QITDfRcrhqDvQI1xQNQ0VoizPjM/dVAODqqIUWbJPkvsxmTI0MYRGRikcdjMPhOssnPejQ==",
+      "version": "20.16.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz",
+      "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==",
       "requires": {
         "undici-types": "~6.19.2"
       }
@@ -11617,7 +11740,9 @@
       "version": "7.5.0",
       "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
       "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "@types/stack-utils": {
       "version": "2.0.1",
@@ -11668,6 +11793,8 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.2.0.tgz",
       "integrity": "sha512-mdekAHOqS9UjlmyF/LSs6AIEvfceV749GFxoBAjwAv0nkevfKHWQFDMcBZWUiIC5ft6ePWivXoS36aKQ0Cy3sw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "@eslint-community/regexpp": "^4.5.1",
         "@typescript-eslint/scope-manager": "7.2.0",
@@ -11687,6 +11814,8 @@
           "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz",
           "integrity": "sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
             "@typescript-eslint/types": "7.2.0",
             "@typescript-eslint/visitor-keys": "7.2.0"
@@ -11696,13 +11825,17 @@
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.2.0.tgz",
           "integrity": "sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==",
-          "dev": true
+          "dev": true,
+          "optional": true,
+          "peer": true
         },
         "@typescript-eslint/typescript-estree": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz",
           "integrity": "sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
             "@typescript-eslint/types": "7.2.0",
             "@typescript-eslint/visitor-keys": "7.2.0",
@@ -11719,6 +11852,8 @@
           "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.2.0.tgz",
           "integrity": "sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
             "@eslint-community/eslint-utils": "^4.4.0",
             "@types/json-schema": "^7.0.12",
@@ -11734,6 +11869,8 @@
           "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz",
           "integrity": "sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
             "@typescript-eslint/types": "7.2.0",
             "eslint-visitor-keys": "^3.4.1"
@@ -11744,6 +11881,8 @@
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
           "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
             "balanced-match": "^1.0.0"
           }
@@ -11753,6 +11892,8 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
           "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
             "brace-expansion": "^2.0.1"
           }
@@ -11835,13 +11976,13 @@
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.0.1.tgz",
-      "integrity": "sha512-NpixInP5dm7uukMiRyiHjRKkom5RIFA4dfiHvalanD2cF0CLUuQqxfg8PtEUo9yqJI2bBhF+pcSafqnG3UBnRQ==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.5.0.tgz",
+      "integrity": "sha512-06JOQ9Qgj33yvBEx6tpC8ecP9o860rsR22hWMEd12WcTRrfaFgHr2RB/CA/B+7BMhHkXT4chg2MyboGdFGawYg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/visitor-keys": "8.0.1"
+        "@typescript-eslint/types": "8.5.0",
+        "@typescript-eslint/visitor-keys": "8.5.0"
       }
     },
     "@typescript-eslint/type-utils": {
@@ -11849,6 +11990,8 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.2.0.tgz",
       "integrity": "sha512-xHi51adBHo9O9330J8GQYQwrKBqbIPJGZZVQTHHmy200hvkLZFWJIFtAG/7IYTWUyun6DE6w5InDReePJYJlJA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "@typescript-eslint/typescript-estree": "7.2.0",
         "@typescript-eslint/utils": "7.2.0",
@@ -11861,6 +12004,8 @@
           "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz",
           "integrity": "sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
             "@typescript-eslint/types": "7.2.0",
             "@typescript-eslint/visitor-keys": "7.2.0"
@@ -11870,13 +12015,17 @@
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.2.0.tgz",
           "integrity": "sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==",
-          "dev": true
+          "dev": true,
+          "optional": true,
+          "peer": true
         },
         "@typescript-eslint/typescript-estree": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz",
           "integrity": "sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
             "@typescript-eslint/types": "7.2.0",
             "@typescript-eslint/visitor-keys": "7.2.0",
@@ -11893,6 +12042,8 @@
           "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.2.0.tgz",
           "integrity": "sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
             "@eslint-community/eslint-utils": "^4.4.0",
             "@types/json-schema": "^7.0.12",
@@ -11908,6 +12059,8 @@
           "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz",
           "integrity": "sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
             "@typescript-eslint/types": "7.2.0",
             "eslint-visitor-keys": "^3.4.1"
@@ -11918,6 +12071,8 @@
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
           "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
             "balanced-match": "^1.0.0"
           }
@@ -11927,6 +12082,8 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
           "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
             "brace-expansion": "^2.0.1"
           }
@@ -11934,21 +12091,21 @@
       }
     },
     "@typescript-eslint/types": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.0.1.tgz",
-      "integrity": "sha512-PpqTVT3yCA/bIgJ12czBuE3iBlM3g4inRSC5J0QOdQFAn07TYrYEQBBKgXH1lQpglup+Zy6c1fxuwTk4MTNKIw==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.5.0.tgz",
+      "integrity": "sha512-qjkormnQS5wF9pjSi6q60bKUHH44j2APxfh9TQRXK8wbYVeDYYdYJGIROL87LGZZ2gz3Rbmjc736qyL8deVtdw==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.0.1.tgz",
-      "integrity": "sha512-8V9hriRvZQXPWU3bbiUV4Epo7EvgM6RTs+sUmxp5G//dBGy402S7Fx0W0QkB2fb4obCF8SInoUzvTYtc3bkb5w==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.5.0.tgz",
+      "integrity": "sha512-vEG2Sf9P8BPQ+d0pxdfndw3xIXaoSjliG0/Ejk7UggByZPKXmJmw3GW5jV2gHNQNawBUyfahoSiCFVov0Ruf7Q==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/visitor-keys": "8.0.1",
+        "@typescript-eslint/types": "8.5.0",
+        "@typescript-eslint/visitor-keys": "8.5.0",
         "debug": "^4.3.4",
-        "globby": "^11.1.0",
+        "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
@@ -11976,24 +12133,24 @@
       }
     },
     "@typescript-eslint/utils": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.0.1.tgz",
-      "integrity": "sha512-CBFR0G0sCt0+fzfnKaciu9IBsKvEKYwN9UZ+eeogK1fYHg4Qxk1yf/wLQkLXlq8wbU2dFlgAesxt8Gi76E8RTA==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.5.0.tgz",
+      "integrity": "sha512-6yyGYVL0e+VzGYp60wvkBHiqDWOpT63pdMV2CVG4LVDd5uR6q1qQN/7LafBZtAtNIn/mqXjsSeS5ggv/P0iECw==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.0.1",
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/typescript-estree": "8.0.1"
+        "@typescript-eslint/scope-manager": "8.5.0",
+        "@typescript-eslint/types": "8.5.0",
+        "@typescript-eslint/typescript-estree": "8.5.0"
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.0.1.tgz",
-      "integrity": "sha512-W5E+o0UfUcK5EgchLZsyVWqARmsM7v54/qEq6PY3YI5arkgmCzHiuk0zKSJJbm71V0xdRna4BGomkCTXz2/LkQ==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.5.0.tgz",
+      "integrity": "sha512-yTPqMnbAZJNy2Xq2XU8AdtOW9tJIr+UQb64aXB9f3B1498Zx9JorVgFJcZpEc9UBuCCrdzKID2RGAMkYcDtZOw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "8.0.1",
+        "@typescript-eslint/types": "8.5.0",
         "eslint-visitor-keys": "^3.4.3"
       }
     },
@@ -13208,14 +13365,14 @@
       }
     },
     "eslint-plugin-github": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-github/-/eslint-plugin-github-5.0.1.tgz",
-      "integrity": "sha512-qbXG3wL5Uh2JB92EKeX2hPtO9c/t75qVxQjVLYuTFfhHifLZzv9CBvLCvoaBhLrAC/xTMVht7DK/NofYK8X4Dg==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-github/-/eslint-plugin-github-5.0.2.tgz",
+      "integrity": "sha512-nMdzWJQ5CimjQDY6SFeJ0KIXuNFf0dgDWEd4eP3UWfuTuP/dXcZJDg7MQRvAFt743T1zUi4+/HdOihfu8xJkLA==",
       "dev": true,
       "requires": {
         "@github/browserslist-config": "^1.0.0",
-        "@typescript-eslint/eslint-plugin": "^7.0.1",
-        "@typescript-eslint/parser": "^7.0.1",
+        "@typescript-eslint/eslint-plugin": "^8.0.0",
+        "@typescript-eslint/parser": "^8.0.0",
         "aria-query": "^5.3.0",
         "eslint-config-prettier": ">=8.0.0",
         "eslint-plugin-escompat": "^3.3.3",
@@ -13230,6 +13387,50 @@
         "jsx-ast-utils": "^3.3.2",
         "prettier": "^3.0.0",
         "svg-element-attributes": "^1.3.1"
+      },
+      "dependencies": {
+        "@typescript-eslint/eslint-plugin": {
+          "version": "8.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.5.0.tgz",
+          "integrity": "sha512-lHS5hvz33iUFQKuPFGheAB84LwcJ60G8vKnEhnfcK1l8kGVLro2SFYW6K0/tj8FUhRJ0VHyg1oAfg50QGbPPHw==",
+          "dev": true,
+          "requires": {
+            "@eslint-community/regexpp": "^4.10.0",
+            "@typescript-eslint/scope-manager": "8.5.0",
+            "@typescript-eslint/type-utils": "8.5.0",
+            "@typescript-eslint/utils": "8.5.0",
+            "@typescript-eslint/visitor-keys": "8.5.0",
+            "graphemer": "^1.4.0",
+            "ignore": "^5.3.1",
+            "natural-compare": "^1.4.0",
+            "ts-api-utils": "^1.3.0"
+          }
+        },
+        "@typescript-eslint/parser": {
+          "version": "8.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.5.0.tgz",
+          "integrity": "sha512-gF77eNv0Xz2UJg/NbpWJ0kqAm35UMsvZf1GHj8D9MRFTj/V3tAciIWXfmPLsAAF/vUlpWPvUDyH1jjsr0cMVWw==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/scope-manager": "8.5.0",
+            "@typescript-eslint/types": "8.5.0",
+            "@typescript-eslint/typescript-estree": "8.5.0",
+            "@typescript-eslint/visitor-keys": "8.5.0",
+            "debug": "^4.3.4"
+          }
+        },
+        "@typescript-eslint/type-utils": {
+          "version": "8.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.5.0.tgz",
+          "integrity": "sha512-N1K8Ix+lUM+cIDhL2uekVn/ZD7TZW+9/rwz8DclQpcQ9rk4sIL5CAlBC0CugWKREmDjBzI/kQqU4wkg46jWLYA==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/typescript-estree": "8.5.0",
+            "@typescript-eslint/utils": "8.5.0",
+            "debug": "^4.3.4",
+            "ts-api-utils": "^1.3.0"
+          }
+        }
       }
     },
     "eslint-plugin-i18n-text": {
@@ -13289,9 +13490,9 @@
       }
     },
     "eslint-plugin-jest": {
-      "version": "28.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.0.tgz",
-      "integrity": "sha512-Tubj1hooFxCl52G4qQu0edzV/+EZzPUeN8p2NnW5uu4fbDs+Yo7+qDVDc4/oG3FbCqEBmu/OC3LSsyiU22oghw==",
+      "version": "28.8.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.3.tgz",
+      "integrity": "sha512-HIQ3t9hASLKm2IhIOqnu+ifw7uLZkIlR7RYNv7fMcEi/p0CIiJmfriStQS2LDkgtY4nyLbIZAD+JL347Yc2ETQ==",
       "dev": true,
       "requires": {
         "@typescript-eslint/utils": "^6.0.0 || ^7.0.0 || ^8.0.0"
@@ -13478,9 +13679,9 @@
       "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="
     },
     "fast-glob": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz",
-      "integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -13913,9 +14114,9 @@
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
     },
     "ignore": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true
     },
     "import-fresh": {
@@ -15140,9 +15341,9 @@
       }
     },
     "nock": {
-      "version": "13.5.4",
-      "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.4.tgz",
-      "integrity": "sha512-yAyTfdeNJGGBFxWdzSKCBYxs5FxLbCg5X5Q4ets974hcQzG1+qCxvIyOo4j2Ry6MUlhWVMX4OoYDefAIIwupjw==",
+      "version": "13.5.5",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.5.tgz",
+      "integrity": "sha512-XKYnqUrCwXC8DGG1xX4YH5yNIrlh9c065uaMZZHUoeUUINTOyt+x/G+ezYk0Ft6ExSREVIs+qBJDK503viTfFA==",
       "dev": true,
       "requires": {
         "debug": "^4.1.0",
@@ -15612,9 +15813,9 @@
       }
     },
     "path-to-regexp": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz",
-      "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw=="
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ=="
     },
     "path-type": {
       "version": "4.0.0",
@@ -16405,20 +16606,20 @@
       "requires": {}
     },
     "ts-jest": {
-      "version": "29.2.4",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.4.tgz",
-      "integrity": "sha512-3d6tgDyhCI29HlpwIq87sNuI+3Q6GLTTCeYRHCs7vDz+/3GCMwEtV9jezLyl4ZtnBgx00I7hm8PCP8cTksMGrw==",
+      "version": "29.2.5",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.5.tgz",
+      "integrity": "sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==",
       "dev": true,
       "requires": {
-        "bs-logger": "0.x",
+        "bs-logger": "^0.2.6",
         "ejs": "^3.1.10",
-        "fast-json-stable-stringify": "2.x",
+        "fast-json-stable-stringify": "^2.1.0",
         "jest-util": "^29.0.0",
         "json5": "^2.2.3",
-        "lodash.memoize": "4.x",
-        "make-error": "1.x",
-        "semver": "^7.5.3",
-        "yargs-parser": "^21.0.1"
+        "lodash.memoize": "^4.1.2",
+        "make-error": "^1.3.6",
+        "semver": "^7.6.3",
+        "yargs-parser": "^21.1.1"
       }
     },
     "ts-poet": {
@@ -16577,9 +16778,9 @@
       }
     },
     "typescript": {
-      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
+      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
       "dev": true
     },
     "unbox-primitive": {

sources/package.json

@@ -38,7 +38,7 @@
     "@actions/exec": "1.1.1",
     "@actions/github": "6.0.0",
     "@actions/glob": "0.5.0",
-    "@actions/http-client": "2.2.2",
+    "@actions/http-client": "2.2.3",
     "@actions/tool-cache": "2.0.1",
     "@octokit/rest": "21.0.2",
     "@octokit/webhooks-types": "7.5.1",
@@ -50,22 +50,22 @@
     "which": "4.0.0"
   },
   "devDependencies": {
-    "@types/jest": "29.5.12",
-    "@types/node": "20.16.1",
+    "@types/jest": "29.5.13",
+    "@types/node": "20.16.5",
     "@types/unzipper": "0.10.10",
     "@types/which": "3.0.4",
     "@typescript-eslint/parser": "7.18.0",
     "@vercel/ncc": "0.38.1",
     "eslint": "8.57.0",
-    "eslint-plugin-github": "5.0.1",
-    "eslint-plugin-jest": "28.8.0",
+    "eslint-plugin-github": "5.0.2",
+    "eslint-plugin-jest": "28.8.3",
     "jest": "29.7.0",
     "js-yaml": "4.1.0",
-    "nock": "13.5.4",
+    "nock": "13.5.5",
     "npm-run-all": "4.1.5",
     "patch-package": "8.0.0",
     "prettier": "3.3.3",
-    "ts-jest": "29.2.4",
-    "typescript": "5.5.4"
+    "ts-jest": "29.2.5",
+    "typescript": "5.6.2"
   }
 }

sources/src/caching/cache-cleaner.ts

@@ -55,11 +55,12 @@ export class CacheCleaner {
         )
         fs.writeFileSync(path.resolve(cleanupProjectDir, 'build.gradle'), 'task("noop") {}')
 
-        const executable = await provisioner.provisionGradle('current')
+        // Gradle >= 8.9 required for cache cleanup
+        const executable = await provisioner.provisionGradleAtLeast('8.9')
 
         await core.group('Executing Gradle to clean up caches', async () => {
             core.info(`Cleaning up caches last used before ${cleanTimestamp}`)
-            await this.executeCleanupBuild(executable!, cleanupProjectDir)
+            await this.executeCleanupBuild(executable, cleanupProjectDir)
         })
     }
 

sources/src/caching/gradle-home-extry-extractor.ts

@@ -2,7 +2,6 @@ import path from 'path'
 import fs from 'fs'
 import * as core from '@actions/core'
 import * as glob from '@actions/glob'
-import * as semver from 'semver'
 
 import {CacheEntryListener, CacheListener} from './cache-reporting'
 import {cacheDebug, hashFileNames, isCacheDebuggingEnabled, restoreCache, saveCache, tryDelete} from './cache-utils'
@@ -10,6 +9,7 @@ import {cacheDebug, hashFileNames, isCacheDebuggingEnabled, restoreCache, saveCa
 import {BuildResult, loadBuildResults} from '../build-results'
 import {CacheConfig, ACTION_METADATA_DIR} from '../configuration'
 import {getCacheKeyBase} from './cache-key'
+import {versionIsAtLeast} from '../execution/gradle'
 
 const SKIP_RESTORE_VAR = 'GRADLE_BUILD_ACTION_SKIP_RESTORE'
 const CACHE_PROTOCOL_VERSION = 'v1'
@@ -434,8 +434,7 @@ export class ConfigurationCacheEntryExtractor extends AbstractEntryExtractor {
             // 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')
+                    return !versionIsAtLeast(result.gradleVersion, '8.6.0')
                 })
             ) {
                 core.info(

sources/src/develocity/build-scan.ts

@@ -7,7 +7,7 @@ export async function setup(config: BuildScanConfig): Promise<void> {
     maybeExportVariable('DEVELOCITY_AUTO_INJECTION_CUSTOM_VALUE', 'gradle-actions')
     if (config.getBuildScanPublishEnabled()) {
         maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true')
-        maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.18')
+        maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.18.1')
         maybeExportVariable('DEVELOCITY_CCUD_PLUGIN_VERSION', '2.0')
         maybeExportVariable('DEVELOCITY_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl())
         maybeExportVariable('DEVELOCITY_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree())

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

@@ -72,7 +72,7 @@ class ShortLivedTokenClient {
     retryInterval = 1000
 
     async fetchToken(serverUrl: string, accessKey: HostnameAccessKey, expiry: string): Promise<HostnameAccessKey> {
-        const queryParams = expiry ? `?expiresInHours${expiry}` : ''
+        const queryParams = expiry ? `?expiresInHours=${expiry}` : ''
         const sanitizedServerUrl = !serverUrl.endsWith('/') ? `${serverUrl}/` : serverUrl
         const headers = {
             'Content-Type': 'application/json',

sources/src/execution/gradle.ts

@@ -1,6 +1,8 @@
 import * as core from '@actions/core'
 import * as exec from '@actions/exec'
 
+import which from 'which'
+import * as semver from 'semver'
 import * as provisioner from './provision'
 import * as gradlew from './gradlew'
 
@@ -31,3 +33,42 @@ async function executeGradleBuild(executable: string | undefined, root: string,
         core.setFailed(`Gradle build failed: see console output for details`)
     }
 }
+
+export function versionIsAtLeast(actualVersion: string, requiredVersion: string): boolean {
+    const splitVersion = actualVersion.split('-')
+    const coreVersion = splitVersion[0]
+    const prerelease = splitVersion.length > 1
+
+    const actualSemver = semver.coerce(coreVersion)!
+    const comparisonSemver = semver.coerce(requiredVersion)!
+
+    if (prerelease) {
+        return semver.gt(actualSemver, comparisonSemver)
+    } else {
+        return semver.gte(actualSemver, comparisonSemver)
+    }
+}
+
+export async function findGradleVersionOnPath(): Promise<GradleExecutable | undefined> {
+    const gradleExecutable = await which('gradle', {nothrow: true})
+    if (gradleExecutable) {
+        const output = await exec.getExecOutput(gradleExecutable, ['-v'], {silent: true})
+        const version = parseGradleVersionFromOutput(output.stdout)
+        return version ? new GradleExecutable(version, gradleExecutable) : undefined
+    }
+
+    return undefined
+}
+
+export function parseGradleVersionFromOutput(output: string): string | undefined {
+    const regex = /Gradle (\d+\.\d+(\.\d+)?(-.*)?)/
+    const versionString = output.match(regex)?.[1]
+    return versionString
+}
+
+class GradleExecutable {
+    constructor(
+        readonly version: string,
+        readonly executable: string
+    ) {}
+}

sources/src/execution/provision.ts

@@ -1,13 +1,12 @@
 import * as fs from 'fs'
 import * as os from 'os'
 import * as path from 'path'
-import which from 'which'
 import * as httpm from '@actions/http-client'
 import * as core from '@actions/core'
 import * as cache from '@actions/cache'
-import * as exec from '@actions/exec'
 import * as toolCache from '@actions/tool-cache'
 
+import {findGradleVersionOnPath, versionIsAtLeast} from './gradle'
 import * as gradlew from './gradlew'
 import {handleCacheFailure} from '../caching/cache-utils'
 import {CacheConfig} from '../configuration'
@@ -26,6 +25,16 @@ export async function provisionGradle(gradleVersion: string): Promise<string | u
     return undefined
 }
 
+/**
+ * Ensure that the Gradle version on PATH is no older than the specified version.
+ * If the version on PATH is older, install the specified version and add it to the PATH.
+ * @return Installed Gradle executable or undefined if no version configured.
+ */
+export async function provisionGradleAtLeast(gradleVersion: string): Promise<string> {
+    const installedVersion = await installGradleVersionAtLeast(await gradleRelease(gradleVersion))
+    return addToPath(installedVersion)
+}
+
 async function addToPath(executable: string): Promise<string> {
     core.addPath(path.dirname(executable))
     return executable
@@ -51,7 +60,7 @@ async function resolveGradleVersion(version: string): Promise<GradleVersionInfo>
         case 'release-nightly':
             return gradleReleaseNightly()
         default:
-            return gradle(version)
+            return gradleRelease(version)
     }
 }
 
@@ -76,7 +85,7 @@ async function gradleReleaseNightly(): Promise<GradleVersionInfo> {
     return await gradleVersionDeclaration(`${gradleVersionsBaseUrl}/release-nightly`)
 }
 
-async function gradle(version: string): Promise<GradleVersionInfo> {
+async function gradleRelease(version: string): Promise<GradleVersionInfo> {
     const versionInfo = await findGradleVersionDeclaration(version)
     if (!versionInfo) {
         throw new Error(`Gradle version ${version} does not exists`)
@@ -97,10 +106,24 @@ async function findGradleVersionDeclaration(version: string): Promise<GradleVers
 
 async function installGradleVersion(versionInfo: GradleVersionInfo): Promise<string> {
     return core.group(`Provision Gradle ${versionInfo.version}`, async () => {
-        const preInstalledGradle = await findGradleVersionOnPath(versionInfo)
-        if (preInstalledGradle !== undefined) {
+        const gradleOnPath = await findGradleVersionOnPath()
+        if (gradleOnPath?.version === versionInfo.version) {
             core.info(`Gradle version ${versionInfo.version} is already available on PATH. Not installing.`)
-            return preInstalledGradle
+            return gradleOnPath.executable
+        }
+
+        return locateGradleAndDownloadIfRequired(versionInfo)
+    })
+}
+
+async function installGradleVersionAtLeast(versionInfo: GradleVersionInfo): Promise<string> {
+    return core.group(`Provision Gradle >= ${versionInfo.version}`, async () => {
+        const gradleOnPath = await findGradleVersionOnPath()
+        if (gradleOnPath && versionIsAtLeast(gradleOnPath.version, versionInfo.version)) {
+            core.info(
+                `Gradle version ${gradleOnPath.version} is available on PATH and >= ${versionInfo.version}. Not installing.`
+            )
+            return gradleOnPath.executable
         }
 
         return locateGradleAndDownloadIfRequired(versionInfo)
@@ -192,15 +215,3 @@ interface GradleVersionInfo {
     version: string
     downloadUrl: string
 }
-
-async function findGradleVersionOnPath(versionInfo: GradleVersionInfo): Promise<string | undefined> {
-    const gradleExecutable = await which('gradle', {nothrow: true})
-    if (gradleExecutable) {
-        const output = await exec.getExecOutput(gradleExecutable, ['-v'], {silent: true})
-        if (output.stdout.includes(`\nGradle ${versionInfo.version}\n`)) {
-            return gradleExecutable
-        }
-    }
-
-    return undefined
-}

sources/test/init-scripts/settings.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.develocity" version "3.18"
+    id "com.gradle.develocity" version "3.18.1"
     id "com.gradle.common-custom-user-data-gradle-plugin" version "2.0.1"
 }
 

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 = '3.18'
+    static final String DEVELOCITY_PLUGIN_VERSION = '3.18.1'
     static final String CCUD_PLUGIN_VERSION = '2.0.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

@@ -196,7 +196,7 @@ class TestBuildResultRecorder extends BaseInitScriptTest {
         when:
         settingsFile.text = """
             plugins {
-                id 'com.gradle.develocity' version '3.18' apply(false)
+                id 'com.gradle.develocity' version '3.18.1' apply(false)
             }
             gradle.settingsEvaluated {
                 apply plugin: 'com.gradle.develocity'

sources/test/jest/gradle-version.test.ts

@@ -0,0 +1,104 @@
+import { describe } from 'node:test'
+import { versionIsAtLeast, parseGradleVersionFromOutput } from '../../src/execution/gradle'
+
+describe('gradle', () => {
+    describe('can compare version with', () => {
+        it('same version', async () => {
+            expect(versionIsAtLeast('6.7.1', '6.7.1')).toBe(true)
+            expect(versionIsAtLeast('7.0', '7.0')).toBe(true)
+            expect(versionIsAtLeast('7.0', '7.0.0')).toBe(true)
+        })
+        it('newer version', async () => {
+            expect(versionIsAtLeast('6.7.1', '6.7.2')).toBe(false)
+            expect(versionIsAtLeast('7.0', '8.0')).toBe(false)
+            expect(versionIsAtLeast('7.0', '7.0.1')).toBe(false)
+        })
+        it('older version', async () => {
+            expect(versionIsAtLeast('6.7.2', '6.7.1')).toBe(true)
+            expect(versionIsAtLeast('8.0', '7.0')).toBe(true)
+            expect(versionIsAtLeast('7.0.1', '7.0')).toBe(true)
+        })
+        it('rc version', async () => {
+            expect(versionIsAtLeast('8.0.2-rc-1', '8.0.1')).toBe(true)
+            expect(versionIsAtLeast('8.0.2-rc-1', '8.0.2')).toBe(false)
+            expect(versionIsAtLeast('8.1-rc-1', '8.0')).toBe(true)
+            expect(versionIsAtLeast('8.0-rc-1', '8.0')).toBe(false)
+        })
+        it('snapshot version', async () => {
+            expect(versionIsAtLeast('8.11-20240829002031+0000', '8.10')).toBe(true)
+            expect(versionIsAtLeast('8.11-20240829002031+0000', '8.10.1')).toBe(true)
+            expect(versionIsAtLeast('8.11-20240829002031+0000', '8.11')).toBe(false)
+
+            expect(versionIsAtLeast('8.10.2-20240828012138+0000', '8.10')).toBe(true)
+            expect(versionIsAtLeast('8.10.2-20240828012138+0000', '8.10.1')).toBe(true)
+            expect(versionIsAtLeast('8.10.2-20240828012138+0000', '8.10.2')).toBe(false)
+            expect(versionIsAtLeast('8.10.2-20240828012138+0000', '8.11')).toBe(false)
+
+            expect(versionIsAtLeast('9.1-branch-provider_api_migration_public_api_changes-20240826121451+0000', '9.0')).toBe(true)
+            expect(versionIsAtLeast('9.1-branch-provider_api_migration_public_api_changes-20240826121451+0000', '9.0.1')).toBe(true)
+            expect(versionIsAtLeast('9.1-branch-provider_api_migration_public_api_changes-20240826121451+0000', '9.1')).toBe(false)
+        })
+    })
+    describe('can parse version from output', () => {
+        it('major version', async () => {
+            const output = `
+    ------------------------------------------------------------
+    Gradle 8.9
+    ------------------------------------------------------------
+    `
+            const version = await parseGradleVersionFromOutput(output)!
+            expect(version).toBe('8.9')
+        })
+    
+        it('patch version', async () => {
+            const output = `
+    ------------------------------------------------------------
+    Gradle 8.9.1
+    ------------------------------------------------------------
+    `
+            const version = await parseGradleVersionFromOutput(output)!
+            expect(version).toBe('8.9.1')
+        })
+    
+        it('rc version', async () => {
+            const output = `
+    ------------------------------------------------------------
+    Gradle 8.9-rc-1
+    ------------------------------------------------------------
+    `
+            const version = await parseGradleVersionFromOutput(output)!
+            expect(version).toBe('8.9-rc-1')
+        })
+    
+        it('milestone version', async () => {
+            const output = `
+    ------------------------------------------------------------
+    Gradle 8.0-milestone-6
+    ------------------------------------------------------------
+    `
+            const version = await parseGradleVersionFromOutput(output)!
+            expect(version).toBe('8.0-milestone-6')
+        })
+    
+        it('snapshot version', async () => {
+            const output = `
+    ------------------------------------------------------------
+    Gradle 8.10.2-20240828012138+0000
+    ------------------------------------------------------------
+    `
+            const version = await parseGradleVersionFromOutput(output)!
+            expect(version).toBe('8.10.2-20240828012138+0000')
+        })
+    
+        it('branch version', async () => {
+            const output = `
+    ------------------------------------------------------------
+    Gradle 9.0-branch-provider_api_migration_public_api_changes-20240830060514+0000
+    ------------------------------------------------------------
+    `
+            const version = await parseGradleVersionFromOutput(output)!
+            expect(version).toBe('9.0-branch-provider_api_migration_public_api_changes-20240830060514+0000')
+        })
+    })
+})
+

sources/test/jest/short-lived-token.test.ts

@@ -114,4 +114,14 @@ describe('short lived tokens', () => {
             .resolves
             .toBeNull()
     })
+
+    it('get short lived token with custom expiry', async () => {
+        nock('https://dev')
+            .post('/api/auth/token?expiresInHours=4')
+            .reply(200, 'token')
+        expect.assertions(1)
+        await expect(getToken('dev=key1', '4'))
+            .resolves
+            .toEqual({"keys": [{"hostname": "dev", "key": "token"}]})
+    })
 })