@nx/gradle 22.7.0-pr.35019.f500fd7 → 22.7.0-rc.0

package/migrations.json

@@ -113,6 +113,24 @@
       "cli": "nx",
       "description": "Change dev.nx.gradle.project-graph to version 0.1.17 in build file",
       "factory": "./src/migrations/22-7-0/change-plugin-version-0-1-17"
+    },
+    "change-plugin-version-0-1-18": {
+      "version": "22.7.0-beta.9",
+      "cli": "nx",
+      "description": "Change dev.nx.gradle.project-graph to version 0.1.18 in build file",
+      "factory": "./src/migrations/22-7-0/change-plugin-version-0-1-18"
+    },
+    "change-plugin-version-0-1-19": {
+      "version": "22.7.0-beta.11",
+      "cli": "nx",
+      "description": "Change dev.nx.gradle.project-graph to version 0.1.19 in build file",
+      "factory": "./src/migrations/22-7-0/change-plugin-version-0-1-19"
+    },
+    "change-plugin-version-0-1-20": {
+      "version": "22.7.0-beta.16",
+      "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"
     }
   },
   "packageJsonUpdates": {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "22.7.0-pr.35019.f500fd7",
+  "version": "22.7.0-rc.0",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -16,7 +16,8 @@
     "Backend"
   ],
   "main": "./index.js",
-  "typings": "./index.d.ts",
+  "type": "commonjs",
+  "types": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {
@@ -39,16 +40,16 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0-pr.35019.f500fd7",
-    "toml-eslint-parser": "^0.10.0"
+    "@nx/devkit": "22.7.0-rc.0",
+    "toml-eslint-parser": "^0.10.0",
+    "tree-kill": "^1.2.2",
+    "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.7.0-pr.35019.f500fd7"
+    "nx": "22.7.0-rc.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "executors": "./executors.json",
-  "types": "./index.d.ts",
-  "type": "commonjs"
+  "executors": "./executors.json"
 }

package/src/executors/gradle/get-exclude-task.d.ts

@@ -1,4 +1,4 @@
-import { ProjectGraphProjectNode } from 'nx/src/config/project-graph';
+import { ProjectGraphProjectNode, Target } from '@nx/devkit';
 /**
  * Returns Gradle CLI arguments to exclude dependent tasks
  * that are not part of the current execution set.
@@ -6,13 +6,13 @@ import { ProjectGraphProjectNode } from 'nx/src/config/project-graph';
  * For example, if a project defines `dependsOn: ['lint']` for the `test` target,
  * and only `test` is running, this will return: ['lint']
  *
- * @param taskIds - Set of Nx task IDs to process
+ * @param tasks - Set of Target to process
  * @param nodes - Project graph nodes
- * @param runningTaskIds - Set of task IDs that are currently running (won't be excluded)
+ * @param runningTasks - Set of Target that are currently running (won't be excluded)
  * @param includeDependsOnTasks - Set of Gradle task names that should be included (not excluded)
  *   (typically provider-based dependencies that Gradle must resolve)
  */
-export declare function getExcludeTasks(taskIds: Set<string>, nodes: Record<string, ProjectGraphProjectNode>, runningTaskIds?: Set<string>, includeDependsOnTasks?: Set<string>): Set<string>;
-export declare function getGradleTaskNameWithNxTaskId(nxTaskId: string, nodes: Record<string, ProjectGraphProjectNode>): string | null;
-export declare function getAllDependsOn(nodes: Record<string, ProjectGraphProjectNode>, projectName: string, targetName: string): Set<string>;
+export declare function getExcludeTasks(tasks: Set<Target>, nodes: Record<string, ProjectGraphProjectNode>, runningTasks?: Set<Target>, includeDependsOnTasks?: Set<string>): Set<string>;
+export declare function getGradleTaskName(pt: Target, nodes: Record<string, ProjectGraphProjectNode>): string | null;
+export declare function getAllDependsOn(nodes: Record<string, ProjectGraphProjectNode>, projectName: string, targetName: string): Set<Target>;
 //# sourceMappingURL=get-exclude-task.d.ts.map

