@nx/gradle 20.2.0-rc.0 → 20.2.1

package/migrations.json

@@ -11,6 +11,12 @@
       "cli": "nx",
       "description": "This function changes !{projectRoot}/test/**/* in nx.json for production to !{projectRoot}/src/test/**/*",
       "factory": "./src/migrations/19-4-1/change-regex-test-production"
+    },
+    "add-include-subprojects-tasks": {
+      "version": "20.2.0-beta.4",
+      "cli": "nx",
+      "description": "Add includeSubprojectsTasks to build.gradle file",
+      "factory": "./src/migrations/20-2-0/add-include-subprojects-tasks"
     }
   },
   "packageJsonUpdates": {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "20.2.0-rc.0",
+  "version": "20.2.1",
   "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.2.0-rc.0"
+    "@nx/devkit": "20.2.1"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/ci-workflow/generator.js

@@ -13,7 +13,7 @@ function getCiCommands(ci) {
                     comment: `# Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected`,
                 },
                 {
-                    command: `./nx affected --base=$NX_BASE --head=$NX_HEAD -t test build`,
+                    command: `./nx affected --base=$NX_BASE --head=$NX_HEAD -t build`,
                 },
             ];
         }
@@ -22,7 +22,7 @@ function getCiCommands(ci) {
                 {
                     comment: `# Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected`,
                 },
-                { command: `./nx affected -t test build` },
+                { command: `./nx affected -t build` },
             ];
         }
     }

package/src/generators/init/init.js

@@ -32,6 +32,7 @@ function addPlugin(tree) {
                 testTargetName: 'test',
                 classesTargetName: 'classes',
                 buildTargetName: 'build',
+                includeSubprojectsTasks: false,
             },
         });
         (0, devkit_1.updateNxJson)(tree, nxJson);

package/src/migrations/20-2-0/add-include-subprojects-tasks.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function update(tree: Tree): void;

package/src/migrations/20-2-0/add-include-subprojects-tasks.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const devkit_1 = require("@nx/devkit");
+const has_gradle_plugin_1 = require("../../utils/has-gradle-plugin");
+// This function add options includeSubprojectsTasks as true in nx.json for gradle plugin
+function update(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson) {
+        return;
+    }
+    if (!(0, has_gradle_plugin_1.hasGradlePlugin)(tree)) {
+        return;
+    }
+    let gradlePluginIndex = nxJson.plugins.findIndex((p) => typeof p === 'string' ? p === '@nx/gradle' : p.plugin === '@nx/gradle');
+    let gradlePlugin = nxJson.plugins[gradlePluginIndex];
+    if (typeof gradlePlugin === 'string') {
+        gradlePlugin = {
+            plugin: '@nx/gradle',
+            options: {
+                includeSubprojectsTasks: true,
+            },
+        };
+        nxJson.plugins[gradlePluginIndex] = gradlePlugin;
+    }
+    else {
+        gradlePlugin.options ??= {};
+        gradlePlugin.options.includeSubprojectsTasks =
+            true;
+    }
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+}

package/src/plugin/nodes.d.ts

@@ -1,17 +1,14 @@
-import { CreateNodes, CreateNodesV2, ProjectConfiguration, TargetConfiguration, CreateNodesFunction } from '@nx/devkit';
+import { CreateNodes, CreateNodesV2, ProjectConfiguration, CreateNodesFunction } from '@nx/devkit';
 import { GradleReport } from '../utils/get-gradle-report';
 export interface GradlePluginOptions {
+    includeSubprojectsTasks?: boolean;
     ciTargetName?: string;
     testTargetName?: string;
     classesTargetName?: string;
     buildTargetName?: string;
-    [taskTargetName: string]: string | undefined;
+    [taskTargetName: string]: string | undefined | boolean;
 }
-type GradleTargets = Record<string, {
-    name: string;
-    targets: Record<string, TargetConfiguration>;
-    metadata: ProjectConfiguration['metadata'];
-}>;
+type GradleTargets = Record<string, Partial<ProjectConfiguration>>;
 export declare function writeTargetsToCache(cachePath: string, results: GradleTargets): void;
 export declare const createNodesV2: CreateNodesV2<GradlePluginOptions>;
 export declare const makeCreateNodesForGradleConfigFile: (gradleReport: GradleReport, targetsCache?: GradleTargets, gradleProjectRootToTestFilesMap?: Record<string, string[]>) => CreateNodesFunction;

