@nx/gradle 22.7.0-beta.7 → 22.7.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "22.7.0-beta.7",
+  "version": "22.7.0-beta.8",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -40,12 +40,12 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0-beta.7",
+    "@nx/devkit": "22.7.0-beta.8",
     "toml-eslint-parser": "^0.10.0",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.7.0-beta.7"
+    "nx": "22.7.0-beta.8"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/gradle/get-exclude-task.d.ts

@@ -1,4 +1,4 @@
-import { ProjectGraphProjectNode } from 'nx/src/config/project-graph';
+import { ProjectGraphProjectNode, Target } from '@nx/devkit';
 /**
  * Returns Gradle CLI arguments to exclude dependent tasks
  * that are not part of the current execution set.
@@ -6,13 +6,13 @@ import { ProjectGraphProjectNode } from 'nx/src/config/project-graph';
  * For example, if a project defines `dependsOn: ['lint']` for the `test` target,
  * and only `test` is running, this will return: ['lint']
  *
- * @param taskIds - Set of Nx task IDs to process
+ * @param tasks - Set of Target to process
  * @param nodes - Project graph nodes
- * @param runningTaskIds - Set of task IDs that are currently running (won't be excluded)
+ * @param runningTasks - Set of Target that are currently running (won't be excluded)
  * @param includeDependsOnTasks - Set of Gradle task names that should be included (not excluded)
  *   (typically provider-based dependencies that Gradle must resolve)
  */
-export declare function getExcludeTasks(taskIds: Set<string>, nodes: Record<string, ProjectGraphProjectNode>, runningTaskIds?: Set<string>, includeDependsOnTasks?: Set<string>): Set<string>;
-export declare function getGradleTaskNameWithNxTaskId(nxTaskId: string, nodes: Record<string, ProjectGraphProjectNode>): string | null;
-export declare function getAllDependsOn(nodes: Record<string, ProjectGraphProjectNode>, projectName: string, targetName: string): Set<string>;
+export declare function getExcludeTasks(tasks: Set<Target>, nodes: Record<string, ProjectGraphProjectNode>, runningTasks?: Set<Target>, includeDependsOnTasks?: Set<string>): Set<string>;
+export declare function getGradleTaskName(pt: Target, nodes: Record<string, ProjectGraphProjectNode>): string | null;
+export declare function getAllDependsOn(nodes: Record<string, ProjectGraphProjectNode>, projectName: string, targetName: string): Set<Target>;
 //# sourceMappingURL=get-exclude-task.d.ts.map

package/src/executors/gradle/get-exclude-task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-exclude-task.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/executors/gradle/get-exclude-task.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,uBAAuB,EACxB,MAAM,6BAA6B,CAAC;AAgCrC;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,EAC9C,cAAc,GAAE,GAAG,CAAC,MAAM,CAAa,EACvC,qBAAqB,GAAE,GAAG,CAAC,MAAM,CAAa,GAC7C,GAAG,CAAC,MAAM,CAAC,CAmBb;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,GAC7C,MAAM,GAAG,IAAI,CAKf;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,EAC9C,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GACjB,GAAG,CAAC,MAAM,CAAC,CAyBb"}
+{"version":3,"file":"get-exclude-task.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/executors/gradle/get-exclude-task.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,MAAM,EAEP,MAAM,YAAY,CAAC;AA+BpB;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,EAClB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,EAC9C,YAAY,GAAE,GAAG,CAAC,MAAM,CAAa,EACrC,qBAAqB,GAAE,GAAG,CAAC,MAAM,CAAa,GAC7C,GAAG,CAAC,MAAM,CAAC,CAsBb;AAED,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,GAC7C,MAAM,GAAG,IAAI,CAEf;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,EAC9C,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GACjB,GAAG,CAAC,MAAM,CAAC,CAgCb"}

package/src/executors/gradle/get-exclude-task.js

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExcludeTasks = getExcludeTasks;
-exports.getGradleTaskNameWithNxTaskId = getGradleTaskNameWithNxTaskId;
+exports.getGradleTaskName = getGradleTaskName;
 exports.getAllDependsOn = getAllDependsOn;