package/src/executors/gradle/get-exclude-task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-exclude-task.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/executors/gradle/get-exclude-task.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,uBAAuB,EACxB,MAAM,6BAA6B,CAAC;AAgCrC;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,EAC9C,cAAc,GAAE,GAAG,CAAC,MAAM,CAAa,EACvC,qBAAqB,GAAE,GAAG,CAAC,MAAM,CAAa,GAC7C,GAAG,CAAC,MAAM,CAAC,CAkBb;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,GAC7C,MAAM,GAAG,IAAI,CAKf;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,EAC9C,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GACjB,GAAG,CAAC,MAAM,CAAC,CAyBb"}
+{"version":3,"file":"get-exclude-task.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/executors/gradle/get-exclude-task.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,MAAM,EAEP,MAAM,YAAY,CAAC;AA+BpB;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,EAClB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,EAC9C,YAAY,GAAE,GAAG,CAAC,MAAM,CAAa,EACrC,qBAAqB,GAAE,GAAG,CAAC,MAAM,CAAa,GAC7C,GAAG,CAAC,MAAM,CAAC,CAsBb;AAED,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,GAC7C,MAAM,GAAG,IAAI,CAEf;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,EAC9C,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GACjB,GAAG,CAAC,MAAM,CAAC,CAgCb"}

package/src/executors/gradle/get-exclude-task.js

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExcludeTasks = getExcludeTasks;
-exports.getGradleTaskNameWithNxTaskId = getGradleTaskNameWithNxTaskId;
+exports.getGradleTaskName = getGradleTaskName;
 exports.getAllDependsOn = getAllDependsOn;
+const devkit_1 = require("@nx/devkit");
 /**
- * Resolves a dependsOn entry to an Nx task ID (project:target format).
- * Handles both string format ("project:target") and object format
+ * Resolves a dependsOn entry to a Target.
+ * Handles both string format ("target") and object format
  * ({ target: "name", projects?: ["proj1"] }).
  * For same-project object deps (no projects field), uses the owning project name.
  */
