@nx/gradle 20.4.4 → 20.5.0-beta.0

package/generators.json

@@ -5,8 +5,7 @@
     "init": {
       "factory": "./src/generators/init/init#initGenerator",
       "schema": "./src/generators/init/schema.json",
-      "description": "Initializes a Gradle project in the current workspace",
-      "hidden": true
+      "description": "Initializes a Gradle project in the current workspace"
     },
     "ci-workflow": {
       "factory": "./src/generators/ci-workflow/generator",

package/package.json

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

package/src/plugin/dependencies.d.ts

@@ -1,2 +1,3 @@
-import { CreateDependencies } from '@nx/devkit';
+import { CreateDependencies, CreateDependenciesContext, RawProjectGraphDependency } 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,10 +1,13 @@
 "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) {
@@ -16,22 +19,9 @@ 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 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;
-                if (targetProjectName) {
-                    const dependency = {
-                        source: projectName,
-                        target: targetProjectName,
-                        type: devkit_1.DependencyType.static,
-                        sourceFile: gradleFile,
-                    };
-                    (0, devkit_1.validateDependency)(dependency, context);
-                    dependencies.add(dependency);
-                }
-            });
+        const depsFile = buildFileToDepsMap.get(gradleFile);
+        if (projectName && depsFile) {
+            processGradleDependencies(depsFile, gradleProjectNameToProjectRootMap, projectName, gradleFile, context, dependencies);
         }
         gradleProjectToChildProjects.get(gradleProject)?.forEach((childProject) => {
             if (childProject) {
@@ -62,3 +52,46 @@ 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/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,7 +7,6 @@ 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
@@ -29,7 +28,6 @@ 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.d.ts

@@ -1,9 +1,9 @@
 export interface GradleReport {
     gradleFileToGradleProjectMap: Map<string, string>;
-    buildFileToDepsMap: Map<string, Set<string>>;
+    buildFileToDepsMap: Map<string, 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, Set<string>>;
+    buildFileToDepsMap: Record<string, 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,4 +33,3 @@ 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,7 +4,6 @@ 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");
@@ -185,10 +184,7 @@ 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);
-                const depsFile = dependenciesMap.get(gradleProject);
-                if (depsFile) {
-                    buildFileToDepsMap.set(buildFile, processGradleDependencies(depsFile));
-                }
+                buildFileToDepsMap.set(buildFile, dependenciesMap.get(gradleProject));
                 outputDirMap.set('build', `{workspaceRoot}/${buildDir}`);
                 outputDirMap.set('classes', `{workspaceRoot}/${(0, node_path_1.join)(buildDir, 'classes')}`);
                 gradleFileToOutputDirsMap.set(buildFile, outputDirMap);
@@ -242,40 +238,3 @@ 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()
-                        .split(' ')?.[0];
-                }
-                else if (dep.includes('-> project')) {
-                    const [_, projectName] = dep.split('-> project');
-                    targetProjectName = projectName.trim().split(' ')?.[0];
-                }
-                if (targetProjectName) {
-                    dependedProjects.add(targetProjectName);
-                }
-            }
-        }
-    }
-    return dependedProjects;
-}

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

@@ -28,7 +28,6 @@ async function getProjectReportLines(gradlewFile) {
     try {
         projectReportBuffer = await (0, exec_gradle_1.execGradleAsync)(gradlewFile, [
             'projectReportAll',
-            process.env.NX_VERBOSE_LOGGING === 'true' ? '--info' : '',
         ]);
     }
     catch (e) {
@@ -65,15 +64,8 @@ async function getProjectReportLines(gradlewFile) {
             ], []);
         }
     }
-    const projectReportLines = projectReportBuffer
+    return 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;
 }