@nx/gradle 23.0.0-beta.2 → 23.0.0-beta.20

package/migrations.json

@@ -131,6 +131,12 @@
       "cli": "nx",
       "description": "Change dev.nx.gradle.project-graph to version 0.1.20 in build file",
       "factory": "./src/migrations/22-7-0/change-plugin-version-0-1-20"
+    },
+    "change-plugin-version-0-1-21": {
+      "version": "23.0.0-beta.11",
+      "cli": "nx",
+      "description": "Change dev.nx.gradle.project-graph to version 0.1.21 in build file",
+      "factory": "./src/migrations/23-0-0/change-plugin-version-0-1-21"
     }
   },
   "packageJsonUpdates": {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "23.0.0-beta.2",
+  "version": "23.0.0-beta.20",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -40,13 +40,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.2",
+    "@nx/devkit": "23.0.0-beta.20",
     "toml-eslint-parser": "^0.10.0",
     "tree-kill": "^1.2.2",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.2"
+    "nx": "23.0.0-beta.20"
   },
   "publishConfig": {
     "access": "public"

package/plugin-v1.d.ts

@@ -1,3 +1,5 @@
+/** @deprecated Use `@nx/gradle` instead. This entry will be removed in Nx 24. */
 export { createDependencies } from './src/plugin-v1/dependencies';
+/** @deprecated Use `@nx/gradle` instead. This entry will be removed in Nx 24. */
 export { createNodes, createNodesV2 } from './src/plugin-v1/nodes';
 //# sourceMappingURL=plugin-v1.d.ts.map

package/plugin-v1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-v1.d.ts","sourceRoot":"","sources":["../../../packages/gradle/plugin-v1.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"plugin-v1.d.ts","sourceRoot":"","sources":["../../../packages/gradle/plugin-v1.ts"],"names":[],"mappings":"AAoBA,iFAAiF;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,iFAAiF;AACjF,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC"}

package/plugin-v1.js

@@ -1,8 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = exports.createNodes = exports.createDependencies = void 0;
+const internal_1 = require("@nx/devkit/internal");
+// TODO(v24): remove `@nx/gradle/plugin-v1` entirely. Users should be migrated
+// to `@nx/gradle` (the atomized v2 plugin) via the removal migration shipped
+// alongside the deletion.
+//
+// Use emitPluginWorkerLog so the warning surfaces to the user even when the
+// daemon is enabled — `logger.warn` would route to the daemon log file and
+// be silently swallowed. Guard against older nx versions (< 22.7) where this
+// helper may not exist; @nx/devkit supports nx at +/-1 major.
+if (typeof internal_1.emitPluginWorkerLog === 'function') {
+    (0, internal_1.emitPluginWorkerLog)('warn', '`@nx/gradle/plugin-v1` is deprecated and will be removed in Nx 24. ' +
+        'Switch your `nx.json` plugins entry from `@nx/gradle/plugin-v1` to `@nx/gradle`. ' +
+        'Note that the default `@nx/gradle` plugin generates atomized targets — ' +
+        'see https://nx.dev/nx-api/gradle for configuration options.');
+}
+/** @deprecated Use `@nx/gradle` instead. This entry will be removed in Nx 24. */
 var dependencies_1 = require("./src/plugin-v1/dependencies");
 Object.defineProperty(exports, "createDependencies", { enumerable: true, get: function () { return dependencies_1.createDependencies; } });
+/** @deprecated Use `@nx/gradle` instead. This entry will be removed in Nx 24. */
 var nodes_1 = require("./src/plugin-v1/nodes");
 Object.defineProperty(exports, "createNodes", { enumerable: true, get: function () { return nodes_1.createNodes; } });
 Object.defineProperty(exports, "createNodesV2", { enumerable: true, get: function () { return nodes_1.createNodesV2; } });

package/plugin.d.ts

@@ -1,5 +1,5 @@
 export declare const name: string;
