@nx/gradle 20.5.0-beta.1 → 20.5.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "20.5.0-beta.1",
+  "version": "20.5.0-beta.3",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -34,7 +34,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "20.5.0-beta.1"
+    "@nx/devkit": "20.5.0-beta.3"
   },
   "publishConfig": {
     "access": "public"

package/src/plugin/dependencies.js

@@ -21,14 +21,16 @@ const createDependencies = async (_, context) => {
             dependedProjects?.forEach((dependedProject) => {
                 const targetProjectRoot = gradleProjectNameToProjectRootMap.get(dependedProject);
                 const targetProjectName = Object.values(context.projects).find((project) => project.root === targetProjectRoot)?.name;
-                const dependency = {
-                    source: projectName,
-                    target: targetProjectName,
-                    type: devkit_1.DependencyType.static,
-                    sourceFile: gradleFile,
-                };
-                (0, devkit_1.validateDependency)(dependency, context);
-                dependencies.add(dependency);
+                if (targetProjectName) {
+                    const dependency = {
+                        source: projectName,
+                        target: targetProjectName,
+                        type: devkit_1.DependencyType.static,
+                        sourceFile: gradleFile,
+                    };
+                    (0, devkit_1.validateDependency)(dependency, context);
+                    dependencies.add(dependency);
+                }
             });
         }
         gradleProjectToChildProjects.get(gradleProject)?.forEach((childProject) => {

package/src/plugin/nodes.js

@@ -94,7 +94,7 @@ async function createGradleProject(gradleReport, gradleFilePath, options, contex
         let tasks = [];
         tasksSet.forEach((taskName) => {
             tasks.push({
-                type: tasksTypeMap.get(taskName),
+                type: tasksTypeMap?.get(taskName),
                 name: taskName,
             });
         });

package/src/utils/exec-gradle.js

@@ -7,6 +7,7 @@ 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 run_commands_impl_1 = require("nx/src/executors/run-commands/run-commands.impl");
 /**
  * For gradle command, it needs to be run from the directory of the gradle binary
  * @returns gradle binary file name
@@ -28,6 +29,7 @@ function execGradleAsync(gradleBinaryPath, args, execOptions = {}) {
             shell: true,
             windowsHide: true,
             env: process.env,
+            maxBuffer: run_commands_impl_1.LARGE_BUFFER,
             ...execOptions,
         });
         let stdout = Buffer.from('');

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

@@ -264,11 +264,12 @@ function processGradleDependencies(depsFile) {
                     targetProjectName = dep
                         .substring('project '.length)
                         .replace(/ \(n\)$/, '')
-                        .trim();
+                        .trim()
+                        .split(' ')?.[0];
                 }
                 else if (dep.includes('-> project')) {
                     const [_, projectName] = dep.split('-> project');
-                    targetProjectName = projectName.trim();
+                    targetProjectName = projectName.trim().split(' ')?.[0];
                 }
                 if (targetProjectName) {
                     dependedProjects.add(targetProjectName);

package/src/utils/get-project-report-lines.js

@@ -28,6 +28,7 @@ async function getProjectReportLines(gradlewFile) {
     try {
         projectReportBuffer = await (0, exec_gradle_1.execGradleAsync)(gradlewFile, [
             'projectReportAll',
+            process.env.NX_VERBOSE_LOGGING === 'true' ? '--info' : '',
         ]);
     }
     catch (e) {
@@ -64,8 +65,15 @@ async function getProjectReportLines(gradlewFile) {
             ], []);
         }
     }
-    return projectReportBuffer
+    const projectReportLines = projectReportBuffer
         .toString()
         .split(exports.newLineSeparator)
         .filter((line) => line.trim() !== '');
+    if (process.env.NX_VERBOSE_LOGGING === 'true') {
+        devkit_1.output.log({
+            title: `Successfully ran projectReportAll or projectRerport task using ${gradlewFile}`,
+            bodyLines: projectReportLines,
+        });
+    }
+    return projectReportLines;
 }