@nx/gradle 20.5.0-canary.20250129-3f5e863 → 20.5.0-canary.20250201-05e0679

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "20.5.0-canary.20250129-3f5e863",
+  "version": "20.5.0-canary.20250201-05e0679",
   "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-canary.20250129-3f5e863"
+    "@nx/devkit": "20.5.0-canary.20250201-05e0679"
   },
   "publishConfig": {
     "access": "public"

package/src/plugin/dependencies.d.ts

@@ -1,3 +1,2 @@
-import { CreateDependencies, CreateDependenciesContext, RawProjectGraphDependency } from '@nx/devkit';
+import { CreateDependencies } from '@nx/devkit';
 export declare const createDependencies: CreateDependencies;
-export declare function processGradleDependencies(depsFile: string, gradleProjectNameToProjectRoot: Map<string, string>, sourceProjectName: string, gradleFile: string, context: CreateDependenciesContext, dependencies: Set<RawProjectGraphDependency>): void;

package/src/plugin/dependencies.js

@@ -1,13 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDependencies = void 0;
-exports.processGradleDependencies = processGradleDependencies;
 const devkit_1 = require("@nx/devkit");
-const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const get_gradle_report_1 = require("../utils/get-gradle-report");
 const split_config_files_1 = require("../utils/split-config-files");
-const get_project_report_lines_1 = require("../utils/get-project-report-lines");
 const createDependencies = async (_, context) => {
     const gradleFiles = findGradleFiles(context.filesToProcess);
     if (gradleFiles.length === 0) {
@@ -19,9 +16,20 @@ const createDependencies = async (_, context) => {
     for (const gradleFile of gradleFiles) {
         const gradleProject = gradleFileToGradleProjectMap.get(gradleFile);
         const projectName = Object.values(context.projects).find((project) => project.root === (0, node_path_1.dirname)(gradleFile))?.name;
-        const depsFile = buildFileToDepsMap.get(gradleFile);
-        if (projectName && depsFile) {
-            processGradleDependencies(depsFile, gradleProjectNameToProjectRootMap, projectName, gradleFile, context, dependencies);
+        const dependedProjects = buildFileToDepsMap.get(gradleFile);
+        if (projectName && dependedProjects?.size) {
+            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);
+            });
         }
         gradleProjectToChildProjects.get(gradleProject)?.forEach((childProject) => {
             if (childProject) {
@@ -52,46 +60,3 @@ function findGradleFiles(fileMap) {
     }
     return gradleFiles;
 }
-function processGradleDependencies(depsFile, gradleProjectNameToProjectRoot, sourceProjectName, gradleFile, context, dependencies) {
-    const lines = (0, node_fs_1.readFileSync)(depsFile).toString().split(get_project_report_lines_1.newLineSeparator);
-    let inDeps = false;
-    for (const line of lines) {
-        if (line.startsWith('implementationDependenciesMetadata') ||
-            line.startsWith('compileClasspath')) {
-            inDeps = true;
-            continue;
-        }
-        if (inDeps) {
-            if (line === '') {
-                inDeps = false;
-                continue;
-            }
-            const [indents, dep] = line.split('--- ');
-            if (indents === '\\' || indents === '+') {
-                let gradleProjectName;
-                if (dep.startsWith('project ')) {
-                    gradleProjectName = dep
-                        .substring('project '.length)
-                        .replace(/ \(n\)$/, '')
-                        .trim();
-                }
-                else if (dep.includes('-> project')) {
-                    const [_, projectName] = dep.split('-> project');
-                    gradleProjectName = projectName.trim();
-                }
-                const targetProjectRoot = gradleProjectNameToProjectRoot.get(gradleProjectName);
-                const targetProjectName = Object.values(context.projects).find((project) => project.root === targetProjectRoot)?.name;
-                if (targetProjectName) {
-                    const dependency = {
-                        source: sourceProjectName,
-                        target: targetProjectName,
-                        type: devkit_1.DependencyType.static,
-                        sourceFile: gradleFile,
-                    };
-                    (0, devkit_1.validateDependency)(dependency, context);
-                    dependencies.add(dependency);
-                }
-            }
-        }
-    }
-}

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

@@ -1,9 +1,9 @@
 export interface GradleReport {
     gradleFileToGradleProjectMap: Map<string, string>;
-    buildFileToDepsMap: Map<string, string>;
+    buildFileToDepsMap: Map<string, Set<string>>;
     gradleFileToOutputDirsMap: Map<string, Map<string, string>>;
     gradleProjectToTasksTypeMap: Map<string, Map<string, string>>;
-    gradleProjectToTasksMap: Map<string, Set<String>>;
+    gradleProjectToTasksMap: Map<string, Set<string>>;
     gradleProjectToProjectName: Map<string, string>;
     gradleProjectNameToProjectRootMap: Map<string, string>;
     gradleProjectToChildProjects: Map<string, string[]>;
@@ -11,10 +11,10 @@ export interface GradleReport {
 export interface GradleReportJSON {
     hash: string;
     gradleFileToGradleProjectMap: Record<string, string>;
-    buildFileToDepsMap: Record<string, string>;
+    buildFileToDepsMap: Record<string, Set<string>>;
     gradleFileToOutputDirsMap: Record<string, Record<string, string>>;
     gradleProjectToTasksTypeMap: Record<string, Record<string, string>>;
-    gradleProjectToTasksMap: Record<string, Array<String>>;
+    gradleProjectToTasksMap: Record<string, Array<string>>;
     gradleProjectToProjectName: Record<string, string>;
     gradleProjectNameToProjectRootMap: Record<string, string>;
     gradleProjectToChildProjects: Record<string, string[]>;
@@ -33,3 +33,4 @@ export declare function getCurrentGradleReport(): GradleReport;
  */
 export declare function populateGradleReport(workspaceRoot: string, gradlewFiles: string[]): Promise<void>;
 export declare function processProjectReports(projectReportLines: string[]): GradleReport;
+export declare function processGradleDependencies(depsFile: string): Set<string>;

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

@@ -4,6 +4,7 @@ exports.writeGradleReportToCache = writeGradleReportToCache;
 exports.getCurrentGradleReport = getCurrentGradleReport;
 exports.populateGradleReport = populateGradleReport;
 exports.processProjectReports = processProjectReports;
+exports.processGradleDependencies = processGradleDependencies;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const devkit_1 = require("@nx/devkit");
@@ -184,7 +185,10 @@ function processProjectReports(projectReportLines) {
                 }
                 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);
-                buildFileToDepsMap.set(buildFile, dependenciesMap.get(gradleProject));
+                const depsFile = dependenciesMap.get(gradleProject);
+                if (depsFile) {
+                    buildFileToDepsMap.set(buildFile, processGradleDependencies(depsFile));
+                }
                 outputDirMap.set('build', `{workspaceRoot}/${buildDir}`);
                 outputDirMap.set('classes', `{workspaceRoot}/${(0, node_path_1.join)(buildDir, 'classes')}`);
                 gradleFileToOutputDirsMap.set(buildFile, outputDirMap);
@@ -238,3 +242,39 @@ function processProjectReports(projectReportLines) {
         gradleProjectToChildProjects,
     };
 }
+function processGradleDependencies(depsFile) {
+    const dependedProjects = new Set();
+    const lines = (0, node_fs_1.readFileSync)(depsFile).toString().split(get_project_report_lines_1.newLineSeparator);
+    let inDeps = false;
+    for (const line of lines) {
+        if (line.startsWith('implementationDependenciesMetadata') ||
+            line.startsWith('compileClasspath')) {
+            inDeps = true;
+            continue;
+        }
+        if (inDeps) {
+            if (line === '') {
+                inDeps = false;
+                continue;
+            }
+            const [indents, dep] = line.split('--- ');
+            if (indents === '\\' || indents === '+') {
+                let targetProjectName;
+                if (dep.startsWith('project ')) {
+                    targetProjectName = dep
+                        .substring('project '.length)
+                        .replace(/ \(n\)$/, '')
+                        .trim();
+                }
+                else if (dep.includes('-> project')) {
+                    const [_, projectName] = dep.split('-> project');
+                    targetProjectName = projectName.trim();
+                }
+                if (targetProjectName) {
+                    dependedProjects.add(targetProjectName);
+                }
+            }
+        }
+    }
+    return dependedProjects;
+}