-export declare const createNodesV2: import("packages/devkit").CreateNodesV2<import("./src/plugin/utils/gradle-plugin-options").GradlePluginOptions>;
-export declare const createNodes: import("packages/devkit").CreateNodesV2<import("./src/plugin/utils/gradle-plugin-options").GradlePluginOptions>;
-export declare const createDependencies: import("packages/devkit").CreateDependencies<import("./src/plugin/utils/gradle-plugin-options").GradlePluginOptions>;
+export declare const createNodesV2: import("packages/devkit/dist").CreateNodesV2<import("./src/plugin/utils/gradle-plugin-options").GradlePluginOptions>;
+export declare const createNodes: import("packages/devkit/dist").CreateNodesV2<import("./src/plugin/utils/gradle-plugin-options").GradlePluginOptions>;
+export declare const createDependencies: import("packages/devkit/dist").CreateDependencies<import("./src/plugin/utils/gradle-plugin-options").GradlePluginOptions>;
 //# sourceMappingURL=plugin.d.ts.map

package/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../packages/gradle/plugin.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,IAAI,QAAsD,CAAC;AACxE,eAAO,MAAM,aAAa,iHAA0C,CAAC;AACrE,eAAO,MAAM,WAAW,iHAAgB,CAAC;AACzC,eAAO,MAAM,kBAAkB,sHAA+C,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../packages/gradle/plugin.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,IAAI,QAAsD,CAAC;AACxE,eAAO,MAAM,aAAa,sHAA0C,CAAC;AACrE,eAAO,MAAM,WAAW,sHAAgB,CAAC;AACzC,eAAO,MAAM,kBAAkB,2HAA+C,CAAC"}

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

@@ -1,9 +1,12 @@
 import { ExecutorContext, ProjectGraphProjectNode, TaskGraph } from '@nx/devkit';
 import { RunCommandsOptions } from 'nx/src/executors/run-commands/run-commands.impl';
-import { BatchResults } from 'nx/src/tasks-runner/batch/batch-messages';
+import { TaskResult } from 'nx/src/config/misc-interfaces';
 import { GradleExecutorSchema } from './schema';
 export declare const batchRunnerPath: string;
