@nx/gradle 19.0.0-beta.7 → 19.0.0-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "19.0.0-beta.7",
+  "version": "19.0.0-beta.9",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -33,7 +33,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "19.0.0-beta.7"
+    "@nx/devkit": "19.0.0-beta.9"
   },
   "publishConfig": {
     "access": "public"

package/src/plugin/nodes.d.ts

@@ -1,4 +1,4 @@
-import { CreateNodes, TargetConfiguration } from '@nx/devkit';
+import { CreateNodes, ProjectConfiguration, TargetConfiguration } from '@nx/devkit';
 export interface GradlePluginOptions {
     testTargetName?: string;
     classesTargetName?: string;
@@ -8,11 +8,11 @@ export interface GradlePluginOptions {
 export declare const calculatedTargets: Record<string, {
     name: string;
     targets: Record<string, TargetConfiguration>;
-    targetGroups: Record<string, string[]>;
+    metadata: ProjectConfiguration['metadata'];
 }>;
 export declare function writeTargetsToCache(targets: Record<string, {
     name: string;
     targets: Record<string, TargetConfiguration>;
-    targetGroups: Record<string, string[]>;
+    metadata: ProjectConfiguration['metadata'];
 }>): void;
 export declare const createNodes: CreateNodes<GradlePluginOptions>;

package/src/plugin/nodes.js

@@ -33,12 +33,7 @@ exports.createNodes = [
             exports.calculatedTargets[hash] = targetsCache[hash];
             return {
                 projects: {
-                    [projectRoot]: {
-                        ...targetsCache[hash],
-                        metadata: {
-                            technologies: ['gradle'],
-                        },
-                    },
+                    [projectRoot]: targetsCache[hash],
                 },
             };
         }
@@ -59,18 +54,15 @@ exports.createNodes = [
             }
             const outputDirs = gradleFileToOutputDirsMap.get(gradleFilePath);
             const { targets, targetGroups } = createGradleTargets(tasks, projectRoot, options, context, outputDirs);
-            exports.calculatedTargets[hash] = {
-                name: projectName,
-                targets,
-                targetGroups,
-            };
             const project = {
                 name: projectName,
                 targets,
                 metadata: {
+                    targetGroups,
                     technologies: ['gradle'],
                 },
             };
+            exports.calculatedTargets[hash] = project;
             return {
                 projects: {
                     [projectRoot]: project,
@@ -90,9 +82,8 @@ function createGradleTargets(tasks, projectRoot, options, context, outputDirs) {
     for (const task of tasks) {
         const targetName = options?.[`${task.name}TargetName`] ?? task.name;
         const outputs = outputDirs.get(task.name);
-        const path = (0, node_path_1.relative)((0, node_path_1.join)(context.workspaceRoot, projectRoot), (0, exec_gradle_1.getGradleBinaryPath)());
         targets[targetName] = {
-            command: `${path} ${task.name}`,
+            command: `${(0, exec_gradle_1.getGradleRelativePath)((0, node_path_1.join)(context.workspaceRoot, projectRoot))} ${task.name}`,
             options: {
                 cwd: projectRoot,
             },
@@ -100,6 +91,9 @@ function createGradleTargets(tasks, projectRoot, options, context, outputDirs) {
             inputs: inputsMap[task.name],
             outputs: outputs ? [outputs] : undefined,
             dependsOn: dependsOnMap[task.name],
+            metadata: {
+                technologies: ['gradle'],
+            },
         };
         if (!targetGroups[task.type]) {
             targetGroups[task.type] = [];

package/src/utils/exec-gradle.d.ts

@@ -4,4 +4,5 @@ import { ExecFileOptions } from 'child_process';
 import { ExecFileSyncOptionsWithBufferEncoding } from 'node:child_process';
 export declare function execGradle(args: string[], execOptions?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
 export declare function getGradleBinaryPath(): string;
+export declare function getGradleRelativePath(path: string): string;
 export declare function execGradleAsync(args: ReadonlyArray<string>, execOptions?: ExecFileOptions): Promise<Buffer>;

package/src/utils/exec-gradle.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.execGradleAsync = exports.getGradleBinaryPath = exports.execGradle = void 0;
+exports.execGradleAsync = exports.getGradleRelativePath = exports.getGradleBinaryPath = exports.execGradle = void 0;
 const devkit_1 = require("@nx/devkit");
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
@@ -21,6 +21,17 @@ function getGradleBinaryPath() {
     return gradleBinaryPath;
 }
 exports.getGradleBinaryPath = getGradleBinaryPath;
+function getGradleRelativePath(path) {
+    const gradleBinaryPath = getGradleBinaryPath();
+    let relativePath = (0, node_path_1.relative)(path, gradleBinaryPath);
+    if (relativePath.startsWith('gradlew')) {
+        relativePath = process.platform.startsWith('win')
+            ? `.\\${relativePath}`
+            : `./${relativePath}`;
+    }
+    return relativePath;
+}
+exports.getGradleRelativePath = getGradleRelativePath;
 function execGradleAsync(args, execOptions) {
     const gradleBinaryPath = getGradleBinaryPath();
     return new Promise((res, rej) => {