+const devkit_1 = require("@nx/devkit");
 /**
- * Resolves a dependsOn entry to an Nx task ID (project:target format).
- * Handles both string format ("project:target") and object format
+ * Resolves a dependsOn entry to a Target.
+ * Handles both string format ("target") and object format
  * ({ target: "name", projects?: ["proj1"] }).
  * For same-project object deps (no projects field), uses the owning project name.
  */
-function resolveDepToTaskId(dep, owningProject) {
+function resolveDepToTarget(dep, owningProject) {
     if (typeof dep === 'string') {
-        return dep;
+        return { project: owningProject, target: dep };
     }
     const target = dep?.target;
     if (!target) {
@@ -21,13 +22,12 @@ function resolveDepToTaskId(dep, owningProject) {
         const projectList = Array.isArray(dep.projects)
             ? dep.projects
             : [dep.projects];
-        // For cross-project deps, use the first project
-        return projectList[0] !== 'self'
-            ? `${projectList[0]}:${target}`
-            : `${owningProject}:${target}`;
+        return {
+            project: projectList[0] !== 'self' ? projectList[0] : owningProject,
+            target,
+        };
     }
-    // Same-project dep (no projects field)
-    return `${owningProject}:${target}`;
+    return { project: owningProject, target };
 }
 /**
  * Returns Gradle CLI arguments to exclude dependent tasks
@@ -36,21 +36,21 @@ function resolveDepToTaskId(dep, owningProject) {
  * For example, if a project defines `dependsOn: ['lint']` for the `test` target,
  * and only `test` is running, this will return: ['lint']
  *
- * @param taskIds - Set of Nx task IDs to process
+ * @param tasks - Set of Target to process
  * @param nodes - Project graph nodes
- * @param runningTaskIds - Set of task IDs that are currently running (won't be excluded)
+ * @param runningTasks - Set of Target that are currently running (won't be excluded)
  * @param includeDependsOnTasks - Set of Gradle task names that should be included (not excluded)
  *   (typically provider-based dependencies that Gradle must resolve)
  */
-function getExcludeTasks(taskIds, nodes, runningTaskIds = new Set(), includeDependsOnTasks = new Set()) {
+function getExcludeTasks(tasks, nodes, runningTasks = new Set(), includeDependsOnTasks = new Set()) {
     const excludes = new Set();
-    for (const taskId of taskIds) {
-        const [project, target] = taskId.split(':');
-        const taskDeps = nodes[project]?.data?.targets?.[target]?.dependsOn ?? [];
+    const runningKeys = new Set(Array.from(runningTasks).map(devkit_1.targetToTargetString));
+    for (const task of tasks) {
+        const taskDeps = nodes[task.project]?.data?.targets?.[task.target]?.dependsOn ?? [];
         for (const dep of taskDeps) {
-            const depTaskId = resolveDepToTaskId(dep, project);
-            if (depTaskId && !runningTaskIds.has(depTaskId)) {
-                const gradleTaskName = getGradleTaskNameWithNxTaskId(depTaskId, nodes);
+            const depPt = resolveDepToTarget(dep, task.project);
+            if (depPt && !runningKeys.has((0, devkit_1.targetToTargetString)(depPt))) {
+                const gradleTaskName = getGradleTaskName(depPt, nodes);
                 if (gradleTaskName && !includeDependsOnTasks.has(gradleTaskName)) {
                     excludes.add(gradleTaskName);
                 }
@@ -59,29 +59,34 @@ function getExcludeTasks(taskIds, nodes, runningTaskIds = new Set(), includeDepe
     }
     return excludes;
 }
-function getGradleTaskNameWithNxTaskId(nxTaskId, nodes) {
-    const [projectName, targetName] = nxTaskId.split(':');
-    const gradleTaskName = nodes[projectName]?.data?.targets?.[targetName]?.options?.taskName;
-    return gradleTaskName;
+function getGradleTaskName(pt, nodes) {
+    return nodes[pt.project]?.data?.targets?.[pt.target]?.options?.taskName;
 }
 function getAllDependsOn(nodes, projectName, targetName) {
     const allDependsOn = new Set();
-    const stack = [`${projectName}:${targetName}`];
+    const result = new Set();
+    const startKey = (0, devkit_1.targetToTargetString)({
+        project: projectName,
+        target: targetName,
+    });
+    const stack = [{ project: projectName, target: targetName }];
     while (stack.length > 0) {
-        const currentTaskId = stack.pop();
-        if (currentTaskId && !allDependsOn.has(currentTaskId)) {
-            allDependsOn.add(currentTaskId);
-            const [currentProjectName, currentTargetName] = currentTaskId.split(':');
-            const directDependencies = nodes[currentProjectName]?.data?.targets?.[currentTargetName]
-                ?.dependsOn ?? [];
+        const current = stack.pop();
+        const key = (0, devkit_1.targetToTargetString)(current);
+        if (!allDependsOn.has(key)) {
+            allDependsOn.add(key);
+            if (key !== startKey) {
+                result.add(current);
+            }
+            const directDependencies = nodes[current.project]?.data?.targets?.[current.target]?.dependsOn ??
+                [];
             for (const dep of directDependencies) {
-                const depTaskId = resolveDepToTaskId(dep, currentProjectName);
-                if (depTaskId && !allDependsOn.has(depTaskId)) {
-                    stack.push(depTaskId);
+                const depPt = resolveDepToTarget(dep, current.project);
+                if (depPt && !allDependsOn.has((0, devkit_1.targetToTargetString)(depPt))) {
+                    stack.push(depPt);
                 }
             }
         }
     }
-    allDependsOn.delete(`${projectName}:${targetName}`); // Exclude the starting task itself
-    return allDependsOn;
+    return result;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"gradle-batch.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/executors/gradle/gradle-batch.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEf,uBAAuB,EACvB,SAAS,EAEV,MAAM,YAAY,CAAC;AACpB,OAAO,EAEL,kBAAkB,EACnB,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAchD,eAAO,MAAM,eAAe,QAG3B,CAAC;AAEF,wBAA8B,WAAW,CACvC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC5C,SAAS,EAAE,kBAAkB,EAC7B,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,YAAY,CAAC,CAkEvB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EAAE,EACjB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC5C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC;;;;EAiE/C"}
+{"version":3,"file":"gradle-batch.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/executors/gradle/gradle-batch.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEf,uBAAuB,EAEvB,SAAS,EAEV,MAAM,YAAY,CAAC;AACpB,OAAO,EAEL,kBAAkB,EACnB,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAchD,eAAO,MAAM,eAAe,QAG3B,CAAC;AAEF,wBAA8B,WAAW,CACvC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC5C,SAAS,EAAE,kBAAkB,EAC7B,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,YAAY,CAAC,CAkEvB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EAAE,EACjB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC5C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC;;;;EAuE/C"}

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

@@ -56,49 +56,53 @@ async function gradleBatch(taskGraph, inputs, overrides, context) {
  * Get the gradlew task ids to run
  */
 function getGradlewTasksToRun(taskIds, taskGraph, inputs, nodes) {
-    const taskIdsWithExclude = new Set([]);
-    const testTaskIdsWithExclude = new Set([]);
-    const taskIdsWithoutExclude = new Set([]);
+    const tasksWithExclude = new Set();
+    const testTasksWithExclude = new Set();
+    const tasksWithoutExclude = new Set();
     const gradlewTasksToRun = {};
     const includeDependsOnTasks = new Set();
     for (const taskId of taskIds) {
         const task = taskGraph.tasks[taskId];
         const input = inputs[task.id];
+        const taskTarget = {
+            project: task.target.project,
+            target: task.target.target,
+        };
         gradlewTasksToRun[taskId] = input;
-        // Collect tasks that should be included (not excluded) - typically provider-based dependencies
         if (input.includeDependsOnTasks) {
-            for (const task of input.includeDependsOnTasks) {
-                includeDependsOnTasks.add(task);
+            for (const t of input.includeDependsOnTasks) {
+                includeDependsOnTasks.add(t);
             }
         }
         if (input.excludeDependsOn) {
             if (input.testClassName) {
-                testTaskIdsWithExclude.add(taskId);
+                testTasksWithExclude.add(taskTarget);
             }
             else {
-                taskIdsWithExclude.add(taskId);
+                tasksWithExclude.add(taskTarget);
             }
         }
         else {
-            taskIdsWithoutExclude.add(taskId);
+            tasksWithoutExclude.add(taskTarget);
         }
     }
-    const allDependsOn = new Set(taskIds);
-    for (const taskId of taskIdsWithoutExclude) {
-        const [projectName, targetName] = taskId.split(':');
-        const dependencies = (0, get_exclude_task_1.getAllDependsOn)(nodes, projectName, targetName);
-        dependencies.forEach((dep) => allDependsOn.add(dep));
+    const allRunning = new Set(taskIds.map((id) => ({
+        project: taskGraph.tasks[id].target.project,
+        target: taskGraph.tasks[id].target.target,
+    })));
+    for (const task of tasksWithoutExclude) {
+        const dependencies = (0, get_exclude_task_1.getAllDependsOn)(nodes, task.project, task.target);
+        dependencies.forEach((dep) => allRunning.add(dep));
     }
-    const excludeTasks = (0, get_exclude_task_1.getExcludeTasks)(taskIdsWithExclude, nodes, allDependsOn, includeDependsOnTasks);
+    const excludeTasks = (0, get_exclude_task_1.getExcludeTasks)(tasksWithExclude, nodes, allRunning, includeDependsOnTasks);
     const allTestsDependsOn = new Set();
-    for (const taskId of testTaskIdsWithExclude) {
-        const [projectName, targetName] = taskId.split(':');
-        const taskDependsOn = (0, get_exclude_task_1.getAllDependsOn)(nodes, projectName, targetName);
+    for (const task of testTasksWithExclude) {
+        const taskDependsOn = (0, get_exclude_task_1.getAllDependsOn)(nodes, task.project, task.target);
         taskDependsOn.forEach((dep) => allTestsDependsOn.add(dep));
     }
     const excludeTestTasks = new Set();
-    for (let taskId of allTestsDependsOn) {
-        const gradleTaskName = (0, get_exclude_task_1.getGradleTaskNameWithNxTaskId)(taskId, nodes);
+    for (const task of allTestsDependsOn) {
+        const gradleTaskName = (0, get_exclude_task_1.getGradleTaskName)(task, nodes);
         if (gradleTaskName) {
             excludeTestTasks.add(gradleTaskName);
         }

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

@@ -46,7 +46,7 @@ async function gradleExecutor(options, context) {
     });
     if (options.excludeDependsOn) {
         const includeDependsOnTasks = new Set(options.includeDependsOnTasks ?? []);
-        (0, get_exclude_task_1.getExcludeTasks)(new Set([`${context.projectName}:${context.targetName}`]), context.projectGraph.nodes, new Set(), includeDependsOnTasks).forEach((task) => {
+        (0, get_exclude_task_1.getExcludeTasks)(new Set([{ project: context.projectName, target: context.targetName }]), context.projectGraph.nodes, new Set(), includeDependsOnTasks).forEach((task) => {
             if (task) {
                 args.push('--exclude-task', task);
             }

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

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=publish-maven.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"publish-maven.d.ts","sourceRoot":"","sources":["../../../../packages/gradle/project-graph/publish-maven.ts"],"names":[],"mappings":""}

package/project-graph/publish-maven.js

@@ -1,104 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const axios_1 = tslib_1.__importDefault(require("axios"));
-const fs = tslib_1.__importStar(require("fs"));
-const form_data_1 = tslib_1.__importDefault(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 form_data_1.default();
-    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);
-})();