@nx/gradle 21.0.0-canary.20250429-cf4a1f3 → 21.0.0-canary.20250430-07b881d

package/batch-runner/project.json

@@ -0,0 +1,33 @@
+{
+  "name": "gradle-batch-runner",
+  "$schema": "node_modules/nx/schemas/project-schema.json",
+  "projectRoot": "packages/gradle/batch-runner",
+  "sourceRoot": "packages/gradle/batch-runner/src",
+  "targets": {
+    "assemble": {
+      "command": "./gradlew :batch-runner:assemble",
+      "inputs": [
+        "{projectRoot}/src/**",
+        "{projectRoot}/build.gradle.kts",
+        "{projectRoot}/settings.gradle.kts"
+      ],
+      "outputs": ["{projectRoot}/build"],
+      "cache": true
+    },
+    "test": {
+      "command": "./gradlew :batch-runner:test",
+      "options": {
+        "args": []
+      },
+      "cache": true
+    },
+    "lint": {
+      "command": "./gradlew :batch-runner:ktfmtCheck",
+      "cache": true
+    },
+    "format": {
+      "command": "./gradlew :batch-runner:ktfmtFormat",
+      "cache": true
+    }
+  }
+}

package/executors.json

@@ -1,3 +1,10 @@
 {
-  "executors": {}
+  "executors": {
+    "gradle": {
+      "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."
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "21.0.0-canary.20250429-cf4a1f3",
+  "version": "21.0.0-canary.20250430-07b881d",
   "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.20250429-cf4a1f3"
+    "@nx/devkit": "21.0.0-canary.20250430-07b881d"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/gradle/gradle-batch.impl.d.ts

@@ -0,0 +1,6 @@
+import { ExecutorContext, TaskGraph } from '@nx/devkit';
+import { RunCommandsOptions } from 'nx/src/executors/run-commands/run-commands.impl';
+import { BatchResults } from 'nx/src/tasks-runner/batch/batch-messages';
+import { gradleExecutorSchema } from './schema';
+export declare const batchRunnerPath: string;
+export default function gradleBatch(taskGraph: TaskGraph, inputs: Record<string, gradleExecutorSchema>, overrides: RunCommandsOptions, context: ExecutorContext): Promise<BatchResults>;

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

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.batchRunnerPath = void 0;
+exports.default = gradleBatch;
+const devkit_1 = require("@nx/devkit");
+const run_commands_impl_1 = require("nx/src/executors/run-commands/run-commands.impl");
+const exec_gradle_1 = require("../../utils/exec-gradle");
+const path_1 = require("path");
+const child_process_1 = require("child_process");
+exports.batchRunnerPath = (0, path_1.join)(__dirname, '../../../batch-runner/build/libs/batch-runner-all.jar');
+async function gradleBatch(taskGraph, inputs, overrides, context) {
+    try {
+        const projectName = taskGraph.tasks[taskGraph.roots[0]]?.target?.project;
+        let projectRoot = context.projectGraph.nodes[projectName]?.data?.root ?? '';
+        const gradlewPath = (0, exec_gradle_1.findGradlewFile)((0, path_1.join)(projectRoot, 'project.json')); // find gradlew near project root
+        const root = (0, path_1.join)(context.root, (0, path_1.dirname)(gradlewPath));
+        // set args with passed in args and overrides in command line
+        const input = inputs[taskGraph.roots[0]];
+        let args = typeof input.args === 'string'
+            ? input.args.trim().split(' ')
+            : Array.isArray(input.args)
+                ? input.args
+                : [];
+        if (overrides.__overrides_unparsed__.length) {
+            args.push(...overrides.__overrides_unparsed__);
+        }
+        const gradlewTasksToRun = Object.entries(taskGraph.tasks).reduce((gradlewTasksToRun, [taskId, task]) => {
+            const gradlewTaskName = inputs[task.id].taskName;
+            const testClassName = inputs[task.id].testClassName;
+            gradlewTasksToRun[taskId] = {
+                taskName: gradlewTaskName,
+                testClassName: testClassName,
+            };
+            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
+            .join(' ')
+            .replaceAll("'", '"')}' ${process.env.NX_VERBOSE_LOGGING === 'true' ? '' : '--quiet'}`, {
+            windowsHide: true,
+            env: process.env,
+            maxBuffer: run_commands_impl_1.LARGE_BUFFER,
+        });
+        const gradlewBatchEnd = performance.mark(`gradlew-batch:end`);
+        performance.measure(`gradlew-batch`, gradlewBatchStart.name, gradlewBatchEnd.name);
+        const gradlewBatchResults = JSON.parse(batchResults.toString());
+        Object.keys(taskGraph.tasks).forEach((taskId) => {
+            if (!gradlewBatchResults[taskId]) {
+                gradlewBatchResults[taskId] = {
+                    success: false,
+                    terminalOutput: `Gradlew batch failed`,
+                };
+            }
+        });
+        return gradlewBatchResults;
+    }
+    catch (e) {
+        devkit_1.output.error({
+            title: `Gradlew batch failed`,
+            bodyLines: [e.toString()],
+        });
+        return taskGraph.roots.reduce((acc, key) => {
+            acc[key] = { success: false, terminalOutput: e.toString() };
+            return acc;
+        }, {});
+    }
+}

package/src/executors/gradle/gradle.impl.d.ts

@@ -0,0 +1,5 @@
+import { ExecutorContext } from '@nx/devkit';
+import { gradleExecutorSchema } from './schema';
+export default function gradleExecutor(options: gradleExecutorSchema, context: ExecutorContext): Promise<{
+    success: boolean;
+}>;

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

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = gradleExecutor;
+const exec_gradle_1 = require("../../utils/exec-gradle");
+const node_path_1 = require("node:path");
+const run_commands_impl_1 = require("nx/src/executors/run-commands/run-commands.impl");
+async function gradleExecutor(options, context) {
+    let projectRoot = context.projectGraph.nodes[context.projectName]?.data?.root ?? context.root;
+    let gradlewPath = (0, exec_gradle_1.findGradlewFile)((0, node_path_1.join)(projectRoot, 'project.json')); // find gradlew near project root
+    gradlewPath = (0, node_path_1.join)(context.root, gradlewPath);
+    let args = typeof options.args === 'string'
+        ? options.args.trim().split(' ')
+        : Array.isArray(options.args)
+            ? options.args
+            : [];
+    if (options.testClassName) {
+        args.push(`--tests`, options.testClassName);
+    }
+    try {
+        await (0, run_commands_impl_1.default)({
+            command: `${gradlewPath} ${options.taskName}`,
+            cwd: (0, node_path_1.dirname)(gradlewPath),
+            args: args,
+            __unparsed__: [],
+        }, context);
+        return { success: true };
+    }
+    catch (e) {
+        return { success: false };
+    }
+}

package/src/executors/gradle/schema.d.ts

@@ -0,0 +1,5 @@
+export interface gradleExecutorSchema {
+  taskName: string;
+  testClassName?: string;
+  args?: string[] | string;
+}

package/src/executors/gradle/schema.json

@@ -0,0 +1,33 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "version": 2,
+  "title": "Gradle Impl executor",
+  "description": "The Gradle Impl executor is used to run Gradle tasks.",
+  "type": "object",
+  "properties": {
+    "taskName": {
+      "type": "string",
+      "description": "The name of the Gradle task to run."
+    },
+    "testClassName": {
+      "type": "string",
+      "description": "The test class name to run for test task."
+    },
+    "args": {
+      "oneOf": [
+        {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        {
+          "type": "string"
+        }
+      ],
+      "description": "The arguments to pass to the Gradle task.",
+      "examples": [["--warning-mode", "all"], "--stracktrace"]
+    }
+  },
+  "required": ["taskName"]
+}

package/src/plugin/dependencies.js

@@ -9,7 +9,7 @@ const workspace_context_1 = require("nx/src/utils/workspace-context");
 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);
-    await (0, get_project_graph_from_gradle_plugin_1.populateProjectGraph)(context.workspaceRoot, gradlewFiles, options);
+    await (0, get_project_graph_from_gradle_plugin_1.populateProjectGraph)(context.workspaceRoot, gradlewFiles.map((file) => (0, node_path_1.join)(devkit_1.workspaceRoot, file)), options);
     const { dependencies: dependenciesFromReport } = (0, get_project_graph_from_gradle_plugin_1.getCurrentProjectGraphReport)();
     const dependencies = [];
     dependenciesFromReport.forEach((dependencyFromPlugin) => {

package/src/plugin/nodes.js

@@ -35,6 +35,11 @@ exports.createNodesV2 = [
     },
 ];
 const makeCreateNodesForGradleConfigFile = (projects, projectsCache = {}, externalNodes = {}) => async (gradleFilePath, options, context) => {
+    if (process.env.VERCEL) {
+        // Vercel does not allow JAVA_VERSION to be set
+        // skip on Vercel
+        return {};
+    }
     const projectRoot = (0, node_path_1.dirname)(gradleFilePath);
     options = (0, gradle_plugin_options_1.normalizeOptions)(options);
     const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options ?? {}, context);

package/src/plugin/utils/gradle-plugin-options.d.ts

@@ -1,6 +1,7 @@
 export interface GradlePluginOptions {
     testTargetName?: string;
-    ciTargetName?: string;
+    ciTestTargetName?: string;
+    ciIntTestTargetName?: string;
     [taskTargetName: string]: string | undefined | boolean;
 }
 export declare function normalizeOptions(options: GradlePluginOptions): GradlePluginOptions;

package/src/utils/versions.d.ts

@@ -1,3 +1,3 @@
 export declare const nxVersion: any;
 export declare const gradleProjectGraphPluginName = "dev.nx.gradle.project-graph";
-export declare const gradleProjectGraphVersion = "0.0.2";
+export declare const gradleProjectGraphVersion = "0.1.0";

package/src/utils/versions.js

@@ -3,4 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.gradleProjectGraphVersion = exports.gradleProjectGraphPluginName = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.gradleProjectGraphPluginName = 'dev.nx.gradle.project-graph';
-exports.gradleProjectGraphVersion = '0.0.2';
+exports.gradleProjectGraphVersion = '0.1.0';