@nx/gradle 19.2.0-canary.20240531-2cb7ecb → 19.2.0-canary.20240604-0594deb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "19.2.0-canary.20240531-2cb7ecb",
+  "version": "19.2.0-canary.20240604-0594deb",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -34,7 +34,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "19.2.0-canary.20240531-2cb7ecb"
+    "@nx/devkit": "19.2.0-canary.20240604-0594deb"
   },
   "publishConfig": {
     "access": "public"

package/plugin.d.ts

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

package/plugin.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = exports.createDependencies = void 0;
+exports.createNodesV2 = exports.createNodes = 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/src/plugin/nodes.d.ts

@@ -15,7 +15,8 @@ export declare function writeTargetsToCache(cachePath: string, results: GradleTa
 export declare const createNodesV2: CreateNodesV2<GradlePluginOptions>;
 export declare const makeCreateNodes: (gradleReport: GradleReport, targetsCache: GradleTargets) => CreateNodesFunction;
 /**
- * @deprecated `{@link createNodesV2} is replacing this. Update your plugin to export its own `createNodesV2` function that wraps this one instead.`
+ @deprecated This is replaced with {@link createNodesV2}. Update your plugin to export its own `createNodesV2` function that wraps this one instead.
+  This function will change to the v2 function in Nx 20.
  */
 export declare const createNodes: CreateNodes<GradlePluginOptions>;
 export {};

package/src/plugin/nodes.js

@@ -28,7 +28,7 @@ exports.createNodesV2 = [
         const optionsHash = (0, file_hasher_1.hashObject)(options);
         const cachePath = (0, node_path_1.join)(cache_directory_1.projectGraphCacheDirectory, `gradle-${optionsHash}.hash`);
         const targetsCache = readTargetsCache(cachePath);
-        (0, get_gradle_report_1.populateGradleReport)(context.workspaceRoot);
+        await (0, get_gradle_report_1.populateGradleReport)(context.workspaceRoot);
         const gradleReport = (0, get_gradle_report_1.getCurrentGradleReport)();
         try {
             return await (0, devkit_1.createNodesFromFiles)((0, exports.makeCreateNodes)(gradleReport, targetsCache), configFiles, options, context);
@@ -38,9 +38,9 @@ exports.createNodesV2 = [
         }
     },
 ];
-const makeCreateNodes = (gradleReport, targetsCache) => (gradleFilePath, options, context) => {
+const makeCreateNodes = (gradleReport, targetsCache) => async (gradleFilePath, options, context) => {
     const projectRoot = (0, node_path_1.dirname)(gradleFilePath);
-    const hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options ?? {}, context);
+    const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options ?? {}, context);
     targetsCache[hash] ??= createGradleProject(gradleReport, gradleFilePath, options, context);
     const project = targetsCache[hash];
     if (!project) {
@@ -54,16 +54,17 @@ const makeCreateNodes = (gradleReport, targetsCache) => (gradleFilePath, options
 };
 exports.makeCreateNodes = makeCreateNodes;
 /**
- * @deprecated `{@link createNodesV2} is replacing this. Update your plugin to export its own `createNodesV2` function that wraps this one instead.`
+ @deprecated This is replaced with {@link createNodesV2}. Update your plugin to export its own `createNodesV2` function that wraps this one instead.
+  This function will change to the v2 function in Nx 20.
  */
 exports.createNodes = [
     get_gradle_report_1.gradleConfigGlob,
-    (configFile, options, context) => {
-        devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will error.');
-        (0, get_gradle_report_1.populateGradleReport)(context.workspaceRoot);
+    async (configFile, options, context) => {
+        devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.');
+        await (0, get_gradle_report_1.populateGradleReport)(context.workspaceRoot);
         const gradleReport = (0, get_gradle_report_1.getCurrentGradleReport)();
         const internalCreateNodes = (0, exports.makeCreateNodes)(gradleReport, {});
-        return internalCreateNodes(configFile, options, context);
+        return await internalCreateNodes(configFile, options, context);
     },
 ];
 function createGradleProject(gradleReport, gradleFilePath, options, context) {
@@ -110,12 +111,14 @@ function createGradleTargets(tasks, options, context, outputDirs, gradleProject)
             command: `${(0, exec_gradle_1.getGradleExecFile)()} ${gradleProject ? gradleProject + ':' : ''}${task.name}`,
             cache: cacheableTaskType.has(task.type),
             inputs: inputsMap[task.name],
-            outputs: outputs ? [outputs] : undefined,
             dependsOn: dependsOnMap[task.name],
             metadata: {
                 technologies: ['gradle'],
             },
         };
+        if (outputs) {
+            targets[targetName].outputs = [outputs];
+        }
         if (!targetGroups[task.type]) {
             targetGroups[task.type] = [];
         }

package/src/utils/get-gradle-report.d.ts

@@ -9,5 +9,5 @@ export interface GradleReport {
 }
 export declare const gradleConfigGlob = "**/build.{gradle.kts,gradle}";
 export declare function getCurrentGradleReport(): GradleReport;
-export declare function populateGradleReport(workspaceRoot: string): void;
+export declare function populateGradleReport(workspaceRoot: string): Promise<void>;
 export declare function processProjectReports(projectReportLines: string[]): GradleReport;

package/src/utils/get-gradle-report.js

@@ -22,8 +22,8 @@ function getCurrentGradleReport() {
     return gradleReportCache;
 }
 exports.getCurrentGradleReport = getCurrentGradleReport;
-function populateGradleReport(workspaceRoot) {
-    const gradleConfigHash = (0, workspace_context_1.hashWithWorkspaceContext)(workspaceRoot, [
+async function populateGradleReport(workspaceRoot) {
+    const gradleConfigHash = await (0, workspace_context_1.hashWithWorkspaceContext)(workspaceRoot, [
         exports.gradleConfigGlob,
     ]);
     if (gradleReportCache && gradleConfigHash === gradleCurrentConfigHash) {