@nx/gradle 21.2.1 → 21.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "21.2.1",
+  "version": "21.2.3",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -35,7 +35,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "21.2.1"
+    "@nx/devkit": "21.2.3"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/gradle/gradle.impl.js

@@ -17,11 +17,13 @@ async function gradleExecutor(options, context) {
     if (options.testClassName) {
         args.push(`--tests`, options.testClassName);
     }
-    (0, get_exclude_task_1.getExcludeTasks)(new Set([`${context.projectName}:${context.targetName}`]), context.projectGraph.nodes).forEach((task) => {
-        if (task) {
-            args.push('--exclude-task', task);
-        }
-    });
+    if (options.excludeDependsOn) {
+        (0, get_exclude_task_1.getExcludeTasks)(new Set([`${context.projectName}:${context.targetName}`]), context.projectGraph.nodes).forEach((task) => {
+            if (task) {
+                args.push('--exclude-task', task);
+            }
+        });
+    }
     try {
         const { success } = await (0, run_commands_impl_1.default)({
             command: `${gradlewPath} ${options.taskName}`,

package/src/generators/ci-workflow/files/circleci/.circleci/config.yml.template

@@ -21,13 +21,15 @@ jobs:
       # Run this command as early as possible, before dependencies are installed
       # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
       <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
-      # - run: <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-jvm" --stop-agents-after="check"
+      # - run: ./nx start-ci-run --distribute-on="3 linux-medium-jvm" --stop-agents-after="check"
 
       - nx/set-shas:
           main-branch-name: '<%= mainBranch %>'
-<% for (const command of commands) { %>
-      <% if (command.command) { %>- run: <%= command.command %><% } else if (command.comments) { %><% for (const comment of command.comments) { %>
-      <%= comment %><% } %><% } else {%>- run: <%= command %><% } %><% } %>
+<% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
+      # <%- comment %><% } %><% } %><% if (command.command) { %>
+      - run: 
+          command: <%= command.command %><% if (command.alwaysRun) { %>
+          when: always<% } %><% } %><% } %>
 
 workflows:
   version: 2

package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml.template

@@ -26,7 +26,7 @@ jobs:
       # Run this command as early as possible, before dependencies are installed
       # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
       <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
-      # - run: <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-jvm" --stop-agents-after="check"
+      # - run: ./nx start-ci-run --distribute-on="3 linux-medium-jvm" --stop-agents-after="check"
 
       - name: Set up JDK 21 for x64
         uses: actions/setup-java@v4
@@ -39,6 +39,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
 
       - uses: nrwl/nx-set-shas@v4
-<% for (const command of commands) { %>
-      <% if (command.command) { %>- run: <%= command.command %><% } else if (command.comments) { %><% for (const comment of command.comments) { %>
-      <%= comment %><% } %><% } else {%>- run: <%= command %><% } %><% } %>
+<% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
+      # <%- comment %><% } %><% } %><% if (command.command) { %>
+      - run: <%= command.command %><% if (command.alwaysRun) { %>
+        if: always()<% } %><% } %><% } %>

package/src/generators/ci-workflow/generator.d.ts

@@ -1,9 +1,9 @@
 import { Tree } from '@nx/devkit';
 export type Command = {
-    command: string;
-} | {
-    comments: string[];
-} | string;
+    command?: string;
+    comments?: string[];
+    alwaysRun?: boolean;
+};
 export interface Schema {
     name: string;
     ci: 'github' | 'circleci';

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

@@ -11,13 +11,12 @@ function getCiCommands(ci) {
             return [
                 {
                     comments: [
-                        `# Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected.`,
-                        `# Change from check to check-ci if you turn on the atomizer. Learn more: https://nx.dev/nx-api/gradle#splitting-e2e-tests.`,
+                        `Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected.`,
+                        `Change from check to check-ci if you turn on the atomizer. Learn more: https://nx.dev/nx-api/gradle#splitting-e2e-tests.`,
                     ],
-                },
-                {
                     command: `./nx affected --base=$NX_BASE --head=$NX_HEAD -t assemble check`,
                 },
+                getNxCloudFixCiCommand(),
             ];
         }
         default: {
@@ -27,12 +26,22 @@ function getCiCommands(ci) {
                         `# Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected.`,
                         `# Change from check to check-ci if you turn on the atomizer. Learn more: https://nx.dev/nx-api/gradle#splitting-tests`,
                     ],
+                    command: `./nx affected -t assemble check`,
                 },
-                { command: `./nx affected -t assemble check` },
+                getNxCloudFixCiCommand(),
             ];
         }
     }
 }
