@nx/gradle 21.0.0-canary.20250501-8f50358 → 21.0.0-canary.20250503-675e6ed

package/README.md

@@ -9,7 +9,7 @@
 
 [![CircleCI](https://circleci.com/gh/nrwl/nx.svg?style=svg)](https://circleci.com/gh/nrwl/nx)
 [![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)]()
-[![NPM Version](https://badge.fury.io/js/%40nrwl%2Fworkspace.svg)](https://www.npmjs.com/@nx/workspace)
+[![NPM Version](https://badge.fury.io/js/nx.svg)](https://www.npmjs.com/package/nx)
 [![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Join the chat at https://gitter.im/nrwl-nx/community](https://badges.gitter.im/nrwl-nx/community.svg)](https://gitter.im/nrwl-nx/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

package/executors.json

@@ -4,7 +4,7 @@
       "batchImplementation": "./src/executors/gradle/gradle-batch.impl",
       "implementation": "./src/executors/gradle/gradle.impl",
       "schema": "./src/executors/gradle/schema.json",
-      "description": "The Gradlew executor is used to run Gradle tasks."
+      "description": "Runs gradle tasks via the Gradle Tooling API or by invoking gradlew."
     }
   }
 }

package/migrations.json

@@ -23,6 +23,12 @@
       "cli": "nx",
       "description": "Change @nx/gradle plugin to version 1",
       "factory": "./src/migrations/21-0-0/change-plugin-to-v1"
+    },
+    "change-ciTargetName-to-ciTestTargetName": {
+      "version": "21.0.0-beta.13",
+      "cli": "nx",
+      "description": "Change @nx/gradle option from ciTargetName to ciTestTargetName",
+      "factory": "./src/migrations/21-0-0/change-ciTargetName-to-ciTestTargetName"
     }
   },
   "packageJsonUpdates": {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "21.0.0-canary.20250501-8f50358",
+  "version": "21.0.0-canary.20250503-675e6ed",
   "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.0.0-canary.20250501-8f50358"
+    "@nx/devkit": "21.0.0-canary.20250503-675e6ed"
   },
   "publishConfig": {
     "access": "public"

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

@@ -7,6 +7,7 @@ const run_commands_impl_1 = require("nx/src/executors/run-commands/run-commands.
 const exec_gradle_1 = require("../../utils/exec-gradle");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
+const pseudo_terminal_1 = require("nx/src/tasks-runner/pseudo-terminal");
 exports.batchRunnerPath = (0, path_1.join)(__dirname, '../../../batch-runner/build/libs/batch-runner-all.jar');
 async function gradleBatch(taskGraph, inputs, overrides, context) {
     try {
@@ -34,13 +35,35 @@ async function gradleBatch(taskGraph, inputs, overrides, context) {
             return gradlewTasksToRun;
         }, {});
         const gradlewBatchStart = performance.mark(`gradlew-batch:start`);
-        const batchResults = (0, child_process_1.execSync)(`java -jar ${exports.batchRunnerPath} --tasks='${JSON.stringify(gradlewTasksToRun)}' --workspaceRoot=${root} --args='${args
+        const usePseudoTerminal = process.env.NX_NATIVE_COMMAND_RUNNER !== 'false' &&
+            pseudo_terminal_1.PseudoTerminal.isSupported();
+        const command = `java -jar ${exports.batchRunnerPath} --tasks='${JSON.stringify(gradlewTasksToRun)}' --workspaceRoot=${root} --args='${args
             .join(' ')
-            .replaceAll("'", '"')}' ${process.env.NX_VERBOSE_LOGGING === 'true' ? '' : '--quiet'}`, {
-            windowsHide: true,
-            env: process.env,
-            maxBuffer: run_commands_impl_1.LARGE_BUFFER,
-        });
+            .replaceAll("'", '"')}' ${process.env.NX_VERBOSE_LOGGING === 'true' ? '' : '--quiet'}`;
+        let batchResults;
+        if (usePseudoTerminal) {
+            const terminal = (0, pseudo_terminal_1.createPseudoTerminal)();
+            await terminal.init();
+            const cp = terminal.runCommand(command, {
+                cwd: devkit_1.workspaceRoot,
+                jsEnv: process.env,
+                quiet: process.env.NX_VERBOSE_LOGGING !== 'true',
+            });
+            const results = await cp.getResults();
+            batchResults = results.terminalOutput;
+            batchResults = batchResults.replace(command, '');
+            const startIndex = batchResults.indexOf('{');
+            const endIndex = batchResults.lastIndexOf('}');
+            batchResults = batchResults.substring(startIndex, endIndex + 1);
+        }
+        else {
+            batchResults = (0, child_process_1.execSync)(command, {
+                cwd: devkit_1.workspaceRoot,
+                windowsHide: true,
+                env: process.env,
+                maxBuffer: run_commands_impl_1.LARGE_BUFFER,
+            }).toString();
+        }
         const gradlewBatchEnd = performance.mark(`gradlew-batch:end`);
         performance.measure(`gradlew-batch`, gradlewBatchStart.name, gradlewBatchEnd.name);
         const gradlewBatchResults = JSON.parse(batchResults.toString());

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

@@ -3,6 +3,9 @@ version: 2.1
 orbs:
   nx: nrwl/nx@1.6.2
 
+env:
+  NX_BATCH_MODE: true
+
 jobs:
   main:
     environment:
@@ -18,13 +21,13 @@ 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="build"
+      # - run: <%= packageManagerPrefix %> nx-cloud 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.comment) { %><%= command.comment %><% } else {%>- run: <%= command %><% } %><% } %>
+      <% if (command.command) { %>- run: <%= command.command %><% } else if (command.comments) { %><% for (const comment of command.comments) { %>
+      <%= comment %><% } %><% } else {%>- run: <%= command %><% } %><% } %>
 
 workflows:
   version: 2

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

@@ -10,6 +10,9 @@ permissions:
   actions: read
   contents: read
 
+env:
+  NX_BATCH_MODE: true
+
 jobs:
   main:
     runs-on: ubuntu-latest
@@ -23,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="build"
+      # - run: <%= packageManagerPrefix %> nx-cloud 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
@@ -33,9 +36,9 @@ jobs:
           architecture: x64
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v4
+        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.comment) { %><%= command.comment %><% } else {%>- run: <%= command %><% } %><% } %>
+      <% if (command.command) { %>- run: <%= command.command %><% } else if (command.comments) { %><% for (const comment of command.comments) { %>
+      <%= comment %><% } %><% } else {%>- run: <%= command %><% } %><% } %>

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

