@nx/gradle 23.3.0 → 24.0.0-beta.0

package/README.md

@@ -1,7 +1,7 @@
-<p style="text-align: center;">
+<p align="center">
   <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
-    <img alt="Nx - Smart Monorepos · Fast Builds" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo-light.svg">
+    <img alt="Nx Logo" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.svg" width="140">
   </picture>
 </p>
 
@@ -64,6 +64,3 @@ npx nx@latest init
 - [Official Nx YouTube Channel](https://www.youtube.com/@NxDevtools)
 - [Blog Posts About Nx](https://nx.dev/blog)
 
-<p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart Monorepos · Fast Builds"></a></p>
-

package/dist/src/migrations/update-24-0-0/migrate-plugin-v1-to-gradle.d.ts

@@ -0,0 +1,4 @@
+import { type Tree } from '@nx/devkit';
+export default function update(tree: Tree): Promise<{
+    skipAgentic: boolean;
+}>;

package/dist/src/migrations/update-24-0-0/migrate-plugin-v1-to-gradle.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const devkit_1 = require("@nx/devkit");
+const gradle_project_graph_plugin_utils_1 = require("../../generators/init/gradle-project-graph-plugin-utils");
+// `@nx/gradle` reads the project graph from this Gradle plugin, which v1 never applied.
+const GRADLE_PROJECT_GRAPH_VERSION = '0.1.25';
+async function update(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson?.plugins) {
+        return { skipAgentic: true };
+    }
+    let changed = false;
+    nxJson.plugins = nxJson.plugins.map((p) => {
+        if (p === '@nx/gradle/plugin-v1') {
+            changed = true;
+            return '@nx/gradle';
+        }
+        if (typeof p === 'string' || p.plugin !== '@nx/gradle/plugin-v1') {
+            return p;
+        }
+        changed = true;
+        p.plugin = '@nx/gradle';
+        const options = p.options;
+        if (options?.ciTargetName !== undefined) {
+            options.ciTestTargetName ??= options.ciTargetName;
+            delete options.ciTargetName;
+        }
+        delete options?.includeSubprojectsTasks;
+        return p;
+    });
+    if (!changed) {
+        return { skipAgentic: true };
+    }
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+    await (0, gradle_project_graph_plugin_utils_1.addNxProjectGraphPlugin)(tree, GRADLE_PROJECT_GRAPH_VERSION);
+    await (0, devkit_1.formatFiles)(tree);
+}

package/dist/src/migrations/update-24-0-0/migrate-plugin-v1-to-gradle.md

@@ -0,0 +1,46 @@
+#### Replace `@nx/gradle/plugin-v1` with `@nx/gradle`
+
+Nx 24 removes the `@nx/gradle/plugin-v1` entry point. This migration switches every `@nx/gradle/plugin-v1` registration in `nx.json` to `@nx/gradle`. It keeps each registration's position and its `include` and `exclude` patterns.
+
+It also maps the plugin options:
+
+- Renames `ciTargetName` to `ciTestTargetName`. An existing `ciTestTargetName` wins.
+- Removes `includeSubprojectsTasks`, which `@nx/gradle` doesn't support.
+- Keeps `testTargetName`, `buildTargetName`, `classesTargetName`, and other `<taskName>TargetName` options.
+
+`@nx/gradle` reads the project graph from the `dev.nx.gradle.project-graph` Gradle plugin. The migration applies it in the `build.gradle` or `build.gradle.kts` file next to each `settings.gradle` or `settings.gradle.kts` file.
+
+#### Sample code changes
+
+##### Before
+
+```json title="nx.json"
+{
+  "plugins": [
+    {
+      "plugin": "@nx/gradle/plugin-v1",
+      "options": {
+        "testTargetName": "test",
+        "ciTargetName": "test-ci",
+        "includeSubprojectsTasks": false
+      }
+    }
+  ]
+}
+```
+
+##### After
+
+```json title="nx.json"
+{
+  "plugins": [
+    {
+      "plugin": "@nx/gradle",
+      "options": {
+        "testTargetName": "test",
+        "ciTestTargetName": "test-ci"
+      }
+    }
+  ]
+}
+```

package/migrations.json

@@ -186,6 +186,12 @@
       "description": "Change dev.nx.gradle.project-graph to version 0.1.25 in build file",
       "implementation": "./dist/src/migrations/23-2-0/change-plugin-version-0-1-25",
       "documentation": "./dist/src/migrations/23-2-0/change-plugin-version-0-1-25.md"
+    },
+    "update-24-0-0-migrate-plugin-v1-to-gradle": {
+      "version": "24.0.0-beta.0",
+      "description": "Replace the removed `@nx/gradle/plugin-v1` plugin with `@nx/gradle` in `nx.json`, map its options, and apply the `dev.nx.gradle.project-graph` Gradle plugin.",
+      "implementation": "./dist/src/migrations/update-24-0-0/migrate-plugin-v1-to-gradle",
+      "documentation": "./dist/src/migrations/update-24-0-0/migrate-plugin-v1-to-gradle.md"
     }
   },
   "packageJsonUpdates": {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "23.3.0",
+  "version": "24.0.0-beta.0",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -27,9 +27,6 @@
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
-      "plugin-v1": [
-        "dist/plugin-v1.d.ts"
-      ],
       "src/*": [
         "dist/src/*.d.ts"
       ],
@@ -51,11 +48,6 @@
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
-    "./plugin-v1": {
-      "@nx/nx-source": "./plugin-v1.ts",
-      "types": "./dist/plugin-v1.d.ts",
-      "default": "./dist/plugin-v1.js"
-    },
     "./package.json": "./package.json",
     "./migrations.json": "./migrations.json",
     "./generators.json": "./generators.json",
@@ -75,12 +67,12 @@
     "supportsOptionalMigrations": true
   },
   "dependencies": {
-    "@nx/devkit": "23.3.0",
+    "@nx/devkit": "24.0.0-beta.0",
     "toml-eslint-parser": "^0.10.0",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "23.3.0"
+    "nx": "24.0.0-beta.0"
   },
   "publishConfig": {
     "access": "public"

package/readme-template.md

@@ -1,7 +1,7 @@
-<p style="text-align: center;">
+<p align="center">
   <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
-    <img alt="Nx - Smart Monorepos · Fast Builds" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo-light.svg">
+    <img alt="Nx Logo" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.svg" width="140">
   </picture>
 </p>
 

package/dist/plugin-v1.d.ts

@@ -1,4 +0,0 @@
-/** @deprecated Use `@nx/gradle` instead. This entry will be removed in Nx 24. */
-export { createDependencies } from './src/plugin-v1/dependencies';
-/** @deprecated Use `@nx/gradle` instead. This entry will be removed in Nx 24. */
-export { createNodes, createNodesV2 } from './src/plugin-v1/nodes';

package/dist/plugin-v1.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodesV2 = exports.createNodes = exports.createDependencies = void 0;
-const internal_1 = require("@nx/devkit/internal");
-// TODO(v24): remove `@nx/gradle/plugin-v1` entirely. Users should be migrated
-// to `@nx/gradle` (the atomized v2 plugin) via the removal migration shipped
-// alongside the deletion.
-//
-// Use emitPluginWorkerLog so the warning surfaces to the user even when the
-// daemon is enabled — `logger.warn` would route to the daemon log file and
-// be silently swallowed. Guard against older nx versions (< 22.7) where this
-// helper may not exist; @nx/devkit supports nx at +/-1 major.
-if (typeof internal_1.emitPluginWorkerLog === 'function') {
-    (0, internal_1.emitPluginWorkerLog)('warn', '`@nx/gradle/plugin-v1` is deprecated and will be removed in Nx 24. ' +
-        'Switch your `nx.json` plugins entry from `@nx/gradle/plugin-v1` to `@nx/gradle`. ' +
-        'Note that the default `@nx/gradle` plugin generates atomized targets — ' +
-        'see https://nx.dev/nx-api/gradle for configuration options.');
-}
-/** @deprecated Use `@nx/gradle` instead. This entry will be removed in Nx 24. */
-var dependencies_1 = require("./src/plugin-v1/dependencies");
-Object.defineProperty(exports, "createDependencies", { enumerable: true, get: function () { return dependencies_1.createDependencies; } });
-/** @deprecated Use `@nx/gradle` instead. This entry will be removed in Nx 24. */
-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/dist/src/plugin-v1/dependencies.d.ts

@@ -1,6 +0,0 @@
-import { CreateDependencies } from '@nx/devkit';
-/**
- * @deprecated The `@nx/gradle/plugin-v1` entry is deprecated and will be removed in Nx 24.
- * Switch to the default `@nx/gradle` plugin.
- */
-export declare const createDependencies: CreateDependencies;

package/dist/src/plugin-v1/dependencies.js

@@ -1,68 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDependencies = void 0;
-const devkit_1 = require("@nx/devkit");
-const node_path_1 = require("node:path");
-const get_gradle_report_1 = require("./utils/get-gradle-report");
-const split_config_files_1 = require("../utils/split-config-files");
-/**
- * @deprecated The `@nx/gradle/plugin-v1` entry is deprecated and will be removed in Nx 24.
- * Switch to the default `@nx/gradle` plugin.
- */
-const createDependencies = async (_, context) => {
-    const gradleFiles = findGradleFiles(context.filesToProcess);
-    if (gradleFiles.length === 0) {
-        return [];
-    }
-    const gradleDependenciesStart = performance.mark('gradleDependencies:start');
-    const { gradleFileToGradleProjectMap, gradleProjectNameToProjectRootMap, gradleProjectToDepsMap, gradleProjectToChildProjects, } = (0, get_gradle_report_1.getCurrentGradleReport)();
-    const dependencies = new Set();
-    for (const gradleFile of gradleFiles) {
-        const gradleProject = gradleFileToGradleProjectMap.get(gradleFile);
-        const projectName = Object.values(context.projects).find((project) => project.root === (0, node_path_1.dirname)(gradleFile))?.name;
-        const dependedProjects = gradleProjectToDepsMap.get(gradleProject);
-        if (projectName && dependedProjects?.size) {
-            dependedProjects?.forEach((dependedProject) => {
-                const targetProjectRoot = gradleProjectNameToProjectRootMap.get(dependedProject);
-                const targetProjectName = Object.values(context.projects).find((project) => project.root === targetProjectRoot)?.name;
-                if (targetProjectName) {
-                    const dependency = {
-                        source: projectName,
-                        target: targetProjectName,
-                        type: devkit_1.DependencyType.static,
-                        sourceFile: gradleFile,
-                    };
-                    (0, devkit_1.validateDependency)(dependency, context);
-                    dependencies.add(dependency);
-                }
-            });
-        }
-        gradleProjectToChildProjects.get(gradleProject)?.forEach((childProject) => {
-            if (childProject) {
-                const dependency = {
-                    source: projectName,
-                    target: childProject,
-                    type: devkit_1.DependencyType.static,
-                    sourceFile: gradleFile,
-                };
-                (0, devkit_1.validateDependency)(dependency, context);
-                dependencies.add(dependency);
-            }
-        });
-    }
-    const gradleDependenciesEnd = performance.mark('gradleDependencies:end');
-    performance.measure('gradleDependencies', gradleDependenciesStart.name, gradleDependenciesEnd.name);
-    return Array.from(dependencies);
-};
-exports.createDependencies = createDependencies;
-function findGradleFiles(fileMap) {
-    const gradleFiles = [];
-    for (const [_, files] of Object.entries(fileMap.projectFileMap)) {
-        for (const file of files) {
-            if (split_config_files_1.GRADLE_BUILD_FILES.has((0, node_path_1.basename)(file.file))) {
-                gradleFiles.push(file.file);
-            }
-        }
-    }
-    return gradleFiles;
-}

package/dist/src/plugin-v1/nodes.d.ts

@@ -1,28 +0,0 @@
-import { PluginCache } from '@nx/devkit/internal';
-import { CreateNodes, CreateNodesContext, ProjectConfiguration } from '@nx/devkit';
-import { GradleReport } from './utils/get-gradle-report';
-export interface GradlePluginOptions {
-    includeSubprojectsTasks?: boolean;
-    ciTargetName?: string;
-    testTargetName?: string;
-    classesTargetName?: string;
-    buildTargetName?: string;
-    [taskTargetName: string]: string | undefined | boolean;
-}
-/**
- * @deprecated The `@nx/gradle/plugin-v1` entry is deprecated and will be removed in Nx 24.
- * Switch to the default `@nx/gradle` plugin.
- */
-export declare const createNodesV2: CreateNodes<GradlePluginOptions>;
-export declare const makeCreateNodesForGradleConfigFile: (gradleReport: GradleReport, pluginCache: PluginCache<Partial<ProjectConfiguration>>, gradleProjectRootToTestFilesMap?: Record<string, string[]>, hashes?: string[]) => (gradleFilePath: any, options: GradlePluginOptions | undefined, context: CreateNodesContext, idx?: number) => Promise<{
-    projects?: undefined;
-} | {
-    projects: {
-        [x: string]: Partial<ProjectConfiguration>;
-    };
-}>;
-/**
- @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>;

package/dist/src/plugin-v1/nodes.js

@@ -1,265 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = exports.makeCreateNodesForGradleConfigFile = exports.createNodesV2 = void 0;
-const internal_1 = require("@nx/devkit/internal");
-const devkit_1 = require("@nx/devkit");
-const node_path_1 = require("node:path");
-const get_gradle_report_1 = require("./utils/get-gradle-report");
-const split_config_files_1 = require("../utils/split-config-files");
-const exec_gradle_1 = require("../utils/exec-gradle");
-const cacheableTaskType = new Set(['Build', 'Verification']);
-const dependsOnMap = {
-    build: ['^build', 'classes', 'test'],
-    testClasses: ['classes'],
-    test: ['testClasses'],
-    classes: ['^classes'],
-};
-function normalizeOptions(options) {
-    options ??= {};
-    options.testTargetName ??= 'test';
-    options.classesTargetName ??= 'classes';
-    options.buildTargetName ??= 'build';
-    return options;
-}
-/**
- * @deprecated The `@nx/gradle/plugin-v1` entry is deprecated and will be removed in Nx 24.
- * Switch to the default `@nx/gradle` plugin.
- */
-exports.createNodesV2 = [
-    split_config_files_1.gradleConfigAndTestGlob,
-    async (files, options, context) => {
-        const { buildFiles, projectRoots, gradlewFiles, testFiles } = (0, split_config_files_1.splitConfigFiles)(files);
-        const optionsHash = (0, internal_1.hashObject)(options);
-        const cachePath = (0, node_path_1.join)(internal_1.workspaceDataDirectory, `gradle-${optionsHash}.hash`);
-        const pluginCache = new internal_1.PluginCache(cachePath);
-        await (0, get_gradle_report_1.populateGradleReport)(context.workspaceRoot, gradlewFiles.map((f) => (0, node_path_1.join)(context.workspaceRoot, f)));
-        const gradleReport = (0, get_gradle_report_1.getCurrentGradleReport)();
-        const gradleProjectRootToTestFilesMap = getGradleProjectRootToTestFilesMap(testFiles, projectRoots);
-        try {
-            const buildFileProjectRoots = buildFiles.map((f) => (0, node_path_1.dirname)(f));
-            const buildFileHashes = await (0, internal_1.calculateHashesForCreateNodes)(buildFileProjectRoots, normalizeOptions(options) ?? {}, context);
-            return (0, devkit_1.createNodesFromFiles)((0, exports.makeCreateNodesForGradleConfigFile)(gradleReport, pluginCache, gradleProjectRootToTestFilesMap, buildFileHashes), buildFiles, options, context);
-        }
-        finally {
-            pluginCache.writeToDisk();
-        }
-    },
-];
-const makeCreateNodesForGradleConfigFile = (gradleReport, pluginCache, gradleProjectRootToTestFilesMap = {}, hashes) => async (gradleFilePath, options, context, idx) => {
-    const projectRoot = (0, node_path_1.dirname)(gradleFilePath);
-    options = normalizeOptions(options);
-    let hash;
-    if (hashes && idx !== undefined) {
-        hash = hashes[idx];
-        if (hash === undefined) {
-            throw new Error(`Failed to compute hash for gradle project at ${projectRoot}`);
-        }
-    }
-    else {
-        const [computed] = await (0, internal_1.calculateHashesForCreateNodes)([projectRoot], options ?? {}, context);
-        if (computed === undefined) {
-            throw new Error(`Failed to compute hash for gradle project at ${projectRoot}`);
-        }
-        hash = computed;
-    }
-    if (!pluginCache.has(hash)) {
-        pluginCache.set(hash, await createGradleProject(gradleReport, gradleFilePath, options, context, gradleProjectRootToTestFilesMap[projectRoot]));
-    }
-    const project = pluginCache.get(hash);
-    if (!project) {
-        return {};
-    }
-    return {
-        projects: {
-            [projectRoot]: project,
-        },
-    };
-};
-exports.makeCreateNodesForGradleConfigFile = makeCreateNodesForGradleConfigFile;
-/**
- @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 = exports.createNodesV2;
-async function createGradleProject(gradleReport, gradleFilePath, options, context, testFiles = []) {
-    try {
-        const { gradleProjectToTasksTypeMap, gradleProjectToTasksMap, gradleFileToOutputDirsMap, gradleFileToGradleProjectMap, gradleProjectToProjectName, } = gradleReport;
-        const gradleProject = gradleFileToGradleProjectMap.get(gradleFilePath);
-        const projectName = gradleProjectToProjectName.get(gradleProject);
-        if (!projectName) {
-            return;
-        }
-        const tasksTypeMap = gradleProjectToTasksTypeMap.get(gradleProject);
-        const tasksSet = gradleProjectToTasksMap.get(gradleProject);
-        let tasks = [];
-        tasksSet.forEach((taskName) => {
-            tasks.push({
-                type: tasksTypeMap?.get(taskName),
-                name: taskName,
-            });
-        });
-        if (options.includeSubprojectsTasks) {
-            tasksTypeMap.forEach((taskType, taskName) => {
-                if (!tasksSet.has(taskName)) {
-                    tasks.push({
-                        type: taskType,
-                        name: taskName,
-                    });
-                }
-            });
-        }
-        const outputDirs = gradleFileToOutputDirsMap.get(gradleFilePath);
-        const { targets, targetGroups } = await createGradleTargets(tasks, options, context, outputDirs, gradleProject, gradleFilePath, testFiles);
-        const project = {
-            name: projectName,
-            projectType: 'application',
-            targets,
-            metadata: {
-                targetGroups,
-                technologies: ['gradle'],
-            },
-        };
-        return project;
-    }
-    catch (e) {
-        console.error(e);
-        return undefined;
-    }
-}
-async function createGradleTargets(tasks, options, context, outputDirs, gradleProject, gradleBuildFilePath, testFiles = []) {
-    const inputsMap = createInputsMap(context);
-    const gradlewFileDirectory = (0, node_path_1.dirname)((0, exec_gradle_1.findGradlewFile)(gradleBuildFilePath, context.workspaceRoot));
-    const targets = {};
-    const targetGroups = {};
-    for (const task of tasks) {
-        const targetName = options?.[`${task.name}TargetName`] ?? task.name;
-        let outputs = [outputDirs.get(task.name)].filter(Boolean);
-        if (task.name === 'test') {
-            outputs = [
-                outputDirs.get('testReport'),
-                outputDirs.get('testResults'),
-            ].filter(Boolean);
-            getTestCiTargets(testFiles, gradleProject, targetName, options.ciTargetName, inputsMap['test'], outputs, task.type, targets, targetGroups, gradlewFileDirectory);
-        }
-        const taskCommandToRun = `${gradleProject ? gradleProject + ':' : ''}${task.name}`;
-        targets[targetName] = {
-            command: `${(0, exec_gradle_1.getGradleExecFile)()} ${taskCommandToRun}`,
-            options: {
-                cwd: gradlewFileDirectory,
-            },
-            cache: cacheableTaskType.has(task.type),
-            inputs: inputsMap[task.name],
-            dependsOn: dependsOnMap[task.name],
-            metadata: {
-                technologies: ['gradle'],
-                help: {
-                    command: `${(0, exec_gradle_1.getGradleExecFile)()} help --task ${taskCommandToRun}`,
-                    example: {
-                        options: {
-                            args: ['--rerun'],
-                        },
-                    },
-                },
-            },
-            ...(outputs && outputs.length ? { outputs } : {}),
-        };
-        if (task.type) {
-            if (!targetGroups[task.type]) {
-                targetGroups[task.type] = [];
-            }
-            targetGroups[task.type].push(targetName);
-        }
-    }
-    return { targetGroups, targets };
-}
-function createInputsMap(context) {
-    const namedInputs = context.nxJsonConfiguration.namedInputs;
-    return {
-        build: namedInputs?.production
-            ? ['production', '^production']
-            : ['default', '^default'],
-        test: ['default', namedInputs?.production ? '^production' : '^default'],
-        classes: namedInputs?.production
-            ? ['production', '^production']
-            : ['default', '^default'],
-    };
-}
-function getTestCiTargets(testFiles, gradleProject, testTargetName, ciTargetName, inputs, outputs, targetGroupName, targets, targetGroups, gradlewFileDirectory) {
-    if (!testFiles || testFiles.length === 0 || !ciTargetName) {
-        return;
-    }
-    const taskCommandToRun = `${gradleProject ? gradleProject + ':' : ''}test`;
-    if (!targetGroups[targetGroupName]) {
-        targetGroups[targetGroupName] = [];
-    }
-    const dependsOn = [];
-    testFiles.forEach((testFile) => {
-        const testName = (0, node_path_1.basename)(testFile).split('.')[0];
-        const targetName = ciTargetName + '--' + testName;
-        targets[targetName] = {
-            command: `${(0, exec_gradle_1.getGradleExecFile)()} ${taskCommandToRun} --tests ${testName}`,
-            options: {
-                cwd: gradlewFileDirectory,
-            },
-            cache: true,
-            inputs,
-            dependsOn: dependsOnMap['test'],
-            metadata: {
-                technologies: ['gradle'],
-                description: `Runs Gradle test ${testFile} in CI`,
-                help: {
-                    command: `${(0, exec_gradle_1.getGradleExecFile)()} help --task ${taskCommandToRun}`,
-                    example: {
-                        options: {
-                            args: ['--rerun'],
-                        },
-                    },
-                },
-            },
-            ...(outputs && outputs.length > 0 ? { outputs } : {}),
-        };
-        targetGroups[targetGroupName].push(targetName);
-        dependsOn.push({
-            target: targetName,
-            params: 'forward',
-        });
-    });
-    targets[ciTargetName] = {
-        executor: 'nx:noop',
-        cache: true,
-        inputs,
-        dependsOn: dependsOn,
-        ...(outputs && outputs.length > 0 ? { outputs } : {}),
-        metadata: {
-            technologies: ['gradle'],
-            description: 'Runs Gradle Tests in CI',
-            nonAtomizedTarget: testTargetName,
-            help: {
-                command: `${(0, exec_gradle_1.getGradleExecFile)()} help --task ${taskCommandToRun}`,
-                example: {
-                    options: {
-                        args: ['--rerun'],
-                    },
-                },
-            },
-        },
-    };
-    targetGroups[targetGroupName].push(ciTargetName);
-}
-function getGradleProjectRootToTestFilesMap(testFiles, projectRoots) {
-    if (testFiles.length === 0 || projectRoots.length === 0) {
-        return;
-    }
-    const roots = new Map(projectRoots.map((root) => [root, root]));
-    const testFilesToGradleProjectMap = {};
-    testFiles.forEach((testFile) => {
-        const projectRoot = (0, internal_1.findProjectForPath)(testFile, roots);
-        if (projectRoot) {
-            if (!testFilesToGradleProjectMap[projectRoot]) {
-                testFilesToGradleProjectMap[projectRoot] = [];
-            }
-            testFilesToGradleProjectMap[projectRoot].push(testFile);
-        }
-    });
-    return testFilesToGradleProjectMap;
-}

package/dist/src/plugin-v1/utils/get-gradle-report.d.ts

@@ -1,36 +0,0 @@
-export interface GradleReport {
-    gradleFileToGradleProjectMap: Map<string, string>;
-    gradleFileToOutputDirsMap: Map<string, Map<string, string>>;
-    gradleProjectToDepsMap: Map<string, Set<string>>;
-    gradleProjectToTasksTypeMap: Map<string, Map<string, string>>;
-    gradleProjectToTasksMap: Map<string, Set<string>>;
-    gradleProjectToProjectName: Map<string, string>;
-    gradleProjectNameToProjectRootMap: Map<string, string>;
-    gradleProjectToChildProjects: Map<string, string[]>;
-}
-export interface GradleReportJSON {
-    hash: string;
-    gradleFileToGradleProjectMap: Record<string, string>;
-    gradleProjectToDepsMap: Record<string, Array<string>>;
-    gradleFileToOutputDirsMap: Record<string, Record<string, string>>;
-    gradleProjectToTasksTypeMap: Record<string, Record<string, string>>;
-    gradleProjectToTasksMap: Record<string, Array<string>>;
-    gradleProjectToProjectName: Record<string, string>;
-    gradleProjectNameToProjectRootMap: Record<string, string>;
-    gradleProjectToChildProjects: Record<string, string[]>;
-}
-export declare function writeGradleReportToCache(cachePath: string, results: GradleReport, hash: string): void;
-export declare function getCurrentGradleReport(): GradleReport;
-/**
- * This function populates the gradle report cache.
- * For each gradlew file, it runs the `projectReportAll` task and processes the output.
- * If `projectReportAll` fails, it runs the `projectReport` task instead.
- * It will throw an error if both tasks fail.
- * It will accumulate the output of all gradlew files.
- * @param workspaceRoot
- * @param gradlewFiles absolute paths to all gradlew files in the workspace
- * @returns Promise<void>
- */
-export declare function populateGradleReport(workspaceRoot: string, gradlewFiles: string[]): Promise<void>;
-export declare function processProjectReports(projectReportLines: string[]): GradleReport;
-export declare function processGradleDependencies(depsFile: string): Set<string>;

package/dist/src/plugin-v1/utils/get-gradle-report.js

@@ -1,279 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeGradleReportToCache = writeGradleReportToCache;
-exports.getCurrentGradleReport = getCurrentGradleReport;
-exports.populateGradleReport = populateGradleReport;
-exports.processProjectReports = processProjectReports;
-exports.processGradleDependencies = processGradleDependencies;
-const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
-const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
-const split_config_files_1 = require("../../utils/split-config-files");
-const get_project_report_lines_1 = require("./get-project-report-lines");
-const exec_gradle_1 = require("../../utils/exec-gradle");
-const internal_1 = require("@nx/devkit/internal");
-function readGradleReportCache(cachePath, hash) {
-    const gradleReportJson = (0, node_fs_1.existsSync)(cachePath)
-        ? (0, devkit_1.readJsonFile)(cachePath)
-        : undefined;
-    if (!gradleReportJson || gradleReportJson.hash !== hash) {
-        return;
-    }
-    let results = {
-        gradleFileToGradleProjectMap: new Map(Object.entries(gradleReportJson['gradleFileToGradleProjectMap'])),
-        gradleProjectToDepsMap: new Map(Object.entries(gradleReportJson['gradleProjectToDepsMap']).map(([key, value]) => [key, new Set(value)])),
-        gradleFileToOutputDirsMap: new Map(Object.entries(gradleReportJson['gradleFileToOutputDirsMap']).map(([key, value]) => [key, new Map(Object.entries(value))])),
-        gradleProjectToTasksTypeMap: new Map(Object.entries(gradleReportJson['gradleProjectToTasksTypeMap']).map(([key, value]) => [key, new Map(Object.entries(value))])),
-        gradleProjectToTasksMap: new Map(Object.entries(gradleReportJson['gradleProjectToTasksMap']).map(([key, value]) => [key, new Set(value)])),
-        gradleProjectToProjectName: new Map(Object.entries(gradleReportJson['gradleProjectToProjectName'])),
-        gradleProjectNameToProjectRootMap: new Map(Object.entries(gradleReportJson['gradleProjectNameToProjectRootMap'])),
-        gradleProjectToChildProjects: new Map(Object.entries(gradleReportJson['gradleProjectToChildProjects'])),
-    };
-    return results;
-}
-function writeGradleReportToCache(cachePath, results, hash) {
-    let gradleReportJson = {
-        hash,
-        gradleFileToGradleProjectMap: Object.fromEntries(results.gradleFileToGradleProjectMap),
-        gradleProjectToDepsMap: Object.fromEntries(Array.from(results.gradleProjectToDepsMap).map(([key, value]) => [
-            key,
-            Array.from(value),
-        ])),
-        gradleFileToOutputDirsMap: Object.fromEntries(Array.from(results.gradleFileToOutputDirsMap).map(([key, value]) => [
-            key,
-            Object.fromEntries(value),
-        ])),
-        gradleProjectToTasksTypeMap: Object.fromEntries(Array.from(results.gradleProjectToTasksTypeMap).map(([key, value]) => [
-            key,
-            Object.fromEntries(value),
-        ])),
-        gradleProjectToTasksMap: Object.fromEntries(Array.from(results.gradleProjectToTasksMap).map(([key, value]) => [
-            key,
-            Array.from(value),
-        ])),
-        gradleProjectToProjectName: Object.fromEntries(results.gradleProjectToProjectName),
-        gradleProjectNameToProjectRootMap: Object.fromEntries(results.gradleProjectNameToProjectRootMap),
-        gradleProjectToChildProjects: Object.fromEntries(results.gradleProjectToChildProjects),
-    };
-    try {
-        (0, devkit_1.writeJsonFile)(cachePath, gradleReportJson);
-    }
-    catch (e) {
-        devkit_1.logger.warn(`Failed to write Gradle report cache to ${cachePath}: ${e instanceof Error ? e.message : 'unknown error'}`);
-    }
-}
-let gradleReportCache;
-let gradleReportCachePath = (0, node_path_1.join)(internal_1.workspaceDataDirectory, 'gradle-report-v1.hash');
-function getCurrentGradleReport() {
-    if (!gradleReportCache) {
-        throw new devkit_1.AggregateCreateNodesError([
-            [
-                null,
-                new Error(`Expected cached gradle report. Please open an issue at https://github.com/nrwl/nx/issues/new/choose`),
-            ],
-        ], []);
-    }
-    return gradleReportCache;
-}
-/**
- * This function populates the gradle report cache.
- * For each gradlew file, it runs the `projectReportAll` task and processes the output.
- * If `projectReportAll` fails, it runs the `projectReport` task instead.
- * It will throw an error if both tasks fail.
- * It will accumulate the output of all gradlew files.
- * @param workspaceRoot
- * @param gradlewFiles absolute paths to all gradlew files in the workspace
- * @returns Promise<void>
- */
-async function populateGradleReport(workspaceRoot, gradlewFiles) {
-    const gradleConfigHash = await (0, internal_1.hashWithWorkspaceContext)(workspaceRoot, [
-        split_config_files_1.gradleConfigAndTestGlob,
-    ]);
-    const cached = readGradleReportCache(gradleReportCachePath, gradleConfigHash);
-    if (cached) {
-        gradleReportCache = cached;
-        return;
-    }
-    const gradleProjectReportStart = performance.mark('gradleProjectReport:start');
-    const projectReportLines = await gradlewFiles.reduce(async (projectReportLines, gradlewFile) => {
-        const allLines = await projectReportLines;
-        const currentLines = await (0, get_project_report_lines_1.getProjectReportLines)(gradlewFile);
-        return [...allLines, ...currentLines];
-    }, Promise.resolve([]));
-    const gradleProjectReportEnd = performance.mark('gradleProjectReport:end');
-    performance.measure('gradleProjectReport', gradleProjectReportStart.name, gradleProjectReportEnd.name);
-    gradleReportCache = processProjectReports(projectReportLines);
-    writeGradleReportToCache(gradleReportCachePath, gradleReportCache, gradleConfigHash);
-}
-function processProjectReports(projectReportLines) {
-    /**
-     * Map of Gradle File path to Gradle Project Name
-     */
-    const gradleFileToGradleProjectMap = new Map();
-    const gradleProjectToDepsMap = new Map();
-    /**
-     * Map of Gradle Build File to tasks type map
-     */
-    const gradleProjectToTasksTypeMap = new Map();
-    const gradleProjectToTasksMap = new Map();
-    const gradleProjectToProjectName = new Map();
-    const gradleProjectNameToProjectRootMap = new Map();
-    /**
-     * Map fo possible output files of each gradle file
-     * e.g. {build.gradle.kts: { projectReportDir: '' testReportDir: '' }}
-     */
-    const gradleFileToOutputDirsMap = new Map();
-    /**
-     * Map of Gradle Project to its child projects
-     */
-    const gradleProjectToChildProjects = new Map();
-    let index = 0;
-    while (index < projectReportLines.length) {
-        const line = projectReportLines[index].trim();
-        if (line.startsWith('> Task ')) {
-            if (line.endsWith(':dependencyReport')) {
-                const gradleProject = line.substring('> Task '.length, line.length - ':dependencyReport'.length);
-                while (index < projectReportLines.length &&
-                    !projectReportLines[index].includes(exec_gradle_1.fileSeparator)) {
-                    index++;
-                }
-                const [_, file] = projectReportLines[index].split(exec_gradle_1.fileSeparator);
-                gradleProjectToDepsMap.set(gradleProject, processGradleDependencies(file));
-            }
-            if (line.endsWith('propertyReport')) {
-                const gradleProject = line.substring('> Task '.length, line.length - ':propertyReport'.length);
-                while (index < projectReportLines.length &&
-                    !projectReportLines[index].includes(exec_gradle_1.fileSeparator)) {
-                    index++;
-                }
-                const [_, file] = projectReportLines[index].split(exec_gradle_1.fileSeparator);
-                const propertyReportLines = (0, node_fs_1.existsSync)(file)
-                    ? (0, node_fs_1.readFileSync)(file).toString().split(exec_gradle_1.newLineSeparator)
-                    : [];
-                let projectName, absBuildFilePath, absBuildDirPath;
-                const outputDirMap = new Map();
-                const tasks = new Set();
-                for (const line of propertyReportLines) {
-                    if (line.startsWith('name: ')) {
-                        projectName = line.substring('name: '.length);
-                    }
-                    if (line.startsWith('buildFile: ')) {
-                        absBuildFilePath = line.substring('buildFile: '.length);
-                    }
-                    if (line.startsWith('buildDir: ')) {
-                        absBuildDirPath = line.substring('buildDir: '.length);
-                    }
-                    if (line.startsWith('childProjects: ')) {
-                        const childProjects = line.substring('childProjects: {'.length, line.length - 1); // remove curly braces {} around childProjects
-                        gradleProjectToChildProjects.set(gradleProject, childProjects
-                            .split(',')
-                            .map((c) => c.trim().split('=')[0])
-                            .filter(Boolean) // e.g. get project name from text like "app=project ':app', mylibrary=project ':mylibrary'"
-                        );
-                    }
-                    if (line.includes('Dir: ')) {
-                        const [dirName, dirPath] = line.split(': ');
-                        const taskName = dirName.replace('Dir', '');
-                        outputDirMap.set(taskName, `{workspaceRoot}/${(0, devkit_1.normalizePath)((0, node_path_1.relative)(devkit_1.workspaceRoot, dirPath))}`);
-                    }
-                    if (line.includes(': task ')) {
-                        const [task] = line.split(': task ');
-                        tasks.add(task);
-                    }
-                }
-                if (!projectName || !absBuildFilePath || !absBuildDirPath) {
-                    continue;
-                }
-                const buildFile = (0, devkit_1.normalizePath)((0, node_path_1.relative)(devkit_1.workspaceRoot, absBuildFilePath));
-                const buildDir = (0, devkit_1.normalizePath)((0, node_path_1.relative)(devkit_1.workspaceRoot, absBuildDirPath));
-                outputDirMap.set('build', `{workspaceRoot}/${buildDir}`);
-                outputDirMap.set('classes', `{workspaceRoot}/${buildDir}/classes`);
-                gradleFileToOutputDirsMap.set(buildFile, outputDirMap);
-                gradleFileToGradleProjectMap.set(buildFile, gradleProject);
-                gradleProjectToProjectName.set(gradleProject, projectName);
-                gradleProjectNameToProjectRootMap.set(gradleProject, (0, path_1.dirname)(buildFile));
-                gradleProjectToTasksMap.set(gradleProject, tasks);
-            }
-            if (line.endsWith('taskReport')) {
-                const gradleProject = line.substring('> Task '.length, line.length - ':taskReport'.length);
-                while (index < projectReportLines.length &&
-                    !projectReportLines[index].includes(exec_gradle_1.fileSeparator)) {
-                    index++;
-                }
-                const [_, file] = projectReportLines[index].split(exec_gradle_1.fileSeparator);
-                const taskTypeMap = new Map();
-                const tasksFileLines = (0, node_fs_1.existsSync)(file)
-                    ? (0, node_fs_1.readFileSync)(file).toString().split(exec_gradle_1.newLineSeparator)
-                    : [];
-                let i = 0;
-                while (i < tasksFileLines.length) {
-                    const line = tasksFileLines[i];
-                    if (line.endsWith('tasks')) {
-                        const dashes = new Array(line.length + 1).join('-');
-                        if (tasksFileLines[i + 1] === dashes) {
-                            const type = line.substring(0, line.length - ' tasks'.length);
-                            i++;
-                            while (tasksFileLines[++i] !== '' &&
-                                i < tasksFileLines.length &&
-                                tasksFileLines[i]?.includes(' - ')) {
-                                const [taskName] = tasksFileLines[i].split(' - ');
-                                taskTypeMap.set(taskName, type);
-                            }
-                        }
-                    }
-                    i++;
-                }
-                gradleProjectToTasksTypeMap.set(gradleProject, taskTypeMap);
-            }
-        }
-        index++;
-    }
-    return {
-        gradleFileToGradleProjectMap,
-        gradleFileToOutputDirsMap,
-        gradleProjectToTasksTypeMap,
-        gradleProjectToDepsMap,
-        gradleProjectToTasksMap,
-        gradleProjectToProjectName,
-        gradleProjectNameToProjectRootMap,
-        gradleProjectToChildProjects,
-    };
-}
-function processGradleDependencies(depsFile) {
-    const dependedProjects = new Set();
-    const lines = (0, node_fs_1.readFileSync)(depsFile).toString().split(exec_gradle_1.newLineSeparator);
-    let inDeps = false;
-    for (const line of lines) {
-        if (line.startsWith('implementationDependenciesMetadata') ||
-            line.startsWith('compileClasspath')) {
-            inDeps = true;
-            continue;
-        }
-        if (inDeps) {
-            if (line === '') {
-                inDeps = false;
-                continue;
-            }
-            const [indents, dep] = line.split('--- ');
-            if (indents === '\\' || indents === '+') {
-                let targetProjectName;
-                if (dep.startsWith('project ')) {
-                    targetProjectName = dep
-                        .substring('project '.length)
-                        .replace(/ \(n\)$/, '')
-                        .trim()
-                        .split(' ')?.[0];
-                }
-                else if (dep.includes('-> project')) {
-                    const [_, projectName] = dep.split('-> project');
-                    targetProjectName = projectName.trim().split(' ')?.[0];
-                }
-                if (targetProjectName) {
-                    dependedProjects.add(targetProjectName);
-                }
-            }
-        }
-    }
-    return dependedProjects;
-}

package/dist/src/plugin-v1/utils/get-project-report-lines.d.ts

@@ -1,6 +0,0 @@
-/**
- * This function executes the gradle projectReportAll task and returns the output as an array of lines.
- * @param gradlewFile the absolute path to the gradlew file
- * @returns project report lines
- */
-export declare function getProjectReportLines(gradlewFile: string): Promise<string[]>;

package/dist/src/plugin-v1/utils/get-project-report-lines.js

@@ -1,66 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProjectReportLines = getProjectReportLines;
-const devkit_1 = require("@nx/devkit");
-const exec_gradle_1 = require("../../utils/exec-gradle");
-/**
- * This function executes the gradle projectReportAll task and returns the output as an array of lines.
- * @param gradlewFile the absolute path to the gradlew file
- * @returns project report lines
- */
-async function getProjectReportLines(gradlewFile) {
-    let projectReportBuffer;
-    try {
-        projectReportBuffer = await (0, exec_gradle_1.execGradleAsync)(gradlewFile, [
-            'projectReportAll',
-            process.env.NX_VERBOSE_LOGGING === 'true' ? '--info' : '',
-            '--exclude-task',
-            'htmlDependencyReport',
-        ]);
-    }
-    catch (e) {
-        if (e.toString()?.includes('ERROR: JAVA_HOME')) {
-            throw new devkit_1.AggregateCreateNodesError([
-                [
-                    gradlewFile,
-                    new Error(`Could not find Java. Please install Java and try again: https://www.java.com/en/download/help/index_installing.html.\n\r${e.toString()}`),
-                ],
-            ], []);
-        }
-        else if (e.toString()?.includes(`Task 'projectReportAll' not found`)) {
-            try {
-                projectReportBuffer = await (0, exec_gradle_1.execGradleAsync)(gradlewFile, [
-                    'projectReport',
-                ]);
-                devkit_1.logger.warn(`Could not run 'projectReportAll' task. Ran 'projectReport' instead. Please run 'nx generate @nx/gradle:init' to generate the necessary tasks.\n\r${e.toString()}`);
-            }
-            catch (e) {
-                throw new devkit_1.AggregateCreateNodesError([
-                    [
-                        gradlewFile,
-                        new Error(`Could not run 'projectReportAll' or 'projectReport' task. Please run 'nx generate @nx/gradle:init' to generate the necessary tasks.\n\r${e.toString()}`),
-                    ],
-                ], []);
-            }
-        }
-        else {
-            throw new devkit_1.AggregateCreateNodesError([
-                [
-                    gradlewFile,
-                    new Error(`Could not run 'projectReportAll' or 'projectReport' Gradle task. Please install Gradle and try again: https://gradle.org/install/.\r\n${e.toString()}`),
-                ],
-            ], []);
-        }
-    }
-    const projectReportLines = projectReportBuffer
-        .toString()
-        .split(exec_gradle_1.newLineSeparator)
-        .filter((line) => line.trim() !== '');
-    if (process.env.NX_VERBOSE_LOGGING === 'true') {
-        devkit_1.output.log({
-            title: `Successfully ran projectReportAll or projectRerport task using ${gradlewFile}`,
-            bodyLines: projectReportLines,
-        });
-    }
-    return projectReportLines;
-}