@nx/gradle 19.0.0-canary.20240420-9ca53b7 → 19.0.0-canary.20240425-cec57c4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "19.0.0-canary.20240420-9ca53b7",
+  "version": "19.0.0-canary.20240425-cec57c4",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -33,7 +33,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "19.0.0-canary.20240420-9ca53b7"
+    "@nx/devkit": "19.0.0-canary.20240425-cec57c4"
   },
   "publishConfig": {
     "access": "public"

package/src/plugin/nodes.js

@@ -90,8 +90,9 @@ function createGradleTargets(tasks, projectRoot, options, context, outputDirs) {
     for (const task of tasks) {
         const targetName = options?.[`${task.name}TargetName`] ?? task.name;
         const outputs = outputDirs.get(task.name);
+        const path = (0, node_path_1.relative)((0, node_path_1.join)(context.workspaceRoot, projectRoot), (0, exec_gradle_1.getGradleBinaryPath)());
         targets[targetName] = {
-            command: `${(0, exec_gradle_1.getGradleBinaryPath)()} ${task.name}`,
+            command: `${path} ${task.name}`,
             options: {
                 cwd: projectRoot,
             },

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

@@ -2,6 +2,6 @@
 /// <reference types="node" />
 import { ExecFileOptions } from 'child_process';
 import { ExecFileSyncOptionsWithBufferEncoding } from 'node:child_process';
-export declare function execGradle(args: string[], execOptions: ExecFileSyncOptionsWithBufferEncoding): Buffer;
+export declare function execGradle(args: string[], execOptions?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
 export declare function getGradleBinaryPath(): string;
-export declare function execGradleAsync(args: ReadonlyArray<string>, execOptions: ExecFileOptions): Promise<Buffer>;
+export declare function execGradleAsync(args: ReadonlyArray<string>, execOptions?: ExecFileOptions): Promise<Buffer>;

package/src/utils/exec-gradle.js

@@ -23,9 +23,6 @@ function getGradleBinaryPath() {
 exports.getGradleBinaryPath = getGradleBinaryPath;
 function execGradleAsync(args, execOptions) {
     const gradleBinaryPath = getGradleBinaryPath();
-    if (!(0, node_fs_1.existsSync)(gradleBinaryPath)) {
-        throw new Error('Gradle is not setup. Run "gradle init"');
-    }
     return new Promise((res, rej) => {
         const cp = (0, node_child_process_1.execFile)(gradleBinaryPath, args, execOptions);
         let stdout = Buffer.from('');

package/src/utils/get-gradle-report.d.ts

@@ -1,4 +1,5 @@
-interface GradleReport {
+export declare const fileSeparator: string;
+export interface GradleReport {
     gradleFileToGradleProjectMap: Map<string, string>;
     buildFileToDepsMap: Map<string, string>;
     gradleFileToOutputDirsMap: Map<string, Map<string, string>>;
@@ -7,4 +8,4 @@ interface GradleReport {
 }
 export declare function invalidateGradleReportCache(): void;
 export declare function getGradleReport(): GradleReport;
-export {};
+export declare function processProjectReports(projectReportLines: string[]): GradleReport;

package/src/utils/get-gradle-report.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGradleReport = exports.invalidateGradleReportCache = void 0;
+exports.processProjectReports = exports.getGradleReport = exports.invalidateGradleReportCache = exports.fileSeparator = void 0;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const devkit_1 = require("@nx/devkit");
 const exec_gradle_1 = require("./exec-gradle");
-const fileSeparator = process.platform.startsWith('win')
+exports.fileSeparator = process.platform.startsWith('win')
     ? 'file:///'
     : 'file://';
 const newLineSeparator = process.platform.startsWith('win') ? '\r\n' : '\n';
@@ -54,20 +54,29 @@ function processProjectReports(projectReportLines) {
      * e.g. {build.gradle.kts: { projectReportDir: '' testReportDir: '' }}
      */
     const gradleFileToOutputDirsMap = new Map();
-    projectReportLines.forEach((line, index) => {
+    let index = 0;
+    while (index < projectReportLines.length) {
+        const line = projectReportLines[index].trim();
         if (line.startsWith('> Task ')) {
-            const nextLine = projectReportLines[index + 1];
             if (line.endsWith(':dependencyReport')) {
                 const gradleProject = line.substring('> Task '.length, line.length - ':dependencyReport'.length);
-                const [_, file] = nextLine.split(fileSeparator);
+                while (index < projectReportLines.length &&
+                    !projectReportLines[index].includes(exports.fileSeparator)) {
+                    index++;
+                }
+                const [_, file] = projectReportLines[index].split(exports.fileSeparator);
                 dependenciesMap.set(gradleProject, file);
             }
             if (line.endsWith('propertyReport')) {
                 const gradleProject = line.substring('> Task '.length, line.length - ':propertyReport'.length);
-                const [_, file] = nextLine.split(fileSeparator);
-                const propertyReportLines = (0, node_fs_1.readFileSync)(file)
-                    .toString()
-                    .split(newLineSeparator);
+                while (index < projectReportLines.length &&
+                    !projectReportLines[index].includes(exports.fileSeparator)) {
+                    index++;
+                }
+                const [_, file] = projectReportLines[index].split(exports.fileSeparator);
+                const propertyReportLines = (0, node_fs_1.existsSync)(file)
+                    ? (0, node_fs_1.readFileSync)(file).toString().split(newLineSeparator)
+                    : [];
                 let projectName, absBuildFilePath, absBuildDirPath;
                 const outputDirMap = new Map();
                 for (const line of propertyReportLines) {
@@ -87,7 +96,7 @@ function processProjectReports(projectReportLines) {
                     }
                 }
                 if (!projectName || !absBuildFilePath || !absBuildDirPath) {
-                    return;
+                    continue;
                 }
                 const buildFile = (0, devkit_1.normalizePath)((0, node_path_1.relative)(devkit_1.workspaceRoot, absBuildFilePath));
                 const buildDir = (0, node_path_1.relative)(devkit_1.workspaceRoot, absBuildDirPath);
@@ -101,11 +110,15 @@ function processProjectReports(projectReportLines) {
             }
             if (line.endsWith('taskReport')) {
                 const gradleProject = line.substring('> Task '.length, line.length - ':taskReport'.length);
-                const [_, file] = nextLine.split(fileSeparator);
+                while (index < projectReportLines.length &&
+                    !projectReportLines[index].includes(exports.fileSeparator)) {
+                    index++;
+                }
+                const [_, file] = projectReportLines[index].split(exports.fileSeparator);
                 const taskTypeMap = new Map();
-                const tasksFileLines = (0, node_fs_1.readFileSync)(file)
-                    .toString()
-                    .split(newLineSeparator);
+                const tasksFileLines = (0, node_fs_1.existsSync)(file)
+                    ? (0, node_fs_1.readFileSync)(file).toString().split(newLineSeparator)
+                    : [];
                 let i = 0;
                 while (i < tasksFileLines.length) {
                     const line = tasksFileLines[i];
@@ -125,7 +138,8 @@ function processProjectReports(projectReportLines) {
                 gradleProjectToTasksTypeMap.set(gradleProject, taskTypeMap);
             }
         }
-    });
+        index++;
+    }
     return {
         gradleFileToGradleProjectMap,
         buildFileToDepsMap,
@@ -134,3 +148,4 @@ function processProjectReports(projectReportLines) {
         gradleProjectToProjectName,
     };
 }
+exports.processProjectReports = processProjectReports;