package/src/plugin/nodes.js

@@ -14,7 +14,7 @@ const split_config_files_1 = require("../utils/split-config-files");
 const exec_gradle_1 = require("../utils/exec-gradle");
 const cacheableTaskType = new Set(['Build', 'Verification']);
 const dependsOnMap = {
-    build: ['^build', 'classes'],
+    build: ['^build', 'classes', 'test'],
     testClasses: ['classes'],
     test: ['testClasses'],
     classes: ['^classes'],
@@ -83,24 +83,36 @@ exports.createNodes = [
 ];
 async function createGradleProject(gradleReport, gradleFilePath, options, context, testFiles = []) {
     try {
-        const { gradleProjectToTasksTypeMap, gradleFileToOutputDirsMap, gradleFileToGradleProjectMap, gradleProjectToProjectName, } = gradleReport;
+        const { gradleProjectToTasksTypeMap, gradleProjectToTasksMap, gradleFileToOutputDirsMap, gradleFileToGradleProjectMap, gradleProjectToProjectName, } = gradleReport;
         const gradleProject = gradleFileToGradleProjectMap.get(gradleFilePath);
         const projectName = gradleProjectToProjectName.get(gradleProject);
         if (!projectName) {
             return;
         }
         const tasksTypeMap = gradleProjectToTasksTypeMap.get(gradleProject);
+        const tasksSet = gradleProjectToTasksMap.get(gradleProject);
         let tasks = [];
-        for (let [taskName, taskType] of tasksTypeMap.entries()) {
+        tasksSet.forEach((taskName) => {
             tasks.push({
-                type: taskType,
+                type: tasksTypeMap.get(taskName),
                 name: taskName,
             });
+        });
+        if (options.includeSubprojectsTasks) {
+            tasksTypeMap.forEach((taskType, taskName) => {
+                if (!tasksSet.has(taskName)) {
+                    tasks.push({
+                        type: taskType,
+                        name: taskName,
+                    });
+                }
+            });
         }
         const outputDirs = gradleFileToOutputDirsMap.get(gradleFilePath);
         const { targets, targetGroups } = await createGradleTargets(tasks, options, context, outputDirs, gradleProject, gradleFilePath, testFiles);
         const project = {
             name: projectName,
+            projectType: 'application',
             targets,
             metadata: {
                 targetGroups,
@@ -151,10 +163,12 @@ async function createGradleTargets(tasks, options, context, outputDirs, gradlePr
             },
             ...(outputs && outputs.length ? { outputs } : {}),
         };
-        if (!targetGroups[task.type]) {
-            targetGroups[task.type] = [];
+        if (task.type) {
+            if (!targetGroups[task.type]) {
+                targetGroups[task.type] = [];
+            }
+            targetGroups[task.type].push(targetName);
         }
-        targetGroups[task.type].push(targetName);
     }
     return { targetGroups, targets };
 }

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

@@ -3,6 +3,7 @@ export interface GradleReport {
     buildFileToDepsMap: Map<string, string>;
     gradleFileToOutputDirsMap: Map<string, Map<string, string>>;
     gradleProjectToTasksTypeMap: Map<string, Map<string, string>>;
+    gradleProjectToTasksMap: Map<string, Set<String>>;
     gradleProjectToProjectName: Map<string, string>;
     gradleProjectNameToProjectRootMap: Map<string, string>;
     gradleProjectToChildProjects: Map<string, string[]>;

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

@@ -61,6 +61,7 @@ function processProjectReports(projectReportLines) {
      * Map of Gradle Build File to tasks type map
      */
     const gradleProjectToTasksTypeMap = new Map();
+    const gradleProjectToTasksMap = new Map();
     const gradleProjectToProjectName = new Map();
     const gradleProjectNameToProjectRootMap = new Map();
     /**
@@ -101,6 +102,7 @@ function processProjectReports(projectReportLines) {
                     : [];
                 let projectName, absBuildFilePath, absBuildDirPath;
                 const outputDirMap = new Map();
+                const tasks = new Set();
                 for (const line of propertyReportLines) {
                     if (line.startsWith('name: ')) {
                         projectName = line.substring('name: '.length);
@@ -124,6 +126,10 @@ function processProjectReports(projectReportLines) {
                         const taskName = dirName.replace('Dir', '');
                         outputDirMap.set(taskName, `{workspaceRoot}/${(0, node_path_1.relative)(devkit_1.workspaceRoot, dirPath)}`);
                     }
+                    if (line.includes(': task ')) {
+                        const [task] = line.split(': task ');
+                        tasks.add(task);
+                    }
                 }
                 if (!projectName || !absBuildFilePath || !absBuildDirPath) {
                     continue;
@@ -137,6 +143,7 @@ function processProjectReports(projectReportLines) {
                 gradleFileToGradleProjectMap.set(buildFile, gradleProject);
                 gradleProjectToProjectName.set(gradleProject, projectName);
                 gradleProjectNameToProjectRootMap.set(gradleProject, (0, path_1.dirname)(buildFile));
+                gradleProjectToTasksMap.set(gradleProject, tasks);
             }
             if (line.endsWith('taskReport')) {
                 const gradleProject = line.substring('> Task '.length, line.length - ':taskReport'.length);
@@ -177,6 +184,7 @@ function processProjectReports(projectReportLines) {
         buildFileToDepsMap,
         gradleFileToOutputDirsMap,
         gradleProjectToTasksTypeMap,
+        gradleProjectToTasksMap,
         gradleProjectToProjectName,
         gradleProjectNameToProjectRootMap,
         gradleProjectToChildProjects,

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

@@ -35,13 +35,13 @@ async function getProjectReportLines(gradlewFile) {
             projectReportBuffer = await (0, exec_gradle_1.execGradleAsync)(gradlewFile, [
                 'projectReport',
             ]);
-            devkit_1.logger.warn(`Could not run 'projectReportAll' task. Ran 'projectReport' instead. Please run 'nx generate @nx/gradle:init' to generate the necessary tasks.`);
+            devkit_1.logger.warn(`Could not run 'projectReportAll' task. Ran 'projectReport' instead. Please run 'nx generate @nx/gradle:init' to generate the necessary tasks. ${e.message}`);
         }
         catch (e) {
             throw new devkit_1.AggregateCreateNodesError([
                 [
                     gradlewFile,
-                    new Error(`Could not run 'projectReportAll' or 'projectReport' task. Please run 'nx generate @nx/gradle:init' to generate the necessary tasks.`),
+                    new Error(`Could not run 'projectReportAll' or 'projectReport' task. Please run 'nx generate @nx/gradle:init' to generate the necessary tasks. ${e.message}`),
                 ],
             ], []);
         }

package/src/utils/split-config-files.js

@@ -13,7 +13,7 @@ exports.GRADLE_TEST_FILES = [
     '**/src/test/kotlin/**/*Tests.kt',
 ];
 exports.gradleConfigGlob = (0, globs_1.combineGlobPatterns)(...Array.from(exports.GRADLE_BUILD_FILES).map((file) => `**/${file}`));
-exports.gradleConfigAndTestGlob = (0, globs_1.combineGlobPatterns)(...Array.from(exports.GRADLE_BUILD_FILES).map((file) => `**/${file}`), ...Array.from(exports.GRALDEW_FILES).map((file) => `**/${file}`), ...exports.GRADLE_TEST_FILES);
+exports.gradleConfigAndTestGlob = (0, globs_1.combineGlobPatterns)(...Array.from(exports.GRADLE_BUILD_FILES), ...Array.from(exports.GRALDEW_FILES), ...Array.from(exports.GRADLE_BUILD_FILES).map((file) => `**/${file}`), ...Array.from(exports.GRALDEW_FILES).map((file) => `**/${file}`), ...exports.GRADLE_TEST_FILES);
 /**
  * This function split config files into build files, settings files, test files and project roots
  * @param files list of files to split