+function getNxCloudFixCiCommand() {
+    return {
+        comments: [
+            `Nx Cloud recommends fixes for failures to help you get CI green faster. Learn more: https://nx.dev/ci/features/self-healing-ci`,
+        ],
+        command: `./nx fix-ci`,
+        alwaysRun: true,
+    };
+}
 async function ciWorkflowGenerator(tree, schema) {
     const ci = schema.ci;
     const options = getTemplateData(tree, schema);
@@ -41,8 +50,6 @@ async function ciWorkflowGenerator(tree, schema) {
 }
 function getTemplateData(tree, options) {
     const { name: workflowName, fileName: workflowFileName } = (0, devkit_1.names)(options.name);
-    const packageManager = (0, devkit_1.detectPackageManager)();
-    const { exec: packageManagerPrefix } = (0, devkit_1.getPackageManagerCommand)(packageManager);
     let nxCloudHost = 'nx.app';
     try {
         const nxCloudUrl = (0, nx_cloud_utils_1.getNxCloudUrl)((0, devkit_1.readNxJson)(tree));
@@ -55,8 +62,6 @@ function getTemplateData(tree, options) {
     return {
         workflowName,
         workflowFileName,
-        packageManager,
-        packageManagerPrefix,
         commands,
         mainBranch,
         nxCloudHost,

package/src/plugin/nodes.js

@@ -20,14 +20,17 @@ function writeTargetsToCache(cachePath, results) {
 exports.createNodesV2 = [
     split_config_files_1.gradleConfigAndTestGlob,
     async (files, options, context) => {
-        const { buildFiles, gradlewFiles } = (0, split_config_files_1.splitConfigFiles)(files);
+        const { buildFiles: buildFilesFromSplitConfigFiles, gradlewFiles } = (0, split_config_files_1.splitConfigFiles)(files);
         const optionsHash = (0, file_hasher_1.hashObject)(options);
         const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `gradle-${optionsHash}.hash`);
         const projectsCache = readProjectsCache(cachePath);
         await (0, get_project_graph_from_gradle_plugin_1.populateProjectGraph)(context.workspaceRoot, gradlewFiles.map((f) => (0, node_path_1.join)(context.workspaceRoot, f)), options);
-        const { nodes, externalNodes } = (0, get_project_graph_from_gradle_plugin_1.getCurrentProjectGraphReport)();
+        const report = (0, get_project_graph_from_gradle_plugin_1.getCurrentProjectGraphReport)();
+        const { nodes, externalNodes, buildFiles = [] } = report;
+        // Combine buildFilesFromSplitConfigFiles and buildFiles, making each value distinct
+        const allBuildFiles = Array.from(new Set([...buildFilesFromSplitConfigFiles, ...buildFiles]));
         try {
-            return (0, devkit_1.createNodesFromFiles)((0, exports.makeCreateNodesForGradleConfigFile)(nodes, projectsCache, externalNodes), buildFiles, options, context);
+            return (0, devkit_1.createNodesFromFiles)((0, exports.makeCreateNodesForGradleConfigFile)(nodes, projectsCache, externalNodes), allBuildFiles, options, context);
         }
         finally {
             writeTargetsToCache(cachePath, projectsCache);

package/src/plugin/utils/__mocks__/gradle_composite.json

@@ -1,4 +1,5 @@
 {
+  "buildFiles": ["nested/nested/proj/build.gradle"],
   "nodes": {
     "nested/nested/proj": {
       "targets": {

package/src/plugin/utils/__mocks__/gradle_tutorial.json

@@ -1,4 +1,5 @@
 {
+  "buildFiles": ["proj/build.gradle"],
   "nodes": {
     "proj": {
       "targets": {

package/src/plugin/utils/get-project-graph-from-gradle-plugin.d.ts

@@ -6,12 +6,14 @@ export interface ProjectGraphReport {
     };
     dependencies: Array<StaticDependency>;
     externalNodes?: Record<string, ProjectGraphExternalNode>;
+    buildFiles?: string[];
 }
 export interface ProjectGraphReportCache extends ProjectGraphReport {
     hash: string;
 }
 export declare function writeProjectGraphReportToCache(cachePath: string, results: ProjectGraphReport): void;
 export declare function getCurrentProjectGraphReport(): ProjectGraphReport;
+export declare function getCurrentBuildFiles(): string[];
 /**
  * This function populates the gradle report cache.
  * For each gradlew file, it runs the `nxProjectGraph` task and processes the output.

package/src/plugin/utils/get-project-graph-from-gradle-plugin.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeProjectGraphReportToCache = writeProjectGraphReportToCache;
 exports.getCurrentProjectGraphReport = getCurrentProjectGraphReport;
+exports.getCurrentBuildFiles = getCurrentBuildFiles;
 exports.populateProjectGraph = populateProjectGraph;
 exports.processNxProjectGraph = processNxProjectGraph;
 const node_fs_1 = require("node:fs");
@@ -42,6 +43,10 @@ function getCurrentProjectGraphReport() {
     }
     return projectGraphReportCache;
 }
+function getCurrentBuildFiles() {
+    const report = getCurrentProjectGraphReport();
+    return report.buildFiles || [];
+}
 /**
  * This function populates the gradle report cache.
  * For each gradlew file, it runs the `nxProjectGraph` task and processes the output.
@@ -84,6 +89,7 @@ function processNxProjectGraph(projectGraphLines) {
         dependencies: [],
         externalNodes: {},
     };
+    const allBuildFiles = new Set();
     while (index < projectGraphLines.length) {
         const line = projectGraphLines[index].trim();
         if (line.startsWith('> Task ') && line.endsWith(':nxProjectGraph')) {
@@ -106,8 +112,13 @@ function processNxProjectGraph(projectGraphLines) {
                     ...projectGraphReportJson.externalNodes,
                 };
             }
+            if (projectGraphReportJson.buildFiles) {
+                projectGraphReportJson.buildFiles.forEach((buildFile) => allBuildFiles.add(buildFile));
+            }
         }
         index++;
     }
+    // Convert Set to array for the final result
+    projectGraphReportForAllProjects.buildFiles = Array.from(allBuildFiles);
     return projectGraphReportForAllProjects;
 }