@@ -2,7 +2,7 @@ import { Tree } from '@nx/devkit';
 export type Command = {
     command: string;
 } | {
-    comment: string;
+    comments: string[];
 } | string;
 export interface Schema {
     name: string;

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

@@ -10,19 +10,25 @@ function getCiCommands(ci) {
         case 'circleci': {
             return [
                 {
-                    comment: `# Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected`,
+                    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.`,
+                    ],
                 },
                 {
-                    command: `./nx affected --base=$NX_BASE --head=$NX_HEAD -t build`,
+                    command: `./nx affected --base=$NX_BASE --head=$NX_HEAD -t assemble check`,
                 },
             ];
         }
         default: {
             return [
                 {
-                    comment: `# Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected`,
+                    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-tests`,
+                    ],
                 },
-                { command: `./nx affected -t build` },
+                { command: `./nx affected -t assemble check` },
             ];
         }
     }

package/src/migrations/21-0-0/change-ciTargetName-to-ciTestTargetName.d.ts

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

package/src/migrations/21-0-0/change-ciTargetName-to-ciTestTargetName.js

@@ -0,0 +1,28 @@
+"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 changes the @nx/gradle plugin option from ciTargetName to ciTestTargetName
+ */
+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 === 'object' &&
+        gradlePlugin.plugin === '@nx/gradle') {
+        const ciTargetName = gradlePlugin.options?.['ciTargetName'];
+        if (ciTargetName) {
+            delete gradlePlugin.options?.['ciTargetName'];
+            gradlePlugin.options['ciTestTargetName'] =
+                ciTargetName;
+        }
+    }
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+}

package/src/plugin/dependencies.js

@@ -6,6 +6,7 @@ const node_path_1 = require("node:path");
 const get_project_graph_from_gradle_plugin_1 = require("./utils/get-project-graph-from-gradle-plugin");
 const split_config_files_1 = require("../utils/split-config-files");
 const workspace_context_1 = require("nx/src/utils/workspace-context");
+const node_fs_1 = require("node:fs");
 const createDependencies = async (options, context) => {
     const files = await (0, workspace_context_1.globWithWorkspaceContext)(devkit_1.workspaceRoot, Array.from(split_config_files_1.GRALDEW_FILES));
     const { gradlewFiles } = (0, split_config_files_1.splitConfigFiles)(files);
@@ -18,7 +19,9 @@ const createDependencies = async (options, context) => {
             const sourceProjectName = Object.values(context.projects).find((project) => source === project.root)?.name ?? dependencyFromPlugin.source;
             const target = (0, node_path_1.relative)(devkit_1.workspaceRoot, dependencyFromPlugin.target) || '.';
             const targetProjectName = Object.values(context.projects).find((project) => target === project.root)?.name ?? dependencyFromPlugin.target;
-            if (!sourceProjectName || !targetProjectName) {
+            if (!sourceProjectName ||
+                !targetProjectName ||
+                !(0, node_fs_1.existsSync)(dependencyFromPlugin.sourceFile)) {
                 return;
             }
             const dependency = {