@nx/gradle 22.1.0-canary.20251023-59cf495 → 22.1.0-canary.20251024-7712d2a

package/src/executors/gradle/gradle-batch.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gradle-batch.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/executors/gradle/gradle-batch.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEf,uBAAuB,EACvB,SAAS,EAEV,MAAM,YAAY,CAAC;AACpB,OAAO,EAEL,kBAAkB,EACnB,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAchD,eAAO,MAAM,eAAe,QAG3B,CAAC;AAEF,wBAA8B,WAAW,CACvC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC5C,SAAS,EAAE,kBAAkB,EAC7B,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,YAAY,CAAC,CA2DvB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EAAE,EACjB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC5C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC;;;;EAoD/C"}
+{"version":3,"file":"gradle-batch.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/executors/gradle/gradle-batch.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEf,uBAAuB,EACvB,SAAS,EAEV,MAAM,YAAY,CAAC;AACpB,OAAO,EAEL,kBAAkB,EACnB,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAkBhD,eAAO,MAAM,eAAe,QAG3B,CAAC;AAEF,wBAA8B,WAAW,CACvC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC5C,SAAS,EAAE,kBAAkB,EAC7B,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,YAAY,CAAC,CAkEvB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EAAE,EACjB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC5C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC;;;;EAoD/C"}

package/src/executors/gradle/gradle-batch.impl.js

