@nx/gradle 22.7.0-beta.10 → 22.7.0-beta.12

package/migrations.json

@@ -119,6 +119,12 @@
       "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"
     }
   },
   "packageJsonUpdates": {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "22.7.0-beta.10",
+  "version": "22.7.0-beta.12",
   "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": "22.7.0-beta.10",
+    "@nx/devkit": "22.7.0-beta.12",
     "toml-eslint-parser": "^0.10.0",
     "tree-kill": "^1.2.2",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.7.0-beta.10"
+    "nx": "22.7.0-beta.12"
   },
   "publishConfig": {
     "access": "public"

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");
@@ -115,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/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/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.18";
+export declare const gradleProjectGraphVersion = "0.1.19";
 //# 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.18';
+exports.gradleProjectGraphVersion = '0.1.19';