[bot] Update dist directory

dist/dependency-submission/main/index.js

@@ -181713,6 +181713,7 @@ const fs_1 = __importDefault(__nccwpck_require__(79896));
 const path_1 = __importDefault(__nccwpck_require__(16928));
 const provisioner = __importStar(__nccwpck_require__(7145));
 const gradle_1 = __nccwpck_require__(93439);
+const gradlew_1 = __nccwpck_require__(46186);
 class CacheCleaner {
     constructor(gradleUserHome, tmpDir) {
         this.gradleUserHome = gradleUserHome;
@@ -181732,13 +181733,26 @@ class CacheCleaner {
         const preferredVersion = buildResults.highestGradleVersion();
         if (preferredVersion && (0, gradle_1.versionIsAtLeast)(preferredVersion, '8.11')) {
             try {
-                return await provisioner.provisionGradleAtLeast(preferredVersion);
+                const wrapperScripts = buildResults.results
+                    .map(result => this.findGradleWrapperScript(result))
+                    .filter(Boolean);
+                return await provisioner.provisionGradleWithVersionAtLeast(preferredVersion, wrapperScripts);
             }
             catch (e) {
                 core.info(`Failed to provision Gradle ${preferredVersion} for cache cleanup. Falling back to default version.`);
             }
         }
-        return await provisioner.provisionGradleAtLeast('8.11');
+        return await provisioner.provisionGradleWithVersionAtLeast('8.11');
+    }
+    findGradleWrapperScript(result) {
+        try {
+            const wrapperScript = (0, gradlew_1.gradleWrapperScript)(result.rootProjectDir);
+            return path_1.default.resolve(result.rootProjectDir, wrapperScript);
+        }
+        catch (error) {
+            core.debug(`No Gradle Wrapper found for ${result.rootProjectName}: ${error}`);
+            return null;
+        }
     }
     async forceCleanupFilesOlderThan(cleanTimestamp, executable) {
         const cleanupProjectDir = path_1.default.resolve(this.tmpDir, 'dummy-cleanup-project');
@@ -184351,7 +184365,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.provisionAndMaybeExecute = provisionAndMaybeExecute;
 exports.versionIsAtLeast = versionIsAtLeast;
-exports.findGradleVersionOnPath = findGradleVersionOnPath;
+exports.findGradleExecutableOnPath = findGradleExecutableOnPath;
+exports.determineGradleVersion = determineGradleVersion;
 exports.parseGradleVersionFromOutput = parseGradleVersionFromOutput;
 const core = __importStar(__nccwpck_require__(37484));
 const exec = __importStar(__nccwpck_require__(95236));
@@ -184406,26 +184421,18 @@ function versionIsAtLeast(actualVersion, requiredVersion) {
     }
     return true;
 }
-async function findGradleVersionOnPath() {
+async function findGradleExecutableOnPath() {
-    const gradleExecutable = await (0, which_1.default)('gradle', { nothrow: true });
+    return await (0, which_1.default)('gradle', { nothrow: true });
-    if (gradleExecutable) {
+}
-        const output = await exec.getExecOutput(gradleExecutable, ['-v'], { silent: true });
+async function determineGradleVersion(gradleExecutable) {
-        const version = parseGradleVersionFromOutput(output.stdout);
+    const output = await exec.getExecOutput(gradleExecutable, ['-v'], { silent: true });
-        return version ? new GradleExecutable(version, gradleExecutable) : undefined;
+    return parseGradleVersionFromOutput(output.stdout);
-    }
-    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;
-    }
-}
 class GradleVersion {
     constructor(version) {
         this.version = version;
@@ -184567,7 +184574,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.provisionGradle = provisionGradle;
-exports.provisionGradleAtLeast = provisionGradleAtLeast;
+exports.provisionGradleWithVersionAtLeast = provisionGradleWithVersionAtLeast;
 const fs = __importStar(__nccwpck_require__(79896));
 const os = __importStar(__nccwpck_require__(70857));
 const path = __importStar(__nccwpck_require__(16928));
@@ -184586,10 +184593,6 @@ 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;
@@ -184651,22 +184654,29 @@ async function findGradleVersionDeclaration(version) {
 }
 async function installGradleVersion(versionInfo) {
     return core.group(`Provision Gradle ${versionInfo.version}`, async () => {
-        const gradleOnPath = await (0, gradle_1.findGradleVersionOnPath)();
+        const gradleOnPath = await (0, gradle_1.findGradleExecutableOnPath)();
-        if (gradleOnPath?.version === versionInfo.version) {
+        if (gradleOnPath) {
-            core.info(`Gradle version ${versionInfo.version} is already available on PATH. Not installing.`);
+            const gradleOnPathVersion = await (0, gradle_1.determineGradleVersion)(gradleOnPath);
-            return gradleOnPath.executable;
+            if (gradleOnPathVersion === versionInfo.version) {
+                core.info(`Gradle version ${versionInfo.version} is already available on PATH. Not installing.`);
+                return gradleOnPath;
+            }
         }
         return locateGradleAndDownloadIfRequired(versionInfo);
     });
 }
-async function installGradleVersionAtLeast(versionInfo) {
+async function provisionGradleWithVersionAtLeast(minimumVersion, candidates = []) {
-    return core.group(`Provision Gradle >= ${versionInfo.version}`, async () => {
+    const gradleOnPath = await (0, gradle_1.findGradleExecutableOnPath)();
-        const gradleOnPath = await (0, gradle_1.findGradleVersionOnPath)();
+    const allCandidates = gradleOnPath ? [gradleOnPath, ...candidates] : candidates;
-        if (gradleOnPath && (0, gradle_1.versionIsAtLeast)(gradleOnPath.version, versionInfo.version)) {
+    return core.group(`Provision Gradle >= ${minimumVersion}`, async () => {
-            core.info(`Gradle version ${gradleOnPath.version} is available on PATH and >= ${versionInfo.version}. Not installing.`);
+        for (const candidate of allCandidates) {
-            return gradleOnPath.executable;
+            const candidateVersion = await (0, gradle_1.determineGradleVersion)(candidate);
+            if (candidateVersion && (0, gradle_1.versionIsAtLeast)(candidateVersion, minimumVersion)) {
+                core.info(`Gradle version ${candidateVersion} is available at ${candidate} and >= ${minimumVersion}. Not installing.`);
+                return candidate;
+            }
         }
-        return locateGradleAndDownloadIfRequired(versionInfo);
+        return locateGradleAndDownloadIfRequired(await gradleRelease(minimumVersion));
     });
 }
 async function locateGradleAndDownloadIfRequired(versionInfo) {

dist/dependency-submission/post/index.js

@@ -141959,6 +141959,7 @@ const fs_1 = __importDefault(__nccwpck_require__(79896));
 const path_1 = __importDefault(__nccwpck_require__(16928));
 const provisioner = __importStar(__nccwpck_require__(7145));
 const gradle_1 = __nccwpck_require__(93439);
+const gradlew_1 = __nccwpck_require__(46186);
 class CacheCleaner {
     constructor(gradleUserHome, tmpDir) {
         this.gradleUserHome = gradleUserHome;
@@ -141978,13 +141979,26 @@ class CacheCleaner {
         const preferredVersion = buildResults.highestGradleVersion();
         if (preferredVersion && (0, gradle_1.versionIsAtLeast)(preferredVersion, '8.11')) {
             try {
-                return await provisioner.provisionGradleAtLeast(preferredVersion);
+                const wrapperScripts = buildResults.results
+                    .map(result => this.findGradleWrapperScript(result))
+                    .filter(Boolean);
+                return await provisioner.provisionGradleWithVersionAtLeast(preferredVersion, wrapperScripts);
             }
             catch (e) {
                 core.info(`Failed to provision Gradle ${preferredVersion} for cache cleanup. Falling back to default version.`);
             }
         }
-        return await provisioner.provisionGradleAtLeast('8.11');
+        return await provisioner.provisionGradleWithVersionAtLeast('8.11');
+    }
+    findGradleWrapperScript(result) {
+        try {
+            const wrapperScript = (0, gradlew_1.gradleWrapperScript)(result.rootProjectDir);
+            return path_1.default.resolve(result.rootProjectDir, wrapperScript);
+        }
+        catch (error) {
+            core.debug(`No Gradle Wrapper found for ${result.rootProjectName}: ${error}`);
+            return null;
+        }
     }
     async forceCleanupFilesOlderThan(cleanTimestamp, executable) {
         const cleanupProjectDir = path_1.default.resolve(this.tmpDir, 'dummy-cleanup-project');
@@ -144312,7 +144326,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.provisionAndMaybeExecute = provisionAndMaybeExecute;
 exports.versionIsAtLeast = versionIsAtLeast;
-exports.findGradleVersionOnPath = findGradleVersionOnPath;
+exports.findGradleExecutableOnPath = findGradleExecutableOnPath;
+exports.determineGradleVersion = determineGradleVersion;
 exports.parseGradleVersionFromOutput = parseGradleVersionFromOutput;
 const core = __importStar(__nccwpck_require__(37484));
 const exec = __importStar(__nccwpck_require__(95236));
@@ -144367,26 +144382,18 @@ function versionIsAtLeast(actualVersion, requiredVersion) {
     }
     return true;
 }
-async function findGradleVersionOnPath() {
+async function findGradleExecutableOnPath() {
-    const gradleExecutable = await (0, which_1.default)('gradle', { nothrow: true });
+    return await (0, which_1.default)('gradle', { nothrow: true });
-    if (gradleExecutable) {
+}
-        const output = await exec.getExecOutput(gradleExecutable, ['-v'], { silent: true });
+async function determineGradleVersion(gradleExecutable) {
-        const version = parseGradleVersionFromOutput(output.stdout);
+    const output = await exec.getExecOutput(gradleExecutable, ['-v'], { silent: true });
-        return version ? new GradleExecutable(version, gradleExecutable) : undefined;
+    return parseGradleVersionFromOutput(output.stdout);
-    }
-    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;
-    }
-}
 class GradleVersion {
     constructor(version) {
         this.version = version;
@@ -144528,7 +144535,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.provisionGradle = provisionGradle;
-exports.provisionGradleAtLeast = provisionGradleAtLeast;
+exports.provisionGradleWithVersionAtLeast = provisionGradleWithVersionAtLeast;
 const fs = __importStar(__nccwpck_require__(79896));
 const os = __importStar(__nccwpck_require__(70857));
 const path = __importStar(__nccwpck_require__(16928));
@@ -144547,10 +144554,6 @@ 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;
@@ -144612,22 +144615,29 @@ async function findGradleVersionDeclaration(version) {
 }
 async function installGradleVersion(versionInfo) {
     return core.group(`Provision Gradle ${versionInfo.version}`, async () => {
-        const gradleOnPath = await (0, gradle_1.findGradleVersionOnPath)();
+        const gradleOnPath = await (0, gradle_1.findGradleExecutableOnPath)();
-        if (gradleOnPath?.version === versionInfo.version) {
+        if (gradleOnPath) {
-            core.info(`Gradle version ${versionInfo.version} is already available on PATH. Not installing.`);
+            const gradleOnPathVersion = await (0, gradle_1.determineGradleVersion)(gradleOnPath);
-            return gradleOnPath.executable;
+            if (gradleOnPathVersion === versionInfo.version) {
+                core.info(`Gradle version ${versionInfo.version} is already available on PATH. Not installing.`);
+                return gradleOnPath;
+            }
         }
         return locateGradleAndDownloadIfRequired(versionInfo);
     });
 }
-async function installGradleVersionAtLeast(versionInfo) {
+async function provisionGradleWithVersionAtLeast(minimumVersion, candidates = []) {
-    return core.group(`Provision Gradle >= ${versionInfo.version}`, async () => {
+    const gradleOnPath = await (0, gradle_1.findGradleExecutableOnPath)();
-        const gradleOnPath = await (0, gradle_1.findGradleVersionOnPath)();
+    const allCandidates = gradleOnPath ? [gradleOnPath, ...candidates] : candidates;
-        if (gradleOnPath && (0, gradle_1.versionIsAtLeast)(gradleOnPath.version, versionInfo.version)) {
+    return core.group(`Provision Gradle >= ${minimumVersion}`, async () => {
-            core.info(`Gradle version ${gradleOnPath.version} is available on PATH and >= ${versionInfo.version}. Not installing.`);
+        for (const candidate of allCandidates) {
-            return gradleOnPath.executable;
+            const candidateVersion = await (0, gradle_1.determineGradleVersion)(candidate);
+            if (candidateVersion && (0, gradle_1.versionIsAtLeast)(candidateVersion, minimumVersion)) {
+                core.info(`Gradle version ${candidateVersion} is available at ${candidate} and >= ${minimumVersion}. Not installing.`);
+                return candidate;
+            }
         }
-        return locateGradleAndDownloadIfRequired(versionInfo);
+        return locateGradleAndDownloadIfRequired(await gradleRelease(minimumVersion));
     });
 }
 async function locateGradleAndDownloadIfRequired(versionInfo) {

dist/setup-gradle/main/index.js

@@ -181698,6 +181698,7 @@ const fs_1 = __importDefault(__nccwpck_require__(79896));
 const path_1 = __importDefault(__nccwpck_require__(16928));
 const provisioner = __importStar(__nccwpck_require__(7145));
 const gradle_1 = __nccwpck_require__(93439);
+const gradlew_1 = __nccwpck_require__(46186);
 class CacheCleaner {
     constructor(gradleUserHome, tmpDir) {
         this.gradleUserHome = gradleUserHome;
@@ -181717,13 +181718,26 @@ class CacheCleaner {
         const preferredVersion = buildResults.highestGradleVersion();
         if (preferredVersion && (0, gradle_1.versionIsAtLeast)(preferredVersion, '8.11')) {
             try {
-                return await provisioner.provisionGradleAtLeast(preferredVersion);
+                const wrapperScripts = buildResults.results
+                    .map(result => this.findGradleWrapperScript(result))
+                    .filter(Boolean);
+                return await provisioner.provisionGradleWithVersionAtLeast(preferredVersion, wrapperScripts);
             }
             catch (e) {
                 core.info(`Failed to provision Gradle ${preferredVersion} for cache cleanup. Falling back to default version.`);
             }
         }
-        return await provisioner.provisionGradleAtLeast('8.11');
+        return await provisioner.provisionGradleWithVersionAtLeast('8.11');
+    }
+    findGradleWrapperScript(result) {
+        try {
+            const wrapperScript = (0, gradlew_1.gradleWrapperScript)(result.rootProjectDir);
+            return path_1.default.resolve(result.rootProjectDir, wrapperScript);
+        }
+        catch (error) {
+            core.debug(`No Gradle Wrapper found for ${result.rootProjectName}: ${error}`);
+            return null;
+        }
     }
     async forceCleanupFilesOlderThan(cleanTimestamp, executable) {
         const cleanupProjectDir = path_1.default.resolve(this.tmpDir, 'dummy-cleanup-project');
@@ -184336,7 +184350,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.provisionAndMaybeExecute = provisionAndMaybeExecute;
 exports.versionIsAtLeast = versionIsAtLeast;
-exports.findGradleVersionOnPath = findGradleVersionOnPath;
+exports.findGradleExecutableOnPath = findGradleExecutableOnPath;
+exports.determineGradleVersion = determineGradleVersion;
 exports.parseGradleVersionFromOutput = parseGradleVersionFromOutput;
 const core = __importStar(__nccwpck_require__(37484));
 const exec = __importStar(__nccwpck_require__(95236));
@@ -184391,26 +184406,18 @@ function versionIsAtLeast(actualVersion, requiredVersion) {
     }
     return true;
 }
-async function findGradleVersionOnPath() {
+async function findGradleExecutableOnPath() {
-    const gradleExecutable = await (0, which_1.default)('gradle', { nothrow: true });
+    return await (0, which_1.default)('gradle', { nothrow: true });
-    if (gradleExecutable) {
+}
-        const output = await exec.getExecOutput(gradleExecutable, ['-v'], { silent: true });
+async function determineGradleVersion(gradleExecutable) {
-        const version = parseGradleVersionFromOutput(output.stdout);
+    const output = await exec.getExecOutput(gradleExecutable, ['-v'], { silent: true });
-        return version ? new GradleExecutable(version, gradleExecutable) : undefined;
+    return parseGradleVersionFromOutput(output.stdout);
-    }
-    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;
-    }
-}
 class GradleVersion {
     constructor(version) {
         this.version = version;
@@ -184552,7 +184559,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.provisionGradle = provisionGradle;
-exports.provisionGradleAtLeast = provisionGradleAtLeast;
+exports.provisionGradleWithVersionAtLeast = provisionGradleWithVersionAtLeast;
 const fs = __importStar(__nccwpck_require__(79896));
 const os = __importStar(__nccwpck_require__(70857));
 const path = __importStar(__nccwpck_require__(16928));
@@ -184571,10 +184578,6 @@ 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;
@@ -184636,22 +184639,29 @@ async function findGradleVersionDeclaration(version) {
 }
 async function installGradleVersion(versionInfo) {
     return core.group(`Provision Gradle ${versionInfo.version}`, async () => {
-        const gradleOnPath = await (0, gradle_1.findGradleVersionOnPath)();
+        const gradleOnPath = await (0, gradle_1.findGradleExecutableOnPath)();
-        if (gradleOnPath?.version === versionInfo.version) {
+        if (gradleOnPath) {
-            core.info(`Gradle version ${versionInfo.version} is already available on PATH. Not installing.`);
+            const gradleOnPathVersion = await (0, gradle_1.determineGradleVersion)(gradleOnPath);
-            return gradleOnPath.executable;
+            if (gradleOnPathVersion === versionInfo.version) {
+                core.info(`Gradle version ${versionInfo.version} is already available on PATH. Not installing.`);
+                return gradleOnPath;
+            }
         }
         return locateGradleAndDownloadIfRequired(versionInfo);
     });
 }
-async function installGradleVersionAtLeast(versionInfo) {
+async function provisionGradleWithVersionAtLeast(minimumVersion, candidates = []) {
-    return core.group(`Provision Gradle >= ${versionInfo.version}`, async () => {
+    const gradleOnPath = await (0, gradle_1.findGradleExecutableOnPath)();
-        const gradleOnPath = await (0, gradle_1.findGradleVersionOnPath)();
+    const allCandidates = gradleOnPath ? [gradleOnPath, ...candidates] : candidates;
-        if (gradleOnPath && (0, gradle_1.versionIsAtLeast)(gradleOnPath.version, versionInfo.version)) {
+    return core.group(`Provision Gradle >= ${minimumVersion}`, async () => {
-            core.info(`Gradle version ${gradleOnPath.version} is available on PATH and >= ${versionInfo.version}. Not installing.`);
+        for (const candidate of allCandidates) {
-            return gradleOnPath.executable;
+            const candidateVersion = await (0, gradle_1.determineGradleVersion)(candidate);
+            if (candidateVersion && (0, gradle_1.versionIsAtLeast)(candidateVersion, minimumVersion)) {
+                core.info(`Gradle version ${candidateVersion} is available at ${candidate} and >= ${minimumVersion}. Not installing.`);
+                return candidate;
+            }
         }
-        return locateGradleAndDownloadIfRequired(versionInfo);
+        return locateGradleAndDownloadIfRequired(await gradleRelease(minimumVersion));
     });
 }
 async function locateGradleAndDownloadIfRequired(versionInfo) {

dist/setup-gradle/post/index.js

@@ -181693,6 +181693,7 @@ const fs_1 = __importDefault(__nccwpck_require__(79896));
 const path_1 = __importDefault(__nccwpck_require__(16928));
 const provisioner = __importStar(__nccwpck_require__(7145));
 const gradle_1 = __nccwpck_require__(93439);
+const gradlew_1 = __nccwpck_require__(46186);
 class CacheCleaner {
     constructor(gradleUserHome, tmpDir) {
         this.gradleUserHome = gradleUserHome;
@@ -181712,13 +181713,26 @@ class CacheCleaner {
         const preferredVersion = buildResults.highestGradleVersion();
         if (preferredVersion && (0, gradle_1.versionIsAtLeast)(preferredVersion, '8.11')) {
             try {
-                return await provisioner.provisionGradleAtLeast(preferredVersion);
+                const wrapperScripts = buildResults.results
+                    .map(result => this.findGradleWrapperScript(result))
+                    .filter(Boolean);
+                return await provisioner.provisionGradleWithVersionAtLeast(preferredVersion, wrapperScripts);
             }
             catch (e) {
                 core.info(`Failed to provision Gradle ${preferredVersion} for cache cleanup. Falling back to default version.`);
             }
         }
-        return await provisioner.provisionGradleAtLeast('8.11');
+        return await provisioner.provisionGradleWithVersionAtLeast('8.11');
+    }
+    findGradleWrapperScript(result) {
+        try {
+            const wrapperScript = (0, gradlew_1.gradleWrapperScript)(result.rootProjectDir);
+            return path_1.default.resolve(result.rootProjectDir, wrapperScript);
+        }
+        catch (error) {
+            core.debug(`No Gradle Wrapper found for ${result.rootProjectName}: ${error}`);
+            return null;
+        }
     }
     async forceCleanupFilesOlderThan(cleanTimestamp, executable) {
         const cleanupProjectDir = path_1.default.resolve(this.tmpDir, 'dummy-cleanup-project');
@@ -184331,7 +184345,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.provisionAndMaybeExecute = provisionAndMaybeExecute;
 exports.versionIsAtLeast = versionIsAtLeast;
-exports.findGradleVersionOnPath = findGradleVersionOnPath;
+exports.findGradleExecutableOnPath = findGradleExecutableOnPath;
+exports.determineGradleVersion = determineGradleVersion;
 exports.parseGradleVersionFromOutput = parseGradleVersionFromOutput;
 const core = __importStar(__nccwpck_require__(37484));
 const exec = __importStar(__nccwpck_require__(95236));
@@ -184386,26 +184401,18 @@ function versionIsAtLeast(actualVersion, requiredVersion) {
     }
     return true;
 }
-async function findGradleVersionOnPath() {
+async function findGradleExecutableOnPath() {
-    const gradleExecutable = await (0, which_1.default)('gradle', { nothrow: true });
+    return await (0, which_1.default)('gradle', { nothrow: true });
-    if (gradleExecutable) {
+}
-        const output = await exec.getExecOutput(gradleExecutable, ['-v'], { silent: true });
+async function determineGradleVersion(gradleExecutable) {
-        const version = parseGradleVersionFromOutput(output.stdout);
+    const output = await exec.getExecOutput(gradleExecutable, ['-v'], { silent: true });
-        return version ? new GradleExecutable(version, gradleExecutable) : undefined;
+    return parseGradleVersionFromOutput(output.stdout);
-    }
-    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;
-    }
-}
 class GradleVersion {
     constructor(version) {
         this.version = version;
@@ -184547,7 +184554,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.provisionGradle = provisionGradle;
-exports.provisionGradleAtLeast = provisionGradleAtLeast;
+exports.provisionGradleWithVersionAtLeast = provisionGradleWithVersionAtLeast;
 const fs = __importStar(__nccwpck_require__(79896));
 const os = __importStar(__nccwpck_require__(70857));
 const path = __importStar(__nccwpck_require__(16928));
@@ -184566,10 +184573,6 @@ 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;
@@ -184631,22 +184634,29 @@ async function findGradleVersionDeclaration(version) {
 }
 async function installGradleVersion(versionInfo) {
     return core.group(`Provision Gradle ${versionInfo.version}`, async () => {
-        const gradleOnPath = await (0, gradle_1.findGradleVersionOnPath)();
+        const gradleOnPath = await (0, gradle_1.findGradleExecutableOnPath)();
-        if (gradleOnPath?.version === versionInfo.version) {
+        if (gradleOnPath) {
-            core.info(`Gradle version ${versionInfo.version} is already available on PATH. Not installing.`);
+            const gradleOnPathVersion = await (0, gradle_1.determineGradleVersion)(gradleOnPath);
-            return gradleOnPath.executable;
+            if (gradleOnPathVersion === versionInfo.version) {
+                core.info(`Gradle version ${versionInfo.version} is already available on PATH. Not installing.`);
+                return gradleOnPath;
+            }
         }
         return locateGradleAndDownloadIfRequired(versionInfo);
     });
 }
-async function installGradleVersionAtLeast(versionInfo) {
+async function provisionGradleWithVersionAtLeast(minimumVersion, candidates = []) {
-    return core.group(`Provision Gradle >= ${versionInfo.version}`, async () => {
+    const gradleOnPath = await (0, gradle_1.findGradleExecutableOnPath)();
-        const gradleOnPath = await (0, gradle_1.findGradleVersionOnPath)();
+    const allCandidates = gradleOnPath ? [gradleOnPath, ...candidates] : candidates;
-        if (gradleOnPath && (0, gradle_1.versionIsAtLeast)(gradleOnPath.version, versionInfo.version)) {
+    return core.group(`Provision Gradle >= ${minimumVersion}`, async () => {
-            core.info(`Gradle version ${gradleOnPath.version} is available on PATH and >= ${versionInfo.version}. Not installing.`);
+        for (const candidate of allCandidates) {
-            return gradleOnPath.executable;
+            const candidateVersion = await (0, gradle_1.determineGradleVersion)(candidate);
+            if (candidateVersion && (0, gradle_1.versionIsAtLeast)(candidateVersion, minimumVersion)) {
+                core.info(`Gradle version ${candidateVersion} is available at ${candidate} and >= ${minimumVersion}. Not installing.`);
+                return candidate;
+            }
         }
-        return locateGradleAndDownloadIfRequired(versionInfo);
+        return locateGradleAndDownloadIfRequired(await gradleRelease(minimumVersion));
     });
 }
 async function locateGradleAndDownloadIfRequired(versionInfo) {