@nx/gradle 21.0.0-beta.1 → 21.0.0-beta.11

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

@@ -0,0 +1,10 @@
+{
+  "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/migrations.json

@@ -17,6 +17,12 @@
       "cli": "nx",
       "description": "Add includeSubprojectsTasks to build.gradle file",
       "factory": "./src/migrations/20-2-0/add-include-subprojects-tasks"
+    },
+    "change-plugin-to-v1": {
+      "version": "21.0.0-beta.5",
+      "cli": "nx",
+      "description": "Change @nx/gradle plugin to version 1",
+      "factory": "./src/migrations/21-0-0/change-plugin-to-v1"
     }
   },
   "packageJsonUpdates": {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "21.0.0-beta.1",
+  "version": "21.0.0-beta.11",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -26,6 +26,7 @@
   "generators": "./generators.json",
   "exports": {
     ".": "./index.js",
+    "./plugin-v1": "./plugin-v1.js",
     "./package.json": "./package.json",
     "./migrations.json": "./migrations.json",
     "./generators.json": "./generators.json"
@@ -34,11 +35,12 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "21.0.0-beta.1"
+    "@nx/devkit": "21.0.0-beta.11"
   },
   "publishConfig": {
     "access": "public"
   },
+  "executors": "./executors.json",
   "types": "./index.d.ts",
   "type": "commonjs"
 }

package/plugin-v1.d.ts

@@ -0,0 +1,2 @@
+export { createDependencies } from './src/plugin-v1/dependencies';
+export { createNodes, createNodesV2 } from './src/plugin-v1/nodes';

package/plugin-v1.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNodesV2 = exports.createNodes = exports.createDependencies = void 0;
+var dependencies_1 = require("./src/plugin-v1/dependencies");
+Object.defineProperty(exports, "createDependencies", { enumerable: true, get: function () { return dependencies_1.createDependencies; } });
+var nodes_1 = require("./src/plugin-v1/nodes");
+Object.defineProperty(exports, "createNodes", { enumerable: true, get: function () { return nodes_1.createNodes; } });
+Object.defineProperty(exports, "createNodesV2", { enumerable: true, get: function () { return nodes_1.createNodesV2; } });

package/plugin.d.ts

@@ -1,2 +1,2 @@
 export { createDependencies } from './src/plugin/dependencies';
-export { createNodes, createNodesV2 } from './src/plugin/nodes';
+export { createNodesV2 } from './src/plugin/nodes';

package/plugin.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodesV2 = exports.createNodes = exports.createDependencies = void 0;
+exports.createNodesV2 = exports.createDependencies = void 0;
 var dependencies_1 = require("./src/plugin/dependencies");
 Object.defineProperty(exports, "createDependencies", { enumerable: true, get: function () { return dependencies_1.createDependencies; } });
 var nodes_1 = require("./src/plugin/nodes");
-Object.defineProperty(exports, "createNodes", { enumerable: true, get: function () { return nodes_1.createNodes; } });
 Object.defineProperty(exports, "createNodesV2", { enumerable: true, get: function () { return nodes_1.createNodesV2; } });

package/project-graph/project.json

@@ -0,0 +1,43 @@
+{
+  "name": "gradle-project-graph",
+  "$schema": "node_modules/nx/schemas/project-schema.json",
+  "targets": {
+    "test": {
+      "command": "./gradlew :project-graph:test",
+      "options": {
+        "args": []
+      },
+      "cache": true
+    },
+    "lint": {
+      "command": "./gradlew :project-graph:ktfmtCheck",
+      "cache": true
+    },
+    "format": {
+      "command": "./gradlew :project-graph:ktfmtFormat",
+      "cache": true
+    },
+    "publish-staging": {
+      "command": "./gradlew :project-graph:publish",
+      "cache": true,
+      "outputs": ["{projectRoot}/build/staging"]
+    },
+    "zip-staging": {
+      "command": "zip -r ../deployment.zip .",
+      "options": {
+        "cwd": "{projectRoot}/build/staging"
+      },
+      "inputs": ["{projectRoot}/build/staging"],
+      "outputs": ["{projectRoot}/build/deployment.zip"],
+      "dependsOn": ["publish-staging"]
+    },
+    "maven": {
+      "command": "npx ts-node publish-maven.ts --deploymentZipPath=build/deployment.zip",
+      "options": {
+        "cwd": "{projectRoot}"
+      },
+      "inputs": ["{projectRoot}/build/deployment.zip"],
+      "dependsOn": ["zip-staging"]
+    }
+  }
+}

package/project-graph/publish-maven.d.ts

@@ -0,0 +1 @@
+export {};