-function resolveDepToTaskId(dep, owningProject) {
+function resolveDepToTarget(dep, owningProject) {
     if (typeof dep === 'string') {
-        return dep;
+        return { project: owningProject, target: dep };
     }
     const target = dep?.target;
     if (!target) {
@@ -21,13 +22,12 @@ function resolveDepToTaskId(dep, owningProject) {
         const projectList = Array.isArray(dep.projects)
             ? dep.projects
             : [dep.projects];
-        // For cross-project deps, use the first project
-        return projectList[0] !== 'self'
-            ? `${projectList[0]}:${target}`
-            : `${owningProject}:${target}`;
+        return {
+            project: projectList[0] !== 'self' ? projectList[0] : owningProject,
+            target,
+        };
     }
-    // Same-project dep (no projects field)
-    return `${owningProject}:${target}`;
+    return { project: owningProject, target };
 }
 /**
  * Returns Gradle CLI arguments to exclude dependent tasks
@@ -36,20 +36,21 @@ function resolveDepToTaskId(dep, owningProject) {
  * For example, if a project defines `dependsOn: ['lint']` for the `test` target,
  * and only `test` is running, this will return: ['lint']
  *
- * @param taskIds - Set of Nx task IDs to process
+ * @param tasks - Set of Target to process
  * @param nodes - Project graph nodes
- * @param runningTaskIds - Set of task IDs that are currently running (won't be excluded)
+ * @param runningTasks - Set of Target that are currently running (won't be excluded)
  * @param includeDependsOnTasks - Set of Gradle task names that should be included (not excluded)
  *   (typically provider-based dependencies that Gradle must resolve)
  */
-function getExcludeTasks(taskIds, nodes, runningTaskIds = new Set(), includeDependsOnTasks = new Set()) {
+function getExcludeTasks(tasks, nodes, runningTasks = new Set(), includeDependsOnTasks = new Set()) {
     const excludes = new Set();
-    for (const taskId of taskIds) {
-        const [project, target] = taskId.split(':');
-        const allDeps = getAllDependsOn(nodes, project, target);
-        for (const depTaskId of allDeps) {
-            if (!runningTaskIds.has(depTaskId)) {
-                const gradleTaskName = getGradleTaskNameWithNxTaskId(depTaskId, nodes);
+    const runningKeys = new Set(Array.from(runningTasks).map(devkit_1.targetToTargetString));
+    for (const task of tasks) {
+        const taskDeps = nodes[task.project]?.data?.targets?.[task.target]?.dependsOn ?? [];
+        for (const dep of taskDeps) {
+            const depPt = resolveDepToTarget(dep, task.project);
+            if (depPt && !runningKeys.has((0, devkit_1.targetToTargetString)(depPt))) {
+                const gradleTaskName = getGradleTaskName(depPt, nodes);
                 if (gradleTaskName && !includeDependsOnTasks.has(gradleTaskName)) {
                     excludes.add(gradleTaskName);
                 }
@@ -58,29 +59,34 @@ function getExcludeTasks(taskIds, nodes, runningTaskIds = new Set(), includeDepe
     }
     return excludes;
 }
-function getGradleTaskNameWithNxTaskId(nxTaskId, nodes) {
-    const [projectName, targetName] = nxTaskId.split(':');
-    const gradleTaskName = nodes[projectName]?.data?.targets?.[targetName]?.options?.taskName;
-    return gradleTaskName;
+function getGradleTaskName(pt, nodes) {
+    return nodes[pt.project]?.data?.targets?.[pt.target]?.options?.taskName;
 }
 function getAllDependsOn(nodes, projectName, targetName) {
     const allDependsOn = new Set();
-    const stack = [`${projectName}:${targetName}`];
+    const result = new Set();
+    const startKey = (0, devkit_1.targetToTargetString)({
+        project: projectName,
+        target: targetName,
+    });
+    const stack = [{ project: projectName, target: targetName }];
     while (stack.length > 0) {
-        const currentTaskId = stack.pop();
-        if (currentTaskId && !allDependsOn.has(currentTaskId)) {
-            allDependsOn.add(currentTaskId);
-            const [currentProjectName, currentTargetName] = currentTaskId.split(':');
-            const directDependencies = nodes[currentProjectName]?.data?.targets?.[currentTargetName]
-                ?.dependsOn ?? [];
+        const current = stack.pop();
+        const key = (0, devkit_1.targetToTargetString)(current);
+        if (!allDependsOn.has(key)) {
+            allDependsOn.add(key);
+            if (key !== startKey) {
+                result.add(current);
+            }
+            const directDependencies = nodes[current.project]?.data?.targets?.[current.target]?.dependsOn ??
+                [];
             for (const dep of directDependencies) {
-                const depTaskId = resolveDepToTaskId(dep, currentProjectName);
-                if (depTaskId && !allDependsOn.has(depTaskId)) {
-                    stack.push(depTaskId);
+                const depPt = resolveDepToTarget(dep, current.project);
+                if (depPt && !allDependsOn.has((0, devkit_1.targetToTargetString)(depPt))) {
+                    stack.push(depPt);
                 }
             }
         }
     }
-    allDependsOn.delete(`${projectName}:${targetName}`); // Exclude the starting task itself
-    return allDependsOn;
+    return result;
 }

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,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;;;;EAiE/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,EAEvB,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,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;;;;EAuE/C"}

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

@@ -4,7 +4,6 @@ exports.batchRunnerPath = void 0;
 exports.default = gradleBatch;
 exports.getGradlewTasksToRun = getGradlewTasksToRun;
 const devkit_1 = require("@nx/devkit");
-const run_commands_impl_1 = require("nx/src/executors/run-commands/run-commands.impl");
 const exec_gradle_1 = require("../../utils/exec-gradle");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
@@ -56,49 +55,53 @@ async function gradleBatch(taskGraph, inputs, overrides, context) {
  * Get the gradlew task ids to run
  */
 function getGradlewTasksToRun(taskIds, taskGraph, inputs, nodes) {
-    const taskIdsWithExclude = new Set([]);
-    const testTaskIdsWithExclude = new Set([]);
-    const taskIdsWithoutExclude = new Set([]);
+    const tasksWithExclude = new Set();
+    const testTasksWithExclude = new Set();
+    const tasksWithoutExclude = new Set();
     const gradlewTasksToRun = {};
     const includeDependsOnTasks = new Set();
     for (const taskId of taskIds) {
         const task = taskGraph.tasks[taskId];
         const input = inputs[task.id];
+        const taskTarget = {
+            project: task.target.project,
+            target: task.target.target,
+        };
         gradlewTasksToRun[taskId] = input;
-        // Collect tasks that should be included (not excluded) - typically provider-based dependencies
         if (input.includeDependsOnTasks) {
-            for (const task of input.includeDependsOnTasks) {
-                includeDependsOnTasks.add(task);
+            for (const t of input.includeDependsOnTasks) {
+                includeDependsOnTasks.add(t);
             }
         }
         if (input.excludeDependsOn) {
             if (input.testClassName) {
-                testTaskIdsWithExclude.add(taskId);
+                testTasksWithExclude.add(taskTarget);
             }
             else {
-                taskIdsWithExclude.add(taskId);
+                tasksWithExclude.add(taskTarget);
             }
         }
         else {
-            taskIdsWithoutExclude.add(taskId);
+            tasksWithoutExclude.add(taskTarget);
         }
     }
-    const allDependsOn = new Set(taskIds);
-    for (const taskId of taskIdsWithoutExclude) {
-        const [projectName, targetName] = taskId.split(':');
-        const dependencies = (0, get_exclude_task_1.getAllDependsOn)(nodes, projectName, targetName);
-        dependencies.forEach((dep) => allDependsOn.add(dep));
+    const allRunning = new Set(taskIds.map((id) => ({
+        project: taskGraph.tasks[id].target.project,
+        target: taskGraph.tasks[id].target.target,
+    })));
+    for (const task of tasksWithoutExclude) {
+        const dependencies = (0, get_exclude_task_1.getAllDependsOn)(nodes, task.project, task.target);
+        dependencies.forEach((dep) => allRunning.add(dep));
     }
-    const excludeTasks = (0, get_exclude_task_1.getExcludeTasks)(taskIdsWithExclude, nodes, allDependsOn, includeDependsOnTasks);
+    const excludeTasks = (0, get_exclude_task_1.getExcludeTasks)(tasksWithExclude, nodes, allRunning, includeDependsOnTasks);
     const allTestsDependsOn = new Set();
-    for (const taskId of testTaskIdsWithExclude) {
-        const [projectName, targetName] = taskId.split(':');
-        const taskDependsOn = (0, get_exclude_task_1.getAllDependsOn)(nodes, projectName, targetName);
+    for (const task of testTasksWithExclude) {
+        const taskDependsOn = (0, get_exclude_task_1.getAllDependsOn)(nodes, task.project, task.target);
         taskDependsOn.forEach((dep) => allTestsDependsOn.add(dep));
     }
     const excludeTestTasks = new Set();
-    for (let taskId of allTestsDependsOn) {
-        const gradleTaskName = (0, get_exclude_task_1.getGradleTaskNameWithNxTaskId)(taskId, nodes);
+    for (const task of allTestsDependsOn) {
+        const gradleTaskName = (0, get_exclude_task_1.getGradleTaskName)(task, nodes);
         if (gradleTaskName) {
             excludeTestTasks.add(gradleTaskName);
         }
@@ -111,20 +114,40 @@ function getGradlewTasksToRun(taskIds, taskGraph, inputs, nodes) {
 }
 async function runTasksInBatch(gradlewTasksToRun, excludeTasks, excludeTestTasks, args, root) {
     const gradlewBatchStart = performance.mark(`gradlew-batch:start`);
-    const debugOptions = ' ' + (process.env.NX_GRADLE_BATCH_DEBUG ?? '');
-    const command = `java${debugOptions} -jar ${exports.batchRunnerPath} --tasks='${JSON.stringify(gradlewTasksToRun)}' --workspaceRoot=${root} --args='${args
-        .join(' ')
-        .replaceAll("'", '"')}' --excludeTasks='${Array.from(excludeTasks).join(',')}' --excludeTestTasks='${Array.from(excludeTestTasks).join(',')}' ${process.env.NX_VERBOSE_LOGGING === 'true' ? '' : '--quiet'}`;
+    const debugOptions = (process.env.NX_GRADLE_BATCH_DEBUG ?? '').trim();
+    const spawnArgs = [
+        ...(debugOptions ? debugOptions.split(/\s+/) : []),
+        '-jar',
+        exports.batchRunnerPath,
+        `--tasks=${JSON.stringify(gradlewTasksToRun)}`,
+        `--workspaceRoot=${root}`,
+        `--args=${args.join(' ').replaceAll("'", '"')}`,
+        `--excludeTasks=${Array.from(excludeTasks).join(',')}`,
+        `--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 = (0, child_process_1.execSync)(command, {
-        cwd: devkit_1.workspaceRoot,
-        windowsHide: true,
-        env: process.env,
-        stdio: ['pipe', 'pipe', 'inherit'],
-        maxBuffer: run_commands_impl_1.LARGE_BUFFER,
-    }).toString();
+    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));
+        cp.on('error', reject);
+        cp.on('close', (code) => {
+            if (code !== 0) {
+                reject(new Error(`Gradle batch runner exited with code ${code}`));
+            }
+            else {
+                resolve(Buffer.concat(chunks).toString());
+            }
+        });
+    });
     const gradlewBatchEnd = performance.mark(`gradlew-batch:end`);
     performance.measure(`gradlew-batch`, gradlewBatchStart.name, gradlewBatchEnd.name);
     const gradlewBatchResults = JSON.parse(batchResults);

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

@@ -46,7 +46,7 @@ async function gradleExecutor(options, context) {
     });
     if (options.excludeDependsOn) {
         const includeDependsOnTasks = new Set(options.includeDependsOnTasks ?? []);
-        (0, get_exclude_task_1.getExcludeTasks)(new Set([`${context.projectName}:${context.targetName}`]), context.projectGraph.nodes, new Set(), includeDependsOnTasks).forEach((task) => {
+        (0, get_exclude_task_1.getExcludeTasks)(new Set([{ project: context.projectName, target: context.targetName }]), context.projectGraph.nodes, new Set(), includeDependsOnTasks).forEach((task) => {
             if (task) {
                 args.push('--exclude-task', task);
             }

package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml.template

@@ -38,7 +38,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
 
-      - uses: nrwl/nx-set-shas@v4
+      - uses: nrwl/nx-set-shas@v5
 <% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
       # <%- comment %><% } %><% } %><% if (command.command) { %>
       - run: <%= command.command %><% if (command.alwaysRun) { %>

package/src/migrations/22-7-0/change-plugin-version-0-1-18.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-18.d.ts.map

package/src/migrations/22-7-0/change-plugin-version-0-1-18.d.ts.map

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

package/src/migrations/22-7-0/change-plugin-version-0-1-18.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.18
+ */
+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.18';
+    // 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/migrations/22-7-0/change-plugin-version-0-1-19.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-19.d.ts.map

package/src/migrations/22-7-0/change-plugin-version-0-1-19.d.ts.map

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

package/src/migrations/22-7-0/change-plugin-version-0-1-19.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.19
+ */
+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.19';
+    // 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/migrations/22-7-0/change-plugin-version-0-1-20.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-20.d.ts.map

package/src/migrations/22-7-0/change-plugin-version-0-1-20.d.ts.map

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

package/src/migrations/22-7-0/change-plugin-version-0-1-20.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.20
+ */
+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.20';
+    // 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/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,EAIL,oBAAoB,EACpB,wBAAwB,EAExB,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAE,mBAAmB,EAAoB,MAAM,yBAAyB,CAAC;AAIhF,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,EAC3B,IAAI,EAAE,MAAM,QAgBb;AAQD,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,CA6Df;AAED,wBAAgB,qBAAqB,CACnC,iBAAiB,EAAE,MAAM,EAAE,GAC1B,kBAAkB,CAkDpB"}
+{"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,EAIL,oBAAoB,EACpB,wBAAwB,EAExB,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAE,mBAAmB,EAAoB,MAAM,yBAAyB,CAAC;AAIhF,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,EAC3B,IAAI,EAAE,MAAM,QAgBb;AAOD,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,CAyEf;AAED,wBAAgB,qBAAqB,CACnC,iBAAiB,EAAE,MAAM,EAAE,GAC1B,kBAAkB,CAkDpB"}

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

@@ -75,14 +75,25 @@ async function populateProjectGraph(workspaceRoot, gradlewFiles, options) {
         return;
     }
     const gradleProjectGraphReportStart = performance.mark('gradleProjectGraphReport:start');
-    const projectGraphLines = await gradlewFiles.reduce(async (projectGraphLines, gradlewFile) => {
-        const getNxProjectGraphLinesStart = performance.mark(`${gradlewFile}GetNxProjectGraphLines:start`);
-        const allLines = await projectGraphLines;
-        const currentLines = await (0, get_project_graph_lines_1.getNxProjectGraphLines)(gradlewFile, gradleConfigHash, normalizedOptions);
-        const getNxProjectGraphLinesEnd = performance.mark(`${gradlewFile}GetNxProjectGraphLines:end`);
-        performance.measure(`${gradlewFile}GetNxProjectGraphLines`, getNxProjectGraphLinesStart.name, getNxProjectGraphLinesEnd.name);
-        return [...allLines, ...currentLines];
-    }, Promise.resolve([]));
+    let projectGraphLines;
+    try {
+        projectGraphLines = await gradlewFiles.reduce(async (projectGraphLines, gradlewFile) => {
+            const getNxProjectGraphLinesStart = performance.mark(`${gradlewFile}GetNxProjectGraphLines:start`);
+            const allLines = await projectGraphLines;
+            const currentLines = await (0, get_project_graph_lines_1.getNxProjectGraphLines)(gradlewFile, gradleConfigHash, normalizedOptions);
+            const getNxProjectGraphLinesEnd = performance.mark(`${gradlewFile}GetNxProjectGraphLines:end`);
+            performance.measure(`${gradlewFile}GetNxProjectGraphLines`, getNxProjectGraphLinesStart.name, getNxProjectGraphLinesEnd.name);
+            return [...allLines, ...currentLines];
+        }, Promise.resolve([]));
+    }
+    catch (e) {
+        if (e instanceof Error &&
+            e.message === 'Gradle project graph generation was cancelled') {
+            // Cancelled by a newer populateProjectGraph call — silently return
+            return;
+        }
+        throw e;
+    }
     const gradleProjectGraphReportEnd = performance.mark('gradleProjectGraphReport:end');
     performance.measure('gradleProjectGraphReport', gradleProjectGraphReportStart.name, gradleProjectGraphReportEnd.name);
     projectGraphReportCache = processNxProjectGraph(projectGraphLines);

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

@@ -1,3 +1,9 @@
 import { GradlePluginOptions } from './gradle-plugin-options';
+/**
+ * Cancel any in-flight Gradle project graph process.
+ * Safe to call even if nothing is running.
+ */
+export declare function cancelPendingProjectGraphRequest(): void;
+export declare function getGraphTimeoutMs(): number;
 export declare function getNxProjectGraphLines(gradlewFile: string, gradleConfigHash: string, gradlePluginOptions: GradlePluginOptions): Promise<string[]>;
 //# sourceMappingURL=get-project-graph-lines.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"get-project-graph-lines.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/plugin/utils/get-project-graph-lines.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,OAAO,CAAC,MAAM,EAAE,CAAC,CA0EnB"}
+{"version":3,"file":"get-project-graph-lines.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/plugin/utils/get-project-graph-lines.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D;;;GAGG;AACH,wBAAgB,gCAAgC,IAAI,IAAI,CAKvD;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAS1C;AAED,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,OAAO,CAAC,MAAM,EAAE,CAAC,CA6GnB"}