@nx/gradle 19.7.0-beta.1 → 19.7.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "19.7.0-beta.1",
+  "version": "19.7.0-beta.2",
   "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": "19.7.0-beta.1"
+    "@nx/devkit": "19.7.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/src/plugin/dependencies.d.ts

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

@@ -12,14 +12,14 @@ const createDependencies = async (_, context) => {
         return [];
     }
     const gradleDependenciesStart = performance.mark('gradleDependencies:start');
-    const { gradleFileToGradleProjectMap, gradleProjectToProjectName, buildFileToDepsMap, gradleProjectToChildProjects, } = (0, get_gradle_report_1.getCurrentGradleReport)();
+    const { gradleFileToGradleProjectMap, gradleProjectNameToProjectRootMap, buildFileToDepsMap, gradleProjectToChildProjects, } = (0, get_gradle_report_1.getCurrentGradleReport)();
     const dependencies = new Set();
     for (const gradleFile of gradleFiles) {
         const gradleProject = gradleFileToGradleProjectMap.get(gradleFile);
-        const projectName = gradleProjectToProjectName.get(gradleProject);
+        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, gradleProjectToProjectName, projectName, gradleFile, context, dependencies);
+            processGradleDependencies(depsFile, gradleProjectNameToProjectRootMap, projectName, gradleFile, context, dependencies);
         }
         gradleProjectToChildProjects.get(gradleProject)?.forEach((childProject) => {
             if (childProject) {
@@ -50,7 +50,7 @@ function findGradleFiles(fileMap) {
     }
     return gradleFiles;
 }
-function processGradleDependencies(depsFile, gradleProjectToProjectName, sourceProjectName, gradleFile, context, dependencies) {
+function processGradleDependencies(depsFile, gradleProjectNameToProjectRoot, sourceProjectName, gradleFile, context, dependencies) {
     const lines = (0, node_fs_1.readFileSync)(depsFile).toString().split(get_gradle_report_1.newLineSeparator);
     let inDeps = false;
     for (const line of lines) {
@@ -77,11 +77,12 @@ function processGradleDependencies(depsFile, gradleProjectToProjectName, sourceP
                     const [_, projectName] = dep.split('-> project');
                     gradleProjectName = projectName.trim();
                 }
-                const target = gradleProjectToProjectName.get(gradleProjectName);
-                if (target) {
+                const targetProjectRoot = gradleProjectNameToProjectRoot.get(gradleProjectName);
+                const targetProjectName = Object.values(context.projects).find((project) => project.root === targetProjectRoot)?.name;
+                if (targetProjectName) {
                     const dependency = {
                         source: sourceProjectName,
-                        target,
+                        target: targetProjectName,
                         type: devkit_1.DependencyType.static,
                         sourceFile: gradleFile,
                     };

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

@@ -6,6 +6,7 @@ export interface GradleReport {
     gradleFileToOutputDirsMap: Map<string, Map<string, string>>;
     gradleProjectToTasksTypeMap: Map<string, Map<string, string>>;
     gradleProjectToProjectName: Map<string, string>;
+    gradleProjectNameToProjectRootMap: Map<string, string>;
     gradleProjectToChildProjects: Map<string, string[]>;
 }
 export declare const GRADLE_BUILD_FILES: Set<string>;

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

@@ -10,6 +10,7 @@ const devkit_1 = require("@nx/devkit");
 const globs_1 = require("nx/src/utils/globs");
 const exec_gradle_1 = require("./exec-gradle");
 const workspace_context_1 = require("nx/src/utils/workspace-context");
+const path_1 = require("path");
 exports.fileSeparator = process.platform.startsWith('win')
     ? 'file:///'
     : 'file://';
@@ -82,6 +83,7 @@ function processProjectReports(projectReportLines) {
      */
     const gradleProjectToTasksTypeMap = new Map();
     const gradleProjectToProjectName = new Map();
+    const gradleProjectNameToProjectRootMap = new Map();
     /**
      * Map of buildFile to dependencies report path
      */
@@ -152,6 +154,7 @@ function processProjectReports(projectReportLines) {
                 gradleFileToOutputDirsMap.set(buildFile, outputDirMap);
                 gradleFileToGradleProjectMap.set(buildFile, gradleProject);
                 gradleProjectToProjectName.set(gradleProject, projectName);
+                gradleProjectNameToProjectRootMap.set(projectName, (0, path_1.dirname)(buildFile));
             }
             if (line.endsWith('taskReport')) {
                 const gradleProject = line.substring('> Task '.length, line.length - ':taskReport'.length);
@@ -193,6 +196,7 @@ function processProjectReports(projectReportLines) {
         gradleFileToOutputDirsMap,
         gradleProjectToTasksTypeMap,
         gradleProjectToProjectName,
+        gradleProjectNameToProjectRootMap,
         gradleProjectToChildProjects,
     };
 }