@nx/gradle 22.6.0-beta.10 → 22.6.0-beta.12

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;AAErC;;;;;;;;;;;;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,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"}

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

@@ -3,6 +3,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExcludeTasks = getExcludeTasks;
 exports.getGradleTaskNameWithNxTaskId = getGradleTaskNameWithNxTaskId;
 exports.getAllDependsOn = getAllDependsOn;
+/**
+ * Resolves a dependsOn entry to an Nx task ID (project:target format).
+ * Handles both string format ("project: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) {
+    if (typeof dep === 'string') {
+        return dep;
+    }
+    const target = dep?.target;
+    if (!target) {
+        return null;
+    }
+    if (dep.projects) {
+        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}`;
+    }
+    // Same-project dep (no projects field)
+    return `${owningProject}:${target}`;
+}
 /**
  * Returns Gradle CLI arguments to exclude dependent tasks
  * that are not part of the current execution set.
@@ -22,9 +48,9 @@ function getExcludeTasks(taskIds, nodes, runningTaskIds = new Set(), includeDepe
         const [project, target] = taskId.split(':');
         const taskDeps = nodes[project]?.data?.targets?.[target]?.dependsOn ?? [];
         for (const dep of taskDeps) {
-            const taskId = typeof dep === 'string' ? dep : dep?.target;
-            if (taskId && !runningTaskIds.has(taskId)) {
-                const gradleTaskName = getGradleTaskNameWithNxTaskId(taskId, nodes);
+            const depTaskId = resolveDepToTaskId(dep, project);
+            if (depTaskId && !runningTaskIds.has(depTaskId)) {
+                const gradleTaskName = getGradleTaskNameWithNxTaskId(depTaskId, nodes);
                 if (gradleTaskName && !includeDependsOnTasks.has(gradleTaskName)) {
                     excludes.add(gradleTaskName);
                 }
@@ -49,7 +75,7 @@ function getAllDependsOn(nodes, projectName, targetName) {
             const directDependencies = nodes[currentProjectName]?.data?.targets?.[currentTargetName]
                 ?.dependsOn ?? [];
             for (const dep of directDependencies) {
-                const depTaskId = typeof dep === 'string' ? dep : dep?.target;
+                const depTaskId = resolveDepToTaskId(dep, currentProjectName);
                 if (depTaskId && !allDependsOn.has(depTaskId)) {
                     stack.push(depTaskId);
                 }

package/src/migrations/22-6-0/change-plugin-version-0-1-14.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export default function update(tree: Tree): Promise<void>;
+//# sourceMappingURL=change-plugin-version-0-1-14.d.ts.map

package/src/migrations/22-6-0/change-plugin-version-0-1-14.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"change-plugin-version-0-1-14.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/migrations/22-6-0/change-plugin-version-0-1-14.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAc,MAAM,YAAY,CAAC;AAO9C,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,iBAgB9C"}

package/src/migrations/22-6-0/change-plugin-version-0-1-14.js

@@ -0,0 +1,23 @@
+"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");
+const gradle_project_graph_plugin_utils_1 = require("../../generators/init/gradle-project-graph-plugin-utils");
+const version_catalog_ast_utils_1 = require("../../utils/version-catalog-ast-utils");
+/* Change the plugin version to 0.1.14
+ */
+async function update(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson) {
+        return;
+    }
+    if (!(0, has_gradle_plugin_1.hasGradlePlugin)(tree)) {
+        return;
+    }
+    const gradlePluginVersionToUpdate = '0.1.14';
+    // Update version in version catalogs using AST-based approach to preserve formatting
+    await (0, version_catalog_ast_utils_1.updateNxPluginVersionInCatalogsAst)(tree, gradlePluginVersionToUpdate);
+    // Then update in build.gradle(.kts) files
+    await (0, gradle_project_graph_plugin_utils_1.addNxProjectGraphPlugin)(tree, gradlePluginVersionToUpdate);
+}

package/src/migrations/22-6-0/change-plugin-version-0-1-15.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export default function update(tree: Tree): Promise<void>;
+//# sourceMappingURL=change-plugin-version-0-1-15.d.ts.map

package/src/migrations/22-6-0/change-plugin-version-0-1-15.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"change-plugin-version-0-1-15.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/migrations/22-6-0/change-plugin-version-0-1-15.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAc,MAAM,YAAY,CAAC;AAO9C,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,iBAgB9C"}

package/src/migrations/22-6-0/change-plugin-version-0-1-15.js

@@ -0,0 +1,23 @@
+"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");
+const gradle_project_graph_plugin_utils_1 = require("../../generators/init/gradle-project-graph-plugin-utils");
+const version_catalog_ast_utils_1 = require("../../utils/version-catalog-ast-utils");
+/* Change the plugin version to 0.1.15
+ */
+async function update(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson) {
+        return;
+    }
+    if (!(0, has_gradle_plugin_1.hasGradlePlugin)(tree)) {
+        return;
+    }
+    const gradlePluginVersionToUpdate = '0.1.15';
+    // Update version in version catalogs using AST-based approach to preserve formatting
+    await (0, version_catalog_ast_utils_1.updateNxPluginVersionInCatalogsAst)(tree, gradlePluginVersionToUpdate);
+    // Then update in build.gradle(.kts) files
+    await (0, gradle_project_graph_plugin_utils_1.addNxProjectGraphPlugin)(tree, gradlePluginVersionToUpdate);
+}

package/src/utils/versions.d.ts

@@ -1,4 +1,4 @@
 export declare const nxVersion: any;
 export declare const gradleProjectGraphPluginName = "dev.nx.gradle.project-graph";
-export declare const gradleProjectGraphVersion = "0.1.13";
+export declare const gradleProjectGraphVersion = "0.1.15";
 //# sourceMappingURL=versions.d.ts.map

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.1.13';
+exports.gradleProjectGraphVersion = '0.1.15';