@@ -15,7 +15,8 @@ async function gradleBatch(taskGraph, inputs, overrides, context) {
     try {
         const projectName = taskGraph.tasks[taskGraph.roots[0]]?.target?.project;
         let projectRoot = context.projectGraph.nodes[projectName]?.data?.root ?? '';
-        let gradlewPath = (0, exec_gradle_1.findGradlewFile)((0, path_1.join)(projectRoot, 'project.json')); // find gradlew near project root
+        const customGradleExecutableDirectory = (0, exec_gradle_1.getCustomGradleExecutableDirectoryFromPlugin)(context.nxJsonConfiguration);
+        let gradlewPath = (0, exec_gradle_1.findGradlewFile)((0, path_1.join)(projectRoot, 'project.json'), devkit_1.workspaceRoot, customGradleExecutableDirectory); // find gradlew near project root
         gradlewPath = (0, path_1.join)(context.root, gradlewPath);
         const root = (0, path_1.dirname)(gradlewPath);
         // set args with passed in args and overrides in command line

package/src/executors/gradle/gradle.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gradle.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/executors/gradle/gradle.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAMhD,wBAA8B,cAAc,CAC1C,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA6D/B"}
+{"version":3,"file":"gradle.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/executors/gradle/gradle.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAiB,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAShD,wBAA8B,cAAc,CAC1C,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAoE/B"}

package/src/executors/gradle/gradle.impl.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = gradleExecutor;
+const devkit_1 = require("@nx/devkit");
 const exec_gradle_1 = require("../../utils/exec-gradle");
 const node_path_1 = require("node:path");
 const run_commands_impl_1 = require("nx/src/executors/run-commands/run-commands.impl");
 const get_exclude_task_1 = require("./get-exclude-task");
 async function gradleExecutor(options, context) {
     let projectRoot = context.projectGraph.nodes[context.projectName]?.data?.root ?? context.root;
-    let gradlewPath = (0, exec_gradle_1.findGradlewFile)((0, node_path_1.join)(projectRoot, 'project.json')); // find gradlew near project root
+    const customGradleExecutableDirectory = (0, exec_gradle_1.getCustomGradleExecutableDirectoryFromPlugin)(context.nxJsonConfiguration);
+    let gradlewPath = (0, exec_gradle_1.findGradlewFile)((0, node_path_1.join)(projectRoot, 'project.json'), devkit_1.workspaceRoot, customGradleExecutableDirectory); // find gradlew near project root
     gradlewPath = (0, node_path_1.join)(context.root, gradlewPath);
     let args = typeof options.args === 'string'
         ? options.args.trim().split(' ')

package/src/generators/init/gradle-project-graph-plugin-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gradle-project-graph-plugin-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/generators/init/gradle-project-graph-plugin-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,IAAI,EAAiB,MAAM,YAAY,CAAC;AAQpE;;;GAGG;AACH,wBAAsB,sCAAsC,CAC1D,IAAI,EAAE,IAAI,GACT,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,CASlD;AA8BD;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAgBxB;AAkBD;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,MAAM,CASR;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,eAAe,GAAE,MAAkC,iBAYpD"}
+{"version":3,"file":"gradle-project-graph-plugin-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/generators/init/gradle-project-graph-plugin-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,IAAI,EAAiB,MAAM,YAAY,CAAC;AAQpE;;;GAGG;AACH,wBAAsB,sCAAsC,CAC1D,IAAI,EAAE,IAAI,GACT,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,CASlD;AA8BD;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAoBxB;AAkBD;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,MAAM,CASR;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,eAAe,GAAE,MAAkC,iBAYpD"}

package/src/generators/init/gradle-project-graph-plugin-utils.js

@@ -47,7 +47,7 @@ async function extractNxPluginVersion(gradleFilePath, gradleContent) {
     let version = match ? match[2] : null;
     if (!version) {
         try {
-            const gradlewFile = (0, exec_gradle_1.findGradlewFile)(gradleFilePath, devkit_1.workspaceRoot);
+            const gradlewFile = (0, exec_gradle_1.findGradlewFile)(gradleFilePath, devkit_1.workspaceRoot, undefined);
             const buildEnvironment = (await (0, exec_gradle_1.execGradleAsync)((0, path_1.join)(devkit_1.workspaceRoot, gradlewFile), [
                 'buildEnvironment',
                 '--quiet',

package/src/plugin/utils/get-project-graph-from-gradle-plugin.d.ts

@@ -21,6 +21,7 @@ export declare function getCurrentBuildFiles(): string[];
  * It will accumulate the output of all gradlew files.
  * @param workspaceRoot
  * @param gradlewFiles absolute paths to all gradlew files in the workspace
+ * @param options user specified gradle plugin options
  * @returns Promise<void>
  */
 export declare function populateProjectGraph(workspaceRoot: string, gradlewFiles: string[], options: GradlePluginOptions): Promise<void>;

package/src/plugin/utils/get-project-graph-from-gradle-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-project-graph-from-gradle-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/plugin/utils/get-project-graph-from-gradle-plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,oBAAoB,EACpB,wBAAwB,EAExB,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAI9D,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE;QACL,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;KAClD,CAAC;IACF,YAAY,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACtC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IACzD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,uBAAwB,SAAQ,kBAAkB;IACjE,IAAI,EAAE,MAAM,CAAC;CACd;AAiBD,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,kBAAkB,QAQ5B;AASD,wBAAgB,4BAA4B,IAAI,kBAAkB,CAejE;AAED,wBAAgB,oBAAoB,IAAI,MAAM,EAAE,CAG/C;AAED;;;;;;;;GAQG;AACH,wBAAsB,oBAAoB,CACxC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CA8Df;AAED,wBAAgB,qBAAqB,CACnC,iBAAiB,EAAE,MAAM,EAAE,GAC1B,kBAAkB,CAiDpB"}
+{"version":3,"file":"get-project-graph-from-gradle-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/plugin/utils/get-project-graph-from-gradle-plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,oBAAoB,EACpB,wBAAwB,EAExB,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAI9D,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE;QACL,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;KAClD,CAAC;IACF,YAAY,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACtC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IACzD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,uBAAwB,SAAQ,kBAAkB;IACjE,IAAI,EAAE,MAAM,CAAC;CACd;AAiBD,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,kBAAkB,QAQ5B;AASD,wBAAgB,4BAA4B,IAAI,kBAAkB,CAejE;AAED,wBAAgB,oBAAoB,IAAI,MAAM,EAAE,CAG/C;AAED;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CA8Df;AAED,wBAAgB,qBAAqB,CACnC,iBAAiB,EAAE,MAAM,EAAE,GAC1B,kBAAkB,CAiDpB"}

package/src/plugin/utils/get-project-graph-from-gradle-plugin.js

@@ -54,6 +54,7 @@ function getCurrentBuildFiles() {
  * It will accumulate the output of all gradlew files.
  * @param workspaceRoot
  * @param gradlewFiles absolute paths to all gradlew files in the workspace
+ * @param options user specified gradle plugin options
  * @returns Promise<void>
  */
 async function populateProjectGraph(workspaceRoot, gradlewFiles, options) {

package/src/plugin/utils/gradle-plugin-options.d.ts

@@ -1,6 +1,7 @@
 export interface GradlePluginOptions {
     testTargetName?: string;
     ciTestTargetName?: string;
+    gradleExecutableDirectory?: string;
     [taskTargetName: string]: string | undefined | boolean;
 }
 export declare function normalizeOptions(options: GradlePluginOptions): GradlePluginOptions;

package/src/plugin/utils/gradle-plugin-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gradle-plugin-options.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/plugin/utils/gradle-plugin-options.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;CACxD;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,mBAAmB,GAC3B,mBAAmB,CAIrB"}
+{"version":3,"file":"gradle-plugin-options.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/plugin/utils/gradle-plugin-options.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;CACxD;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,mBAAmB,GAC3B,mBAAmB,CAIrB"}

package/src/utils/exec-gradle.d.ts

@@ -1,3 +1,4 @@
+import { NxJsonConfiguration } from '@nx/devkit';
 import { ExecFileOptions } from 'node:child_process';
 export declare const fileSeparator: string;
 export declare const newLineSeparator: string;
@@ -14,13 +15,16 @@ export declare function getGradleExecFile(): string;
  * @returns promise with the stdout buffer
  */
 export declare function execGradleAsync(gradleBinaryPath: string, args: ReadonlyArray<string>, execOptions?: ExecFileOptions): Promise<Buffer>;
+export declare function getCustomGradleExecutableDirectoryFromPlugin(nxJson: NxJsonConfiguration): string | undefined;
 /**
  * This function recursively finds the nearest gradlew file in the workspace
- * @param originalFileToSearch the original file to search for, relative to workspace root, file path not directory path
- * @param wr workspace root
- * @param currentSearchPath the path to start searching for gradlew file
+ * @param filePathToSearch the original file to search for, relative to workspace root, file path not directory path
+ * @param workspaceRoot workspace root
+ * @param customExecutableDirectory a custom directory to search for the gradle wrapper file
  * @returns the relative path of the gradlew file to workspace root, throws an error if gradlew file is not found
  * It will return relative path to workspace root of gradlew.bat file on windows and gradlew file on other platforms
  */
-export declare function findGradlewFile(originalFileToSearch: string, wr?: string, currentSearchPath?: string): string;
+export declare function findGradlewFile(filePathToSearch: string, workspaceRoot: string, customExecutableDirectory?: string): string;
+export declare function findGradlewUsingFilePathTraversal(filePathToSearch: string, workspaceRoot: string, currentSearchPath?: string): string;
+export declare function findGradlewUsingCustomExecutableDirectory(customGradleExecutableDirectory: string, workspaceRoot: string): string;
 //# sourceMappingURL=exec-gradle.d.ts.map

package/src/utils/exec-gradle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exec-gradle.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/utils/exec-gradle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAY,MAAM,oBAAoB,CAAC;AAK/D,eAAO,MAAM,aAAa,QAEb,CAAC;AAEd,eAAO,MAAM,gBAAgB,QAErB,CAAC;AAET;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,EAC3B,WAAW,GAAE,eAAoB,GAChC,OAAO,CAAC,MAAM,CAAC,CA2BjB;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,oBAAoB,EAAE,MAAM,EAC5B,EAAE,GAAE,MAAsB,EAC1B,iBAAiB,CAAC,EAAE,MAAM,GACzB,MAAM,CA6BR"}
+{"version":3,"file":"exec-gradle.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/utils/exec-gradle.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,mBAAmB,EAEpB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,eAAe,EAAY,MAAM,oBAAoB,CAAC;AAO/D,eAAO,MAAM,aAAa,QAEb,CAAC;AAEd,eAAO,MAAM,gBAAgB,QAErB,CAAC;AAET;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,EAC3B,WAAW,GAAE,eAAoB,GAChC,OAAO,CAAC,MAAM,CAAC,CA4BjB;AAED,wBAAgB,4CAA4C,CAC1D,MAAM,EAAE,mBAAmB,GAC1B,MAAM,GAAG,SAAS,CAWpB;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,MAAM,EACrB,yBAAyB,CAAC,EAAE,MAAM,GACjC,MAAM,CASR;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,MAAM,EACrB,iBAAiB,CAAC,EAAE,MAAM,UAoC3B;AAED,wBAAgB,yCAAyC,CACvD,+BAA+B,EAAE,MAAM,EACvC,aAAa,EAAE,MAAM,UAqCtB"}

package/src/utils/exec-gradle.js

@@ -3,12 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.newLineSeparator = exports.fileSeparator = void 0;
 exports.getGradleExecFile = getGradleExecFile;
 exports.execGradleAsync = execGradleAsync;
+exports.getCustomGradleExecutableDirectoryFromPlugin = getCustomGradleExecutableDirectoryFromPlugin;
 exports.findGradlewFile = findGradlewFile;
+exports.findGradlewUsingFilePathTraversal = findGradlewUsingFilePathTraversal;
+exports.findGradlewUsingCustomExecutableDirectory = findGradlewUsingCustomExecutableDirectory;
 const devkit_1 = require("@nx/devkit");
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const run_commands_impl_1 = require("nx/src/executors/run-commands/run-commands.impl");
+const exit_codes_1 = require("nx/src/utils/exit-codes");
 exports.fileSeparator = process.platform.startsWith('win')
     ? 'file:///'
     : 'file://';
@@ -46,7 +50,9 @@ function execGradleAsync(gradleBinaryPath, args, execOptions = {}) {
         cp.stderr?.on('data', (data) => {
             stdout += data;
         });
-        cp.on('exit', (code) => {
+        cp.on('exit', (code, signal) => {
+            if (code === null)
+                code = (0, exit_codes_1.signalToCode)(signal);
             if (code === 0) {
                 res(stdout);
             }
@@ -56,36 +62,83 @@ function execGradleAsync(gradleBinaryPath, args, execOptions = {}) {
         });
     });
 }
+function getCustomGradleExecutableDirectoryFromPlugin(nxJson) {
+    const gradlePlugin = nxJson.plugins?.find((plugin) => {
+        if (typeof plugin === 'string') {
+            return plugin === '@nx/gradle';
+        }
+        return plugin.plugin === '@nx/gradle';
+    });
+    return gradlePlugin && typeof gradlePlugin !== 'string'
+        ? gradlePlugin.options?.gradleExecutableDirectory
+        : undefined;
+}
 /**
  * This function recursively finds the nearest gradlew file in the workspace
- * @param originalFileToSearch the original file to search for, relative to workspace root, file path not directory path
- * @param wr workspace root
- * @param currentSearchPath the path to start searching for gradlew file
+ * @param filePathToSearch the original file to search for, relative to workspace root, file path not directory path
+ * @param workspaceRoot workspace root
+ * @param customExecutableDirectory a custom directory to search for the gradle wrapper file
  * @returns the relative path of the gradlew file to workspace root, throws an error if gradlew file is not found
  * It will return relative path to workspace root of gradlew.bat file on windows and gradlew file on other platforms
  */
-function findGradlewFile(originalFileToSearch, wr = devkit_1.workspaceRoot, currentSearchPath) {
-    currentSearchPath ??= originalFileToSearch;
+function findGradlewFile(filePathToSearch, workspaceRoot, customExecutableDirectory) {
+    if (customExecutableDirectory) {
+        return findGradlewUsingCustomExecutableDirectory(customExecutableDirectory, workspaceRoot);
+    }
+    return findGradlewUsingFilePathTraversal(filePathToSearch, workspaceRoot);
+}
+function findGradlewUsingFilePathTraversal(filePathToSearch, workspaceRoot, currentSearchPath) {
+    currentSearchPath ??= filePathToSearch;
     const parent = (0, node_path_1.dirname)(currentSearchPath);
     if (currentSearchPath === parent) {
         throw new devkit_1.AggregateCreateNodesError([
             [
-                originalFileToSearch,
-                new Error('No Gradlew file found. Run "gradle init"'),
+                filePathToSearch,
+                new Error(`No Gradlew file found at ${filePathToSearch} or any of its parent directories. Run "gradle init"`),
             ],
         ], []);
     }
     const gradlewPath = (0, node_path_1.join)(parent, 'gradlew');
     const gradlewBatPath = (0, node_path_1.join)(parent, 'gradlew.bat');
     if (process.platform.startsWith('win')) {
-        if ((0, node_fs_1.existsSync)((0, node_path_1.join)(wr, gradlewBatPath))) {
+        if ((0, node_fs_1.existsSync)((0, node_path_1.join)(workspaceRoot, gradlewBatPath))) {
             return gradlewBatPath;
         }
     }
     else {
-        if ((0, node_fs_1.existsSync)((0, node_path_1.join)(wr, gradlewPath))) {
+        if ((0, node_fs_1.existsSync)((0, node_path_1.join)(workspaceRoot, gradlewPath))) {
             return gradlewPath;
         }
     }
-    return findGradlewFile(originalFileToSearch, wr, parent);
+    return findGradlewUsingFilePathTraversal(filePathToSearch, workspaceRoot, parent);
+}
+function findGradlewUsingCustomExecutableDirectory(customGradleExecutableDirectory, workspaceRoot) {
+    // Resolve the custom installation path - if relative, resolve against workspace root
+    const resolvedInstallationPath = (0, node_path_1.isAbsolute)(customGradleExecutableDirectory)
+        ? customGradleExecutableDirectory
+        : (0, node_path_1.join)(workspaceRoot, customGradleExecutableDirectory);
+    const customGradlewPath = (0, node_path_1.join)(resolvedInstallationPath, 'gradlew');
+    const customGradlewBatPath = (0, node_path_1.join)(resolvedInstallationPath, 'gradlew.bat');
+    if (process.platform.startsWith('win')) {
+        if ((0, node_fs_1.existsSync)(customGradlewBatPath)) {
+            // Return path relative to workspace root if it was relative, otherwise return absolute
+            return (0, node_path_1.isAbsolute)(customGradleExecutableDirectory)
+                ? customGradlewBatPath
+                : (0, node_path_1.join)(customGradleExecutableDirectory, 'gradlew.bat');
+        }
+    }
+    else {
+        if ((0, node_fs_1.existsSync)(customGradlewPath)) {
+            // Return path relative to workspace root if it was relative, otherwise return absolute
+            return (0, node_path_1.isAbsolute)(customGradleExecutableDirectory)
+                ? customGradlewPath
+                : (0, node_path_1.join)(customGradleExecutableDirectory, 'gradlew');
+        }
+    }
+    throw new devkit_1.AggregateCreateNodesError([
+        [
+            customGradleExecutableDirectory,
+            new Error(`No Gradlew file found at custom gradle executable directory. Please ensure that there is a gradle wrapper file located at ${customGradleExecutableDirectory}`),
+        ],
+    ], []);
 }

package/src/utils/versions.d.ts

@@ -1,4 +1,4 @@
 export declare const nxVersion: any;
 export declare const gradleProjectGraphPluginName = "dev.nx.gradle.project-graph";
-export declare const gradleProjectGraphVersion = "0.1.7";
+export declare const gradleProjectGraphVersion = "0.1.8";
 //# sourceMappingURL=versions.d.ts.map

package/src/utils/versions.js

@@ -3,4 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.gradleProjectGraphVersion = exports.gradleProjectGraphPluginName = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.gradleProjectGraphPluginName = 'dev.nx.gradle.project-graph';
-exports.gradleProjectGraphVersion = '0.1.7';
+exports.gradleProjectGraphVersion = '0.1.8';