package/project-graph/publish-maven.js

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const axios_1 = require("axios");
+const fs = require("fs");
+const FormData = require("form-data");
+function parseArgs() {
+    const args = process.argv.slice(2);
+    const result = {};
+    args.forEach((arg) => {
+        const [key, value] = arg.replace(/^--/, '').split('=');
+        result[key] = value;
+    });
+    return result;
+}
+async function publishToMavenApi(username, password, deploymentZipPath = 'deployment.zip') {
+    const token = Buffer.from(`${username}:${password}`).toString('base64');
+    console.log(`📦 Publishing to Maven Central...`);
+    const url = 'https://central.sonatype.com/api/v1/publisher/upload';
+    const form = new FormData();
+    form.append('bundle', fs.createReadStream(deploymentZipPath));
+    let uploadId;
+    try {
+        const response = await axios_1.default.post(url, form, {
+            headers: {
+                Authorization: `Basic ${token}`,
+                ...form.getHeaders(),
+            },
+        });
+        uploadId = response.data.toString().trim();
+        console.log(`✅ Upload ID: ${uploadId}`);
+    }
+    catch (err) {
+        console.error('🚫 Upload failed:', err.response?.data || err.message);
+        process.exit(1);
+    }
+    let currentStatus = await getUploadStatus(uploadId, token);
+    if (['PENDING', 'VALIDATING', 'PUBLISHING'].includes(currentStatus)) {
+        currentStatus = await retryUntilValidatedOrPublished(currentStatus, uploadId, token);
+    }
+    if (!['VALIDATED', 'PUBLISHED'].includes(currentStatus)) {
+        console.error(`🚫 Upload failed with final status: ${currentStatus}`);
+        process.exit(1);
+    }
+    console.log(`📦 Upload is ${currentStatus}, proceeding to deploy...`);
+    if (currentStatus === 'PUBLISHED') {
+        console.log('✅ Already published, skipping deployment.');
+        return;
+    }
+    const deployUrl = `https://central.sonatype.com/api/v1/publisher/deployment/${uploadId}`;
+    try {
+        const deployRes = await axios_1.default.post(deployUrl, null, {
+            headers: { Authorization: `Basic ${token}` },
+        });
+        console.log(`🚀 Deployment response: ${deployRes.data}`);
+    }
+    catch (err) {
+        console.error('🚫 Deployment failed:', err.response?.data || err.message);
+        process.exit(1);
+    }
+}
+async function getUploadStatus(uploadId, token) {
+    const url = `https://central.sonatype.com/api/v1/publisher/status?id=${uploadId}`;
+    try {
+        const response = await axios_1.default.post(url, null, {
+            headers: { Authorization: `Basic ${token}` },
+        });
+        const state = response.data.deploymentState;
+        console.log(`📡 Current deployment state: ${state}`);
+        return state;
+    }
+    catch (err) {
+        console.error('🚫 Failed to get status:', err.response?.data || err.message);
+        return 'FAILED';
+    }
+}
+async function retryUntilValidatedOrPublished(currentStatus, uploadId, token, retries = 10, delay = 10_000) {
+    for (let i = 0; i < retries; i++) {
+        console.log(`🔁 Checking status (attempt ${i + 1}/${retries})...`);
+        await sleep(delay);
+        currentStatus = await getUploadStatus(uploadId, token);
+        if (['VALIDATED', 'PUBLISHED', 'FAILED'].includes(currentStatus))
+            break;
+    }
+    return currentStatus;
+}
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+// Entry
+(async function main() {
+    let { username, password, deploymentZipPath } = parseArgs();
+    username = username || process.env.MAVEN_USERNAME;
+    password = password || process.env.MAVEN_PASSWORD;
+    if (!username || !password) {
+        console.error('❌ Missing MAVEN_USERNAME or MAVEN_PASSWORD');
+        process.exit(1);
+    }
+    if (!deploymentZipPath) {
+        console.error('❌ Missing required --deploymentZipPath argument');
+        process.exit(1);
+    }
+    await publishToMavenApi(username, password, deploymentZipPath);
+})();

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/generators/ci-workflow/files/circleci/.circleci/config.yml.template

@@ -10,7 +10,7 @@ jobs:
       _JAVA_OPTIONS: "-Xmx3g"
       GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2"
     docker:
-      - image: cimg/openjdk:17.0-node
+      - image: cimg/openjdk:21.0-node
     steps:
       - checkout
 

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

@@ -17,6 +17,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          filter: tree:0
 
       # This enables task distribution via Nx Cloud
       # Run this command as early as possible, before dependencies are installed
@@ -24,15 +25,15 @@ jobs:
       <% 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"
 
-      - name: Set up JDK 17 for x64
+      - name: Set up JDK 21 for x64
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           architecture: x64
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v4
 
       - uses: nrwl/nx-set-shas@v4
 

package/src/generators/init/init.js

@@ -32,7 +32,6 @@ function addPlugin(tree) {
                 testTargetName: 'test',
                 classesTargetName: 'classes',
                 buildTargetName: 'build',
-                includeSubprojectsTasks: false,
             },
         });
         (0, devkit_1.updateNxJson)(tree, nxJson);
