@nx/gradle 21.0.0-canary.20250206-8bd0bcd → 21.0.0-canary.20250418-8619c1d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "21.0.0-canary.20250206-8bd0bcd",
+  "version": "21.0.0-canary.20250418-8619c1d",
   "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": "21.0.0-canary.20250206-8bd0bcd"
+    "@nx/devkit": "21.0.0-canary.20250418-8619c1d"
   },
   "publishConfig": {
     "access": "public"

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

@@ -17,6 +17,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          filter: tree:0
 
       # This enables task distribution via Nx Cloud
       # Run this command as early as possible, before dependencies are installed

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/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

@@ -4,8 +4,6 @@ exports.newLineSeparator = exports.fileSeparator = void 0;
 exports.getProjectReportLines = getProjectReportLines;
 const devkit_1 = require("@nx/devkit");
 const exec_gradle_1 = require("./exec-gradle");
-const fs_1 = require("fs");
-const path_1 = require("path");
 exports.fileSeparator = process.platform.startsWith('win')
     ? 'file:///'
     : 'file://';
@@ -19,15 +17,13 @@ exports.newLineSeparator = process.platform.startsWith('win')
  */
 async function getProjectReportLines(gradlewFile) {
     let projectReportBuffer;
-    // if there is no build.gradle or build.gradle.kts file, we cannot run the projectReport nor projectReportAll task
-    if (!(0, fs_1.existsSync)((0, path_1.join)((0, path_1.dirname)(gradlewFile), 'build.gradle')) &&
-        !(0, fs_1.existsSync)((0, path_1.join)((0, path_1.dirname)(gradlewFile), 'build.gradle.kts'))) {
-        devkit_1.logger.warn(`Could not find build file near ${gradlewFile}. Please run 'nx generate @nx/gradle:init' to generate the necessary tasks.`);
-        return [];
-    }
+    // Attempt to run projectReport or projectReportAll task, regardless of build.gradle or build.gradle.kts location
     try {
         projectReportBuffer = await (0, exec_gradle_1.execGradleAsync)(gradlewFile, [
             'projectReportAll',
+            process.env.NX_VERBOSE_LOGGING === 'true' ? '--info' : '',
+            '--exclude-task',
+            'htmlDependencyReport',
         ]);
     }
     catch (e) {
@@ -64,8 +60,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;
 }