-export default function gradleBatch(taskGraph: TaskGraph, inputs: Record<string, GradleExecutorSchema>, overrides: RunCommandsOptions, context: ExecutorContext): Promise<BatchResults>;
+export default function gradleBatch(taskGraph: TaskGraph, inputs: Record<string, GradleExecutorSchema>, overrides: RunCommandsOptions, context: ExecutorContext): AsyncGenerator<{
+    task: string;
+    result: TaskResult;
+}>;
 export declare function getGradlewTasksToRun(taskIds: string[], taskGraph: TaskGraph, inputs: Record<string, GradleExecutorSchema>, nodes: Record<string, ProjectGraphProjectNode>, fullTaskGraph?: TaskGraph): {
     gradlewTasksToRun: Record<string, GradleExecutorSchema>;
     excludeTasks: Set<string>;

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;AAahD,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,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,EAC9C,aAAa,GAAE,SAAqB;;;;EA0DrC"}
+{"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,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AACrF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAahD,eAAO,MAAM,eAAe,QAG3B,CAAC;AAEF,wBAA+B,WAAW,CACxC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC5C,SAAS,EAAE,kBAAkB,EAC7B,OAAO,EAAE,eAAe,GACvB,cAAc,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC,CAkEtD;AAED,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,EAC9C,aAAa,GAAE,SAAqB;;;;EA0DrC"}

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

@@ -7,47 +7,49 @@ const devkit_1 = require("@nx/devkit");
 const exec_gradle_1 = require("../../utils/exec-gradle");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
+const readline_1 = require("readline");
 const get_exclude_task_1 = require("./get-exclude-task");
 exports.batchRunnerPath = (0, path_1.join)(__dirname, '../../../batch-runner/build/libs/gradle-batch-runner-all.jar');
-async function gradleBatch(taskGraph, inputs, overrides, context) {
+async function* gradleBatch(taskGraph, inputs, overrides, context) {
+    const projectName = taskGraph.tasks[taskGraph.roots[0]]?.target?.project;
+    const projectRoot = context.projectGraph.nodes[projectName]?.data?.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);
+    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
+    const input = inputs[taskGraph.roots[0]];
+    const args = typeof input.args === 'string'
+        ? input.args.trim().split(' ')
+        : Array.isArray(input.args)
+            ? input.args
+            : [];
+    if (overrides.__overrides_unparsed__.length) {
+        args.push(...overrides.__overrides_unparsed__);
+    }
+    const taskIds = Object.keys(taskGraph.tasks);
+    const { gradlewTasksToRun, excludeTasks, excludeTestTasks } = getGradlewTasksToRun(taskIds, taskGraph, inputs, context.projectGraph.nodes, context.taskGraph ?? taskGraph);
+    const yielded = new Set();
     try {
-        const projectName = taskGraph.tasks[taskGraph.roots[0]]?.target?.project;
-        let projectRoot = context.projectGraph.nodes[projectName]?.data?.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);
-        gradlewPath = (0, path_1.join)(context.root, gradlewPath);
-        const root = (0, path_1.dirname)(gradlewPath);
-        const input = inputs[taskGraph.roots[0]];
-        let args = typeof input.args === 'string'
-            ? input.args.trim().split(' ')
-            : Array.isArray(input.args)
-                ? input.args
-                : [];
-        if (overrides.__overrides_unparsed__.length) {
-            args.push(...overrides.__overrides_unparsed__);
+        for await (const event of streamTasksInBatch(gradlewTasksToRun, excludeTasks, excludeTestTasks, args, root)) {
+            yielded.add(event.task);
+            yield event;
         }
-        const taskIds = Object.keys(taskGraph.tasks);
-        const { gradlewTasksToRun, excludeTasks, excludeTestTasks } = getGradlewTasksToRun(taskIds, taskGraph, inputs, context.projectGraph.nodes, context.taskGraph ?? taskGraph);
-        const batchResults = await runTasksInBatch(gradlewTasksToRun, excludeTasks, excludeTestTasks, args, root);
-        taskIds.forEach((taskId) => {
-            if (!batchResults[taskId]) {
-                batchResults[taskId] = {
-                    success: false,
-                    terminalOutput: `Gradlew batch failed`,
-                };
-            }
-        });
-        return batchResults;
     }
     catch (e) {
         devkit_1.output.error({
             title: `Gradlew batch failed`,
             bodyLines: [e.toString()],
         });
-        return taskGraph.roots.reduce((acc, key) => {
-            acc[key] = { success: false, terminalOutput: e.toString() };
-            return acc;
-        }, {});
+        for (const taskId of taskIds) {
+            if (!yielded.has(taskId)) {
+                yielded.add(taskId);
+                yield {
+                    task: taskId,
+                    result: { success: false, terminalOutput: e.toString() },
+                };
+            }
+        }
     }
 }
 function getGradlewTasksToRun(taskIds, taskGraph, inputs, nodes, fullTaskGraph = taskGraph) {
@@ -88,7 +90,7 @@ function getGradlewTasksToRun(taskIds, taskGraph, inputs, nodes, fullTaskGraph =
         excludeTestTasks,
     };
 }
-async function runTasksInBatch(gradlewTasksToRun, excludeTasks, excludeTestTasks, args, root) {
+async function* streamTasksInBatch(gradlewTasksToRun, excludeTasks, excludeTestTasks, args, root) {
     const gradlewBatchStart = performance.mark(`gradlew-batch:start`);
     const debugOptions = (process.env.NX_GRADLE_BATCH_DEBUG ?? '').trim();
     const spawnArgs = [
@@ -102,30 +104,74 @@ async function runTasksInBatch(gradlewTasksToRun, excludeTasks, excludeTestTasks
         `--excludeTestTasks=${Array.from(excludeTestTasks).join(',')}`,
         ...(process.env.NX_VERBOSE_LOGGING === 'true' ? [] : ['--quiet']),
     ];
-    // Use 'inherit' for stderr so Gradle output (tee'd to System.err
-    // by TeeOutputStream) flows to the terminal in real-time.
-    // stdout is piped to capture the JSON batch results.
-    const batchResults = await new Promise((resolve, reject) => {
-        const cp = (0, child_process_1.spawn)('java', spawnArgs, {
-            cwd: devkit_1.workspaceRoot,
-            windowsHide: true,
-            env: process.env,
-            stdio: ['pipe', 'pipe', 'inherit'],
-        });
-        const chunks = [];
-        cp.stdout.on('data', (chunk) => chunks.push(chunk));
+    // stderr is inherited so Gradle output (tee'd to System.err by TeeOutputStream)
+    // and logger output flow to the terminal in real-time.
+    // stdout is piped so we can read NX_RESULT lines emitted per task.
+    const cp = (0, child_process_1.spawn)('java', spawnArgs, {
+        cwd: devkit_1.workspaceRoot,
+        windowsHide: true,
+        env: process.env,
+        stdio: ['pipe', 'pipe', 'inherit'],
+    });
+    const exit = new Promise((resolve, reject) => {
         cp.on('error', reject);
-        cp.on('close', (code) => {
-            if (code !== 0) {
-                reject(new Error(`Gradle batch runner exited with code ${code}`));
+        cp.on('close', (code) => resolve(code ?? 0));
+    });
+    const rl = (0, readline_1.createInterface)({ input: cp.stdout, crlfDelay: Infinity });
+    // Drain stdout into a queue eagerly. Yielding inside the readline loop creates
+    // back-pressure: if the consumer is slow, `yield` blocks, readline pauses, the
+    // OS pipe between Java and Node fills, and Java's NX_RESULT println blocks on
+    // a full pipe — the JVM hangs even though all task work is done.
+    const queue = [];
+    let notifyAvailable = null;
+    let readerClosed = false;
+    rl.on('line', (line) => {
+        if (!line.startsWith('NX_RESULT:'))
+            return;
+        try {
+            const data = JSON.parse(line.slice('NX_RESULT:'.length));
+            queue.push({
+                task: data.task,
+                result: {
+                    success: data.result.success ?? false,
+                    status: data.result.status,
+                    terminalOutput: data.result.terminalOutput ?? '',
+                    startTime: data.result.startTime,
+                    endTime: data.result.endTime,
+                },
+            });
+        }
+        catch (e) {
+            console.error('[Gradle Batch] Failed to parse result line:', line, e);
+            return;
+        }
+        notifyAvailable?.();
+        notifyAvailable = null;
+    });
+    rl.on('close', () => {
+        readerClosed = true;
+        notifyAvailable?.();
+        notifyAvailable = null;
+    });
+    try {
+        while (!readerClosed || queue.length > 0) {
+            if (queue.length > 0) {
+                yield queue.shift();
             }
             else {
-                resolve(Buffer.concat(chunks).toString());
+                await new Promise((resolve) => {
+                    notifyAvailable = resolve;
+                });
             }
-        });
-    });
+        }
+    }
+    finally {
+        rl.close();
+    }
+    const code = await exit;
     const gradlewBatchEnd = performance.mark(`gradlew-batch:end`);
     performance.measure(`gradlew-batch`, gradlewBatchStart.name, gradlewBatchEnd.name);
-    const gradlewBatchResults = JSON.parse(batchResults);
-    return gradlewBatchResults;
+    if (code !== 0) {
+        throw new Error(`Gradle batch runner exited with code ${code}`);
+    }
 }

package/src/migrations/23-0-0/change-plugin-version-0-1-21.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export default function update(tree: Tree): Promise<void>;
+//# sourceMappingURL=change-plugin-version-0-1-21.d.ts.map

package/src/migrations/23-0-0/change-plugin-version-0-1-21.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"change-plugin-version-0-1-21.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/migrations/23-0-0/change-plugin-version-0-1-21.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAc,MAAM,YAAY,CAAC;AAO9C,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,iBAgB9C"}

package/src/migrations/23-0-0/change-plugin-version-0-1-21.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const devkit_1 = require("@nx/devkit");
+const has_gradle_plugin_1 = require("../../utils/has-gradle-plugin");
+const gradle_project_graph_plugin_utils_1 = require("../../generators/init/gradle-project-graph-plugin-utils");
+const version_catalog_ast_utils_1 = require("../../utils/version-catalog-ast-utils");
+/* Change the plugin version to 0.1.21
+ */
+async function update(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson) {
+        return;
+    }
+    if (!(0, has_gradle_plugin_1.hasGradlePlugin)(tree)) {
+        return;
+    }
+    const gradlePluginVersionToUpdate = '0.1.21';
+    // Update version in version catalogs using AST-based approach to preserve formatting
+    await (0, version_catalog_ast_utils_1.updateNxPluginVersionInCatalogsAst)(tree, gradlePluginVersionToUpdate);
+    // Then update in build.gradle(.kts) files
+    await (0, gradle_project_graph_plugin_utils_1.addNxProjectGraphPlugin)(tree, gradlePluginVersionToUpdate);
+}

package/src/plugin/nodes.d.ts

@@ -2,7 +2,7 @@ import { CreateNodesV2, CreateNodesContextV2, ProjectConfiguration, ProjectGraph
 import { GradlePluginOptions } from './utils/gradle-plugin-options';
 type GradleTargets = Record<string, Partial<ProjectConfiguration>>;
 export declare const createNodesV2: CreateNodesV2<GradlePluginOptions>;
-export declare const makeCreateNodesForGradleConfigFile: (projects: Record<string, Partial<ProjectConfiguration>>, projectsCache?: GradleTargets, externalNodes?: Record<string, ProjectGraphExternalNode>) => (gradleFilePath: any, options: GradlePluginOptions | undefined, context: CreateNodesContextV2) => Promise<{
+export declare const makeCreateNodesForGradleConfigFile: (projects: Record<string, Partial<ProjectConfiguration>>, projectsCache?: GradleTargets, externalNodes?: Record<string, ProjectGraphExternalNode>, hashes?: string[]) => (gradleFilePath: any, options: GradlePluginOptions | undefined, context: CreateNodesContextV2, idx?: number) => Promise<{
     projects?: undefined;
     externalNodes?: undefined;
 } | {

package/src/plugin/nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/plugin/nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,oBAAoB,EAEpB,wBAAwB,EAEzB,MAAM,YAAY,CAAC;AAepB,OAAO,EACL,mBAAmB,EAEpB,MAAM,+BAA+B,CAAC;AAEvC,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC;AAgFnE,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CA0F5D,CAAC;AAEF,eAAO,MAAM,kCAAkC,GAE3C,UAAU,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,EACvD,gBAAe,aAAkB,EACjC,gBAAe,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAM,MAG5D,mBAAc,EACd,SAAS,mBAAmB,GAAG,SAAS,EACxC,SAAS,oBAAoB;;;;;;;;EAyB9B,CAAC"}
+{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/plugin/nodes.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,oBAAoB,EAEpB,wBAAwB,EAEzB,MAAM,YAAY,CAAC;AAcpB,OAAO,EACL,mBAAmB,EAEpB,MAAM,+BAA+B,CAAC;AAEvC,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC;AAgFnE,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CA8F5D,CAAC;AAEF,eAAO,MAAM,kCAAkC,GAE3C,UAAU,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,EACvD,gBAAe,aAAkB,EACjC,gBAAe,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAM,EAC5D,SAAS,MAAM,EAAE,MAGjB,mBAAc,EACd,SAAS,mBAAmB,GAAG,SAAS,EACxC,SAAS,oBAAoB,EAC7B,MAAM,MAAM;;;;;;;;EAyCb,CAAC"}

package/src/plugin/nodes.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCreateNodesForGradleConfigFile = exports.createNodesV2 = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const node_path_1 = require("node:path");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const plugin_cache_utils_1 = require("nx/src/utils/plugin-cache-utils");
@@ -82,9 +82,12 @@ exports.createNodesV2 = [
         try {
             const results = [];
             const normalizedOptions = (0, gradle_plugin_options_1.normalizeOptions)(options);
-            for (const gradleFilePath of allBuildFiles) {
-                const projectRoot = (0, node_path_1.dirname)(gradleFilePath);
-                const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, normalizedOptions ?? {}, context);
+            const buildFileProjectRoots = allBuildFiles.map((f) => (0, node_path_1.dirname)(f));
+            const buildFileHashes = await (0, internal_1.calculateHashesForCreateNodes)(buildFileProjectRoots, normalizedOptions ?? {}, context);
+            for (let i = 0; i < allBuildFiles.length; i++) {
+                const gradleFilePath = allBuildFiles[i];
+                const projectRoot = buildFileProjectRoots[i];
+                const hash = buildFileHashes[i];
                 // Get project from cache or nodes
                 if (!pluginCache.has(hash)) {
                     const nodeProject = nodes[projectRoot] ?? nodes[(0, node_path_1.join)(devkit_1.workspaceRoot, projectRoot)];
@@ -126,14 +129,27 @@ exports.createNodesV2 = [
             return results;
         }
         finally {
-            pluginCache.writeToDisk(cachePath);
+            pluginCache.writeToDisk();
         }
     },
 ];
-const makeCreateNodesForGradleConfigFile = (projects, projectsCache = {}, externalNodes = {}) => async (gradleFilePath, options, context) => {
+const makeCreateNodesForGradleConfigFile = (projects, projectsCache = {}, externalNodes = {}, hashes) => async (gradleFilePath, options, context, idx) => {
     const projectRoot = (0, node_path_1.dirname)(gradleFilePath);
     options = (0, gradle_plugin_options_1.normalizeOptions)(options);
-    const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options ?? {}, context);
+    let hash;
+    if (hashes && idx !== undefined) {
+        hash = hashes[idx];
+        if (hash === undefined) {
+            throw new Error(`Failed to compute hash for gradle project at ${projectRoot}`);
+        }
+    }
+    else {
+        const [computed] = await (0, internal_1.calculateHashesForCreateNodes)([projectRoot], options ?? {}, context);
+        if (computed === undefined) {
+            throw new Error(`Failed to compute hash for gradle project at ${projectRoot}`);
+        }
+        hash = computed;
+    }
     projectsCache[hash] ??=
         projects[projectRoot] ?? projects[(0, node_path_1.join)(devkit_1.workspaceRoot, projectRoot)];
     const project = projectsCache[hash];

package/src/plugin-v1/dependencies.d.ts

@@ -1,3 +1,7 @@
 import { CreateDependencies } from '@nx/devkit';
+/**
+ * @deprecated The `@nx/gradle/plugin-v1` entry is deprecated and will be removed in Nx 24.
+ * Switch to the default `@nx/gradle` plugin.
+ */
 export declare const createDependencies: CreateDependencies;
 //# sourceMappingURL=dependencies.d.ts.map

package/src/plugin-v1/dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/plugin-v1/dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAMnB,MAAM,YAAY,CAAC;AAMpB,eAAO,MAAM,kBAAkB,EAAE,kBAoEhC,CAAC"}
+{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/plugin-v1/dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAMnB,MAAM,YAAY,CAAC;AAMpB;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAoEhC,CAAC"}

package/src/plugin-v1/dependencies.js

@@ -5,6 +5,10 @@ const devkit_1 = require("@nx/devkit");
 const node_path_1 = require("node:path");
 const get_gradle_report_1 = require("./utils/get-gradle-report");
 const split_config_files_1 = require("../utils/split-config-files");
+/**
+ * @deprecated The `@nx/gradle/plugin-v1` entry is deprecated and will be removed in Nx 24.
+ * Switch to the default `@nx/gradle` plugin.
+ */
 const createDependencies = async (_, context) => {
     const gradleFiles = findGradleFiles(context.filesToProcess);
     if (gradleFiles.length === 0) {

package/src/plugin-v1/nodes.d.ts

@@ -9,8 +9,12 @@ export interface GradlePluginOptions {
     buildTargetName?: string;
     [taskTargetName: string]: string | undefined | boolean;
 }
+/**
+ * @deprecated The `@nx/gradle/plugin-v1` entry is deprecated and will be removed in Nx 24.
+ * Switch to the default `@nx/gradle` plugin.
+ */
 export declare const createNodesV2: CreateNodesV2<GradlePluginOptions>;
-export declare const makeCreateNodesForGradleConfigFile: (gradleReport: GradleReport, pluginCache?: PluginCache<Partial<ProjectConfiguration>>, gradleProjectRootToTestFilesMap?: Record<string, string[]>) => (gradleFilePath: any, options: GradlePluginOptions | undefined, context: CreateNodesContextV2) => Promise<{
+export declare const makeCreateNodesForGradleConfigFile: (gradleReport: GradleReport, pluginCache: PluginCache<Partial<ProjectConfiguration>>, gradleProjectRootToTestFilesMap?: Record<string, string[]>, hashes?: string[]) => (gradleFilePath: any, options: GradlePluginOptions | undefined, context: CreateNodesContextV2, idx?: number) => Promise<{
     projects?: undefined;
 } | {
     projects: {

package/src/plugin-v1/nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/plugin-v1/nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,oBAAoB,EAGrB,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAG9D,OAAO,EAGL,YAAY,EACb,MAAM,2BAA2B,CAAC;AAsBnC,MAAM,WAAW,mBAAmB;IAClC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;CACxD;AAYD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAuC5D,CAAC;AAEF,eAAO,MAAM,kCAAkC,GAE3C,cAAc,YAAY,EAC1B,cAAa,WAAW,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAqB,EAC3E,kCAAiC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAM,MAG9D,mBAAc,EACd,SAAS,mBAAmB,GAAG,SAAS,EACxC,SAAS,oBAAoB;;;;;;EA+B9B,CAAC;AAEJ;;;GAGG;AACH,eAAO,MAAM,WAAW,oCAAgB,CAAC"}
+{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/plugin-v1/nodes.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,oBAAoB,EAGrB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAG9D,OAAO,EAGL,YAAY,EACb,MAAM,2BAA2B,CAAC;AAsBnC,MAAM,WAAW,mBAAmB;IAClC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;CACxD;AAYD;;;GAGG;AACH,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CA8C5D,CAAC;AAEF,eAAO,MAAM,kCAAkC,GAE3C,cAAc,YAAY,EAC1B,aAAa,WAAW,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,EACvD,kCAAiC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAM,EAC9D,SAAS,MAAM,EAAE,MAGjB,mBAAc,EACd,SAAS,mBAAmB,GAAG,SAAS,EACxC,SAAS,oBAAoB,EAC7B,MAAM,MAAM;;;;;;EAgDb,CAAC;AAEJ;;;GAGG;AACH,eAAO,MAAM,WAAW,oCAAgB,CAAC"}

package/src/plugin-v1/nodes.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodes = exports.makeCreateNodesForGradleConfigFile = exports.createNodesV2 = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const node_path_1 = require("node:path");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const plugin_cache_utils_1 = require("nx/src/utils/plugin-cache-utils");
@@ -25,6 +25,10 @@ function normalizeOptions(options) {
     options.buildTargetName ??= 'build';
     return options;
 }
+/**
+ * @deprecated The `@nx/gradle/plugin-v1` entry is deprecated and will be removed in Nx 24.
+ * Switch to the default `@nx/gradle` plugin.
+ */
 exports.createNodesV2 = [
     split_config_files_1.gradleConfigAndTestGlob,
     async (files, options, context) => {
@@ -36,17 +40,32 @@ exports.createNodesV2 = [
         const gradleReport = (0, get_gradle_report_1.getCurrentGradleReport)();
         const gradleProjectRootToTestFilesMap = getGradleProjectRootToTestFilesMap(testFiles, projectRoots);
         try {
-            return (0, devkit_1.createNodesFromFiles)((0, exports.makeCreateNodesForGradleConfigFile)(gradleReport, pluginCache, gradleProjectRootToTestFilesMap), buildFiles, options, context);
+            const buildFileProjectRoots = buildFiles.map((f) => (0, node_path_1.dirname)(f));
+            const buildFileHashes = await (0, internal_1.calculateHashesForCreateNodes)(buildFileProjectRoots, normalizeOptions(options) ?? {}, context);
+            return (0, devkit_1.createNodesFromFiles)((0, exports.makeCreateNodesForGradleConfigFile)(gradleReport, pluginCache, gradleProjectRootToTestFilesMap, buildFileHashes), buildFiles, options, context);
         }
         finally {
-            pluginCache.writeToDisk(cachePath);
+            pluginCache.writeToDisk();
         }
     },
 ];
-const makeCreateNodesForGradleConfigFile = (gradleReport, pluginCache = new plugin_cache_utils_1.PluginCache(), gradleProjectRootToTestFilesMap = {}) => async (gradleFilePath, options, context) => {
+const makeCreateNodesForGradleConfigFile = (gradleReport, pluginCache, gradleProjectRootToTestFilesMap = {}, hashes) => async (gradleFilePath, options, context, idx) => {
     const projectRoot = (0, node_path_1.dirname)(gradleFilePath);
     options = normalizeOptions(options);
-    const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options ?? {}, context);
+    let hash;
+    if (hashes && idx !== undefined) {
+        hash = hashes[idx];
+        if (hash === undefined) {
+            throw new Error(`Failed to compute hash for gradle project at ${projectRoot}`);
+        }
+    }
+    else {
+        const [computed] = await (0, internal_1.calculateHashesForCreateNodes)([projectRoot], options ?? {}, context);
+        if (computed === undefined) {
+            throw new Error(`Failed to compute hash for gradle project at ${projectRoot}`);
+        }
+        hash = computed;
+    }
     if (!pluginCache.has(hash)) {
         pluginCache.set(hash, await createGradleProject(gradleReport, gradleFilePath, options, context, gradleProjectRootToTestFilesMap[projectRoot]));
     }
@@ -206,7 +225,6 @@ function getTestCiTargets(testFiles, gradleProject, testTargetName, ciTargetName
         targetGroups[targetGroupName].push(targetName);
         dependsOn.push({
             target: targetName,
-            projects: 'self',
             params: 'forward',
         });
     });

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.20";
+export declare const gradleProjectGraphVersion = "0.1.21";
 //# 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.20';
+exports.gradleProjectGraphVersion = '0.1.21';