@nx/gradle 21.3.0-canary.20250703-84ce831 → 21.3.0-canary.20250704-e92cbee

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "21.3.0-canary.20250703-84ce831",
+  "version": "21.3.0-canary.20250704-e92cbee",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -35,7 +35,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "21.3.0-canary.20250703-84ce831"
+    "@nx/devkit": "21.3.0-canary.20250704-e92cbee"
   },
   "publishConfig": {
     "access": "public"

package/src/plugin/nodes.js

@@ -20,14 +20,17 @@ function writeTargetsToCache(cachePath, results) {
 exports.createNodesV2 = [
     split_config_files_1.gradleConfigAndTestGlob,
     async (files, options, context) => {
-        const { buildFiles, gradlewFiles } = (0, split_config_files_1.splitConfigFiles)(files);
+        const { buildFiles: buildFilesFromSplitConfigFiles, gradlewFiles } = (0, split_config_files_1.splitConfigFiles)(files);
         const optionsHash = (0, file_hasher_1.hashObject)(options);
         const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `gradle-${optionsHash}.hash`);
         const projectsCache = readProjectsCache(cachePath);
         await (0, get_project_graph_from_gradle_plugin_1.populateProjectGraph)(context.workspaceRoot, gradlewFiles.map((f) => (0, node_path_1.join)(context.workspaceRoot, f)), options);
-        const { nodes, externalNodes } = (0, get_project_graph_from_gradle_plugin_1.getCurrentProjectGraphReport)();
+        const report = (0, get_project_graph_from_gradle_plugin_1.getCurrentProjectGraphReport)();
+        const { nodes, externalNodes, buildFiles = [] } = report;
+        // Combine buildFilesFromSplitConfigFiles and buildFiles, making each value distinct
+        const allBuildFiles = Array.from(new Set([...buildFilesFromSplitConfigFiles, ...buildFiles]));
         try {
-            return (0, devkit_1.createNodesFromFiles)((0, exports.makeCreateNodesForGradleConfigFile)(nodes, projectsCache, externalNodes), buildFiles, options, context);
+            return (0, devkit_1.createNodesFromFiles)((0, exports.makeCreateNodesForGradleConfigFile)(nodes, projectsCache, externalNodes), allBuildFiles, options, context);
         }
         finally {
             writeTargetsToCache(cachePath, projectsCache);

package/src/plugin/utils/__mocks__/gradle_composite.json

@@ -1,4 +1,5 @@
 {
+  "buildFiles": ["nested/nested/proj/build.gradle"],
   "nodes": {
     "nested/nested/proj": {
       "targets": {

package/src/plugin/utils/__mocks__/gradle_tutorial.json

@@ -1,4 +1,5 @@
 {
+  "buildFiles": ["proj/build.gradle"],
   "nodes": {
     "proj": {
       "targets": {

package/src/plugin/utils/get-project-graph-from-gradle-plugin.d.ts

@@ -6,12 +6,14 @@ export interface ProjectGraphReport {
     };
     dependencies: Array<StaticDependency>;
     externalNodes?: Record<string, ProjectGraphExternalNode>;
+    buildFiles?: string[];
 }
 export interface ProjectGraphReportCache extends ProjectGraphReport {
     hash: string;
 }
 export declare function writeProjectGraphReportToCache(cachePath: string, results: ProjectGraphReport): void;
 export declare function getCurrentProjectGraphReport(): ProjectGraphReport;
+export declare function getCurrentBuildFiles(): string[];
 /**
  * This function populates the gradle report cache.
  * For each gradlew file, it runs the `nxProjectGraph` task and processes the output.

package/src/plugin/utils/get-project-graph-from-gradle-plugin.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeProjectGraphReportToCache = writeProjectGraphReportToCache;
 exports.getCurrentProjectGraphReport = getCurrentProjectGraphReport;
+exports.getCurrentBuildFiles = getCurrentBuildFiles;
 exports.populateProjectGraph = populateProjectGraph;
 exports.processNxProjectGraph = processNxProjectGraph;
 const node_fs_1 = require("node:fs");
@@ -42,6 +43,10 @@ function getCurrentProjectGraphReport() {
     }
     return projectGraphReportCache;
 }
+function getCurrentBuildFiles() {
+    const report = getCurrentProjectGraphReport();
+    return report.buildFiles || [];
+}
 /**
  * This function populates the gradle report cache.
  * For each gradlew file, it runs the `nxProjectGraph` task and processes the output.
@@ -84,6 +89,7 @@ function processNxProjectGraph(projectGraphLines) {
         dependencies: [],
         externalNodes: {},
     };
+    const allBuildFiles = new Set();
     while (index < projectGraphLines.length) {
         const line = projectGraphLines[index].trim();
         if (line.startsWith('> Task ') && line.endsWith(':nxProjectGraph')) {
@@ -106,8 +112,13 @@ function processNxProjectGraph(projectGraphLines) {
                     ...projectGraphReportJson.externalNodes,
                 };
             }
+            if (projectGraphReportJson.buildFiles) {
+                projectGraphReportJson.buildFiles.forEach((buildFile) => allBuildFiles.add(buildFile));
+            }
         }
         index++;
     }
+    // Convert Set to array for the final result
+    projectGraphReportForAllProjects.buildFiles = Array.from(allBuildFiles);
     return projectGraphReportForAllProjects;
 }