@@ -46,15 +45,14 @@ async function addBuildGradleFileNextToSettingsGradle(tree) {
         '**/settings.gradle?(.kts)',
     ]);
     settingsGradleFiles.forEach((settingsGradleFile) => {
-        addProjectReportToBuildGradle(settingsGradleFile, tree);
+        addNxProjectGraphPluginToBuildGradle(settingsGradleFile, tree);
     });
 }
 /**
  * - creates a build.gradle file next to the settings.gradle file if it does not exist.
- * - adds the project-report plugin to the build.gradle file if it does not exist.
- * - adds a task to generate project reports for all subprojects and included builds.
+ * - adds the NxProjectGraphPlugin plugin to the build.gradle file if it does not exist.
  */
-function addProjectReportToBuildGradle(settingsGradleFile, tree) {
+function addNxProjectGraphPluginToBuildGradle(settingsGradleFile, tree) {
     const filename = (0, path_1.basename)(settingsGradleFile);
     let gradleFilePath = 'build.gradle';
     if (filename.endsWith('.kts')) {
@@ -68,54 +66,40 @@ function addProjectReportToBuildGradle(settingsGradleFile, tree) {
     else {
         buildGradleContent = tree.read(gradleFilePath).toString();
     }
-    if (buildGradleContent.includes('allprojects')) {
-        if (!buildGradleContent.includes('"project-report"')) {
-            devkit_1.logger.warn(`Please add the project-report plugin to your ${gradleFilePath}:
+    const nxProjectGraphReportPlugin = filename.endsWith('.kts')
+        ? `id("${versions_1.gradleProjectGraphPluginName}") version("${versions_1.gradleProjectGraphVersion}")`
+        : `id "${versions_1.gradleProjectGraphPluginName}" version "${versions_1.gradleProjectGraphVersion}"`;
+    if (buildGradleContent.includes('plugins {')) {
+        if (!buildGradleContent.includes(versions_1.gradleProjectGraphPluginName)) {
+            buildGradleContent = buildGradleContent.replace('plugins {', `plugins {
+    ${nxProjectGraphReportPlugin}`);
+        }
+    }
+    else {
+        buildGradleContent = `plugins {
+    ${nxProjectGraphReportPlugin}
+}\n\r${buildGradleContent}`;
+    }
+    const applyNxProjectGraphReportPlugin = `plugin("${versions_1.gradleProjectGraphPluginName}")`;
+    if (buildGradleContent.includes('allprojects {')) {
+        if (!buildGradleContent.includes(`plugin("${versions_1.gradleProjectGraphPluginName}")`) &&
+            !buildGradleContent.includes(`plugin('${versions_1.gradleProjectGraphPluginName}')`)) {
+            devkit_1.logger.warn(`Please add the ${versions_1.gradleProjectGraphPluginName} plugin to your ${gradleFilePath}:
 allprojects {
   apply {
-      plugin("project-report")
+      ${applyNxProjectGraphReportPlugin}
   }
 }`);
         }
     }
     else {
-        buildGradleContent += `\n\rallprojects {
-  apply {
-      plugin("project-report")
-  }
-}`;
-    }
-    if (!buildGradleContent.includes(`tasks.register("projectReportAll")`)) {
-        if (gradleFilePath.endsWith('.kts')) {
-            buildGradleContent += `\n\rtasks.register("projectReportAll") {
-    // All project reports of subprojects
-    allprojects.forEach {
-        dependsOn(it.tasks.get("projectReport"))
-    }
-
-    // All projectReportAll of included builds
-    gradle.includedBuilds.forEach {
-        dependsOn(it.task(":projectReportAll"))
-    }
-}`;
-        }
-        else {
-            buildGradleContent += `\n\rtasks.register("projectReportAll") {
-        // All project reports of subprojects
-        allprojects.forEach {
-            dependsOn(it.tasks.getAt("projectReport"))
-        }
-    
-        // All projectReportAll of included builds
-        gradle.includedBuilds.forEach {
-            dependsOn(it.task(":projectReportAll"))
-        }
-    }`;
-        }
+        buildGradleContent = `${buildGradleContent}\n\rallprojects {
+    apply {
+        ${applyNxProjectGraphReportPlugin}
     }
-    if (buildGradleContent) {
-        tree.write(gradleFilePath, buildGradleContent);
+  }`;
     }
+    tree.write(gradleFilePath, buildGradleContent);
 }
 function updateNxJsonConfiguration(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);

package/src/migrations/19-4-0/add-project-report-all.d.ts

@@ -3,3 +3,7 @@ import { Tree } from '@nx/devkit';
  * This migration adds task `projectReportAll` to build.gradle files
  */
 export default function update(tree: Tree): Promise<void>;
+/**
+ * This function creates and populate build.gradle file next to the settings.gradle file.
+ */
+export declare function addBuildGradleFileNextToSettingsGradle(tree: Tree): Promise<void>;