@nx/gradle 23.2.0-beta.7 → 23.2.0-beta.9

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

@@ -205,14 +205,15 @@ async function addNxProjectGraphPluginToBuildGradle(gradleFilePath, buildGradleC
     if (!hasPluginViaAlias) {
         const applyPluginPattern = versionCatalogPluginAccessor
             ? new RegExp(`\\s*plugin\\(${versionCatalogPluginAccessor.replace(/\./g, '\\.')}\\)`)
-            : new RegExp(`\\s*plugin\\(["']${versions_1.gradleProjectGraphPluginName}["']\\)`);
+            : // Both DSL forms, so a re-run doesn't append a duplicate apply.
+                new RegExp(`\\s*plugin\\s*[:(]\\s*["']${versions_1.gradleProjectGraphPluginName.replace(/\./g, '\\.')}["']`);
         if (buildGradleContent.includes('allprojects {')) {
             if (!applyPluginPattern.test(buildGradleContent)) {
                 const applyPlugin = versionCatalogPluginAccessor
                     ? `plugin(${versionCatalogPluginAccessor})`
                     : isKotlinDsl
                         ? `plugin("${versions_1.gradleProjectGraphPluginName}")`
-                        : `plugin "${versions_1.gradleProjectGraphPluginName}"`;
+                        : `plugin: "${versions_1.gradleProjectGraphPluginName}"`;
                 buildGradleContent = buildGradleContent.replace(/allprojects\s*\{/, `allprojects {\n    apply ${applyPlugin}`);
             }
         }

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

@@ -1,5 +1,5 @@
 import { NxJsonConfiguration } from '@nx/devkit';
-import { ExecFileOptions } from 'node:child_process';
+import { SpawnOptions } from 'node:child_process';
 export declare const fileSeparator: string;
 export declare const newLineSeparator: string;
 /**
@@ -14,7 +14,7 @@ export declare function getGradleExecFile(): string;
  * @param execOptions exec options
  * @returns promise with the stdout buffer
  */
-export declare function execGradleAsync(gradleBinaryPath: string, args: ReadonlyArray<string>, execOptions?: ExecFileOptions): Promise<Buffer>;
+export declare function execGradleAsync(gradleBinaryPath: string, args: ReadonlyArray<string>, execOptions?: Omit<SpawnOptions, 'shell'>): Promise<Buffer>;
 export declare function getCustomGradleExecutableDirectoryFromPlugin(nxJson: NxJsonConfiguration): string | undefined;
 /**
  * This function recursively finds the nearest gradlew file in the workspace

package/dist/src/utils/exec-gradle.js

@@ -7,12 +7,9 @@ exports.getCustomGradleExecutableDirectoryFromPlugin = getCustomGradleExecutable
 exports.findGradlewFile = findGradlewFile;
 exports.findGradlewUsingFilePathTraversal = findGradlewUsingFilePathTraversal;
 exports.findGradlewUsingCustomExecutableDirectory = findGradlewUsingCustomExecutableDirectory;
-const tslib_1 = require("tslib");
 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 tree_kill_1 = tslib_1.__importDefault(require("tree-kill"));
 const internal_1 = require("@nx/devkit/internal");
 exports.fileSeparator = process.platform.startsWith('win')
     ? 'file:///'
@@ -35,33 +32,39 @@ function getGradleExecFile() {
  * @returns promise with the stdout buffer
  */
 function execGradleAsync(gradleBinaryPath, args, execOptions = {}) {
-    // Extract signal so we can handle cancellation with tree-kill
+    // Extract signal so we can handle cancellation with a process-tree kill
     // instead of Node's default which only kills the immediate child.
     const { signal, ...restOptions } = execOptions;
     return new Promise((res, rej) => {
-        const cp = (0, node_child_process_1.execFile)(gradleBinaryPath, args, {
+        // Without the filter, empty args reach gradle as literal empty arguments.
+        const cp = (0, internal_1.safeSpawn)(gradleBinaryPath, args.filter(Boolean), {
             cwd: (0, node_path_1.dirname)(gradleBinaryPath),
-            shell: true,
-            windowsHide: true,
             env: process.env,
-            maxBuffer: internal_1.LARGE_BUFFER,
             ...restOptions,
-        }, undefined);
-        // Use tree-kill on abort to kill the entire process tree
-        // (cmd.exe → gradlew.bat → java.exe), not just the shell.
+        });
+        let stdout = Buffer.from('');
+        // On abort, kill the entire process tree (gradlew spawns java) and settle
+        // immediately — a wedged JVM that outlives the kill signal would otherwise
+        // keep this promise pending and the abort error would never surface.
         const onAbort = () => {
             if (cp.pid) {
-                (0, tree_kill_1.default)(cp.pid);
+                (0, internal_1.killProcessTreeGraceful)(cp.pid).catch(() => { });
             }
+            rej(stdout);
         };
         signal?.addEventListener('abort', onAbort, { once: true });
-        let stdout = Buffer.from('');
         cp.stdout?.on('data', (data) => {
             stdout += data;
         });
         cp.stderr?.on('data', (data) => {
             stdout += data;
         });
+        // Without a shell the child is gradlew itself, so spawn can fail outright —
+        // Node then emits `error` and never `exit`.
+        cp.on('error', (err) => {
+            signal?.removeEventListener('abort', onAbort);
+            rej(err);
+        });
         cp.on('exit', (code, s) => {
             signal?.removeEventListener('abort', onAbort);
             if (code === null)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "23.2.0-beta.7",
+  "version": "23.2.0-beta.9",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -76,12 +76,11 @@
   },
   "dependencies": {
     "toml-eslint-parser": "^0.10.0",
-    "tree-kill": "^1.2.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.2.0-beta.7"
+    "@nx/devkit": "23.2.0-beta.9"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.7"
+    "nx": "23.2.0-beta.9"
   },
   "publishConfig": {
     "access": "public"