@nx/gradle 19.6.1 → 19.6.2

package/README.md

@@ -24,7 +24,7 @@
 
 # Nx: Smart Monorepos · Fast CI
 
-Nx is a build system with built-in tooling and advanced CI capabilities. It helps you maintain and scale monorepos, both locally and on CI.
+Nx is a build system, optimized for monorepos, with plugins for popular frameworks and tools and advanced CI capabilities including caching and distribution.
 
 This package is a [Gradle plugin for Nx](https://nx.dev/gradle/overview).
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "19.6.1",
+  "version": "19.6.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.6.1"
+    "@nx/devkit": "19.6.2"
   },
   "publishConfig": {
     "access": "public"

package/src/plugin/dependencies.js

@@ -12,7 +12,7 @@ const createDependencies = async (_, context) => {
         return [];
     }
     const gradleDependenciesStart = performance.mark('gradleDependencies:start');
-    const { gradleFileToGradleProjectMap, gradleProjectToProjectName, buildFileToDepsMap, } = (0, get_gradle_report_1.getCurrentGradleReport)();
+    const { gradleFileToGradleProjectMap, gradleProjectToProjectName, buildFileToDepsMap, gradleProjectToChildProjects, } = (0, get_gradle_report_1.getCurrentGradleReport)();
     const dependencies = new Set();
     for (const gradleFile of gradleFiles) {
         const gradleProject = gradleFileToGradleProjectMap.get(gradleFile);
@@ -21,6 +21,18 @@ const createDependencies = async (_, context) => {
         if (projectName && depsFile) {
             processGradleDependencies(depsFile, gradleProjectToProjectName, projectName, gradleFile, context, dependencies);
         }
+        gradleProjectToChildProjects.get(gradleProject)?.forEach((childProject) => {
+            if (childProject) {
+                const dependency = {
+                    source: projectName,
+                    target: childProject,
+                    type: devkit_1.DependencyType.static,
+                    sourceFile: gradleFile,
+                };
+                (0, devkit_1.validateDependency)(dependency, context);
+                dependencies.add(dependency);
+            }
+        });
     }
     const gradleDependenciesEnd = performance.mark('gradleDependencies:end');
     performance.measure('gradleDependencies', gradleDependenciesStart.name, gradleDependenciesEnd.name);

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>;
+    gradleProjectToChildProjects: Map<string, string[]>;
 }
 export declare const GRADLE_BUILD_FILES: Set<string>;
 export declare const GRADLE_TEST_FILES: string[];

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

@@ -91,6 +91,10 @@ function processProjectReports(projectReportLines) {
      * e.g. {build.gradle.kts: { projectReportDir: '' testReportDir: '' }}
      */
     const gradleFileToOutputDirsMap = new Map();
+    /**
+     * Map of Gradle Project to its child projects
+     */
+    const gradleProjectToChildProjects = new Map();
     let index = 0;
     while (index < projectReportLines.length) {
         const line = projectReportLines[index].trim();
@@ -126,6 +130,11 @@ function processProjectReports(projectReportLines) {
                     if (line.startsWith('buildDir: ')) {
                         absBuildDirPath = line.substring('buildDir: '.length);
                     }
+                    if (line.startsWith('childProjects: ')) {
+                        const childProjects = line.substring('childProjects: {'.length); // remove curly braces {} around childProjects
+                        gradleProjectToChildProjects.set(gradleProject, childProjects.split(',').map((c) => c.trim().split('=')[0]) // e.g. get project name from text like "app=project ':app', mylibrary=project ':mylibrary'"
+                        );
+                    }
                     if (line.includes('Dir: ')) {
                         const [dirName, dirPath] = line.split(': ');
                         const taskName = dirName.replace('Dir', '');
@@ -163,7 +172,9 @@ function processProjectReports(projectReportLines) {
                         if (tasksFileLines[i + 1] === dashes) {
                             const type = line.substring(0, line.length - ' tasks'.length);
                             i++;
-                            while (tasksFileLines[++i] !== '') {
+                            while (tasksFileLines[++i] !== '' &&
+                                i < tasksFileLines.length &&
+                                tasksFileLines[i]?.includes(' - ')) {
                                 const [taskName] = tasksFileLines[i].split(' - ');
                                 taskTypeMap.set(taskName, type);
                             }
@@ -182,5 +193,6 @@ function processProjectReports(projectReportLines) {
         gradleFileToOutputDirsMap,
         gradleProjectToTasksTypeMap,
         gradleProjectToProjectName,
+        gradleProjectToChildProjects,
     };
 }