@nx/gradle 0.0.0-pr-27930-e871993 → 0.0.0-pr-27940-4ec79a3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "0.0.0-pr-27930-e871993",
+  "version": "0.0.0-pr-27940-4ec79a3",
   "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": "0.0.0-pr-27930-e871993"
+    "@nx/devkit": "0.0.0-pr-27940-4ec79a3"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/init/init.js

@@ -4,11 +4,18 @@ exports.initGenerator = initGenerator;
 exports.addBuildGradleFileNextToSettingsGradle = addBuildGradleFileNextToSettingsGradle;
 exports.updateNxJsonConfiguration = updateNxJsonConfiguration;
 const devkit_1 = require("@nx/devkit");
+const child_process_1 = require("child_process");
 const versions_1 = require("../../utils/versions");
 const has_gradle_plugin_1 = require("../../utils/has-gradle-plugin");
 const path_1 = require("path");
 async function initGenerator(tree, options) {
     const tasks = [];
+    if (!tree.exists('settings.gradle') && !tree.exists('settings.gradle.kts')) {
+        devkit_1.logger.warn(`Could not find 'settings.gradle' or 'settings.gradle.kts' file in your gradle workspace.
+A Gradle build should contain a 'settings.gradle' or 'settings.gradle.kts' file in its root directory. It may also contain a 'build.gradle' or 'build.gradle.kts' file.
+Running 'gradle init':`);
+        (0, child_process_1.execSync)('gradle init', { stdio: 'inherit' });
+    }
     if (!options.skipPackageJson && tree.exists('package.json')) {
         tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
             '@nx/gradle': versions_1.nxVersion,

package/src/plugin/dependencies.js

@@ -6,8 +6,6 @@ const devkit_1 = require("@nx/devkit");
 const node_fs_1 = require("node:fs");
 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 get_project_report_lines_1 = require("../utils/get-project-report-lines");
 const createDependencies = async (_, context) => {
     const gradleFiles = findGradleFiles(context.filesToProcess);
     if (gradleFiles.length === 0) {
@@ -45,7 +43,7 @@ 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))) {
+            if (get_gradle_report_1.GRADLE_BUILD_FILES.has((0, node_path_1.basename)(file.file))) {
                 gradleFiles.push(file.file);
             }
         }
@@ -53,7 +51,7 @@ function findGradleFiles(fileMap) {
     return gradleFiles;
 }
 function processGradleDependencies(depsFile, gradleProjectNameToProjectRoot, sourceProjectName, gradleFile, context, dependencies) {
-    const lines = (0, node_fs_1.readFileSync)(depsFile).toString().split(get_project_report_lines_1.newLineSeparator);
+    const lines = (0, node_fs_1.readFileSync)(depsFile).toString().split(get_gradle_report_1.newLineSeparator);
     let inDeps = false;
     for (const line of lines) {
         if (line.startsWith('implementationDependenciesMetadata') ||

package/src/plugin/nodes.js

@@ -8,10 +8,9 @@ const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const devkit_internals_1 = require("nx/src/devkit-internals");
+const exec_gradle_1 = require("../utils/exec-gradle");
 const get_gradle_report_1 = require("../utils/get-gradle-report");
 const file_hasher_1 = require("nx/src/hasher/file-hasher");
-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'],
@@ -33,17 +32,17 @@ function writeTargetsToCache(cachePath, results) {
     (0, devkit_1.writeJsonFile)(cachePath, results);
 }
 exports.createNodesV2 = [
-    split_config_files_1.gradleConfigAndTestGlob,
+    get_gradle_report_1.gradleConfigAndTestGlob,
     async (files, options, context) => {
-        const { buildFiles, projectRoots, gradlewFiles, testFiles } = (0, split_config_files_1.splitConfigFiles)(files);
+        const { configFiles, projectRoots, testFiles } = splitConfigFiles(files);
         const optionsHash = (0, file_hasher_1.hashObject)(options);
         const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `gradle-${optionsHash}.hash`);
         const targetsCache = readTargetsCache(cachePath);
-        await (0, get_gradle_report_1.populateGradleReport)(context.workspaceRoot, gradlewFiles.map((f) => (0, node_path_1.join)(context.workspaceRoot, f)));
+        await (0, get_gradle_report_1.populateGradleReport)(context.workspaceRoot);
         const gradleReport = (0, get_gradle_report_1.getCurrentGradleReport)();
         const gradleProjectRootToTestFilesMap = getGradleProjectRootToTestFilesMap(testFiles, projectRoots);
         try {
-            return (0, devkit_1.createNodesFromFiles)((0, exports.makeCreateNodesForGradleConfigFile)(gradleReport, targetsCache, gradleProjectRootToTestFilesMap), buildFiles, options, context);
+            return (0, devkit_1.createNodesFromFiles)((0, exports.makeCreateNodesForGradleConfigFile)(gradleReport, targetsCache, gradleProjectRootToTestFilesMap), configFiles, options, context);
         }
         finally {
             writeTargetsToCache(cachePath, targetsCache);
@@ -71,14 +70,13 @@ exports.makeCreateNodesForGradleConfigFile = makeCreateNodesForGradleConfigFile;
   This function will change to the v2 function in Nx 20.
  */
 exports.createNodes = [
-    split_config_files_1.gradleConfigGlob,
-    async (buildFile, options, context) => {
+    get_gradle_report_1.gradleConfigGlob,
+    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.');
-        const { gradlewFiles } = (0, split_config_files_1.splitConfigFiles)(context.configFiles);
-        await (0, get_gradle_report_1.populateGradleReport)(context.workspaceRoot, gradlewFiles);
+        await (0, get_gradle_report_1.populateGradleReport)(context.workspaceRoot);
         const gradleReport = (0, get_gradle_report_1.getCurrentGradleReport)();
         const internalCreateNodes = (0, exports.makeCreateNodesForGradleConfigFile)(gradleReport);
-        return await internalCreateNodes(buildFile, options, context);
+        return await internalCreateNodes(configFile, options, context);
     },
 ];
 async function createGradleProject(gradleReport, gradleFilePath, options, context, testFiles = []) {
@@ -114,9 +112,8 @@ async function createGradleProject(gradleReport, gradleFilePath, options, contex
         return undefined;
     }
 }
-async function createGradleTargets(tasks, options, context, outputDirs, gradleProject, gradleBuildFilePath, testFiles = []) {
+async function createGradleTargets(tasks, options, context, outputDirs, gradleProject, gradleFilePath, testFiles = []) {
     const inputsMap = createInputsMap(context);
-    const gradlewFileDirectory = (0, node_path_1.dirname)((0, exec_gradle_1.findGraldewFile)(gradleBuildFilePath, context.workspaceRoot));
     const targets = {};
     const targetGroups = {};
     for (const task of tasks) {
@@ -127,14 +124,11 @@ async function createGradleTargets(tasks, options, context, outputDirs, gradlePr
                 outputDirs.get('testReport'),
                 outputDirs.get('testResults'),
             ].filter(Boolean);
-            getTestCiTargets(testFiles, gradleProject, targetName, options.ciTargetName, inputsMap['test'], outputs, task.type, targets, targetGroups, gradlewFileDirectory);
+            getTestCiTargets(testFiles, gradleProject, targetName, options.ciTargetName, inputsMap['test'], outputs, task.type, targets, targetGroups);
         }
         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],
@@ -170,7 +164,7 @@ function createInputsMap(context) {
             : ['default', '^default'],
     };
 }
-function getTestCiTargets(testFiles, gradleProject, testTargetName, ciTargetName, inputs, outputs, targetGroupName, targets, targetGroups, gradlewFileDirectory) {
+function getTestCiTargets(testFiles, gradleProject, testTargetName, ciTargetName, inputs, outputs, targetGroupName, targets, targetGroups) {
     if (!testFiles || testFiles.length === 0 || !ciTargetName) {
         return;
     }
@@ -184,9 +178,6 @@ function getTestCiTargets(testFiles, gradleProject, testTargetName, ciTargetName
         const targetName = ciTargetName + '--' + testName;
         targets[targetName] = {
             command: `${(0, exec_gradle_1.getGradleExecFile)()} ${taskCommandToRun} --tests ${testName}`,
-            options: {
-                cwd: gradlewFileDirectory,
-            },
             cache: true,
             inputs,
             dependsOn: dependsOnMap['test'],
@@ -233,6 +224,21 @@ function getTestCiTargets(testFiles, gradleProject, testTargetName, ciTargetName
     };
     targetGroups[targetGroupName].push(ciTargetName);
 }
+function splitConfigFiles(files) {
+    const configFiles = [];
+    const testFiles = [];
+    const projectRoots = new Set();
+    files.forEach((file) => {
+        if (get_gradle_report_1.GRADLE_BUILD_FILES.has((0, node_path_1.basename)(file))) {
+            configFiles.push(file);
+            projectRoots.add((0, node_path_1.dirname)(file));
+        }
+        else {
+            testFiles.push(file);
+        }
+    });
+    return { configFiles, testFiles, projectRoots: Array.from(projectRoots) };
+}
 function getGradleProjectRootToTestFilesMap(testFiles, projectRoots) {
     if (testFiles.length === 0 || projectRoots.length === 0) {
         return;

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

@@ -1,23 +1,4 @@
 import { ExecFileOptions } from 'node:child_process';
-/**
- * For gradle command, it needs to be run from the directory of the gradle binary
- * @returns gradle binary file name
- */
+export declare function getGradleBinaryPath(): string;
 export declare function getGradleExecFile(): string;
-/**
- * This function executes gradle with the given arguments
- * @param gradleBinaryPath absolute path to gradle binary
- * @param args args passed to gradle
- * @param execOptions exec options
- * @returns promise with the stdout buffer
- */
-export declare function execGradleAsync(gradleBinaryPath: string, args: ReadonlyArray<string>, execOptions?: ExecFileOptions): Promise<Buffer>;
-/**
- * This function recursively finds the nearest gradlew file in the workspace
- * @param originalFileToSearch the original file to search for
- * @param wr workspace root
- * @param currentSearchPath the path to start searching for gradlew file
- * @returns the relative path of the gradlew file to workspace root, throws an error if gradlew file is not found
- * It will return gradlew.bat file on windows and gradlew file on other platforms
- */
-export declare function findGraldewFile(originalFileToSearch: string, wr?: string, currentSearchPath?: string): string;
+export declare function execGradleAsync(args: ReadonlyArray<string>, execOptions?: ExecFileOptions): Promise<Buffer>;

package/src/utils/exec-gradle.js

@@ -1,34 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGradleBinaryPath = getGradleBinaryPath;
 exports.getGradleExecFile = getGradleExecFile;
 exports.execGradleAsync = execGradleAsync;
-exports.findGraldewFile = findGraldewFile;
 const devkit_1 = require("@nx/devkit");
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-/**
- * For gradle command, it needs to be run from the directory of the gradle binary
- * @returns gradle binary file name
- */
+function getGradleBinaryPath() {
+    const gradleFile = process.platform.startsWith('win')
+        ? 'gradlew.bat'
+        : 'gradlew';
+    const gradleBinaryPath = (0, node_path_1.join)(devkit_1.workspaceRoot, gradleFile);
+    if (!(0, node_fs_1.existsSync)(gradleBinaryPath)) {
+        throw new Error('Gradle is not setup. Run "gradle init"');
+    }
+    return gradleBinaryPath;
+}
 function getGradleExecFile() {
     return process.platform.startsWith('win') ? '.\\gradlew.bat' : './gradlew';
 }
-/**
- * This function executes gradle with the given arguments
- * @param gradleBinaryPath absolute path to gradle binary
- * @param args args passed to gradle
- * @param execOptions exec options
- * @returns promise with the stdout buffer
- */
-function execGradleAsync(gradleBinaryPath, args, execOptions = {}) {
+function execGradleAsync(args, execOptions = {}) {
+    const gradleBinaryPath = getGradleBinaryPath();
     return new Promise((res, rej) => {
         const cp = (0, node_child_process_1.execFile)(gradleBinaryPath, args, {
-            cwd: (0, node_path_1.dirname)(gradleBinaryPath),
+            ...execOptions,
             shell: true,
             windowsHide: true,
             env: process.env,
-            ...execOptions,
         });
         let stdout = Buffer.from('');
         cp.stdout?.on('data', (data) => {
@@ -44,36 +43,3 @@ function execGradleAsync(gradleBinaryPath, args, execOptions = {}) {
         });
     });
 }
-/**
- * This function recursively finds the nearest gradlew file in the workspace
- * @param originalFileToSearch the original file to search for
- * @param wr workspace root
- * @param currentSearchPath the path to start searching for gradlew file
- * @returns the relative path of the gradlew file to workspace root, throws an error if gradlew file is not found
- * It will return gradlew.bat file on windows and gradlew file on other platforms
- */
-function findGraldewFile(originalFileToSearch, wr = devkit_1.workspaceRoot, currentSearchPath) {
-    currentSearchPath ??= originalFileToSearch;
-    const parent = (0, node_path_1.dirname)(currentSearchPath);
-    if (currentSearchPath === parent) {
-        throw new devkit_1.AggregateCreateNodesError([
-            [
-                originalFileToSearch,
-                new Error('No Gradlew file found. Run "gradle init"'),
-            ],
-        ], []);
-    }
-    const gradlewPath = (0, node_path_1.join)(parent, 'gradlew');
-    const gradlewBatPath = (0, node_path_1.join)(parent, 'gradlew.bat');
-    if (process.platform.startsWith('win')) {
-        if ((0, node_fs_1.existsSync)((0, node_path_1.join)(wr, gradlewBatPath))) {
-            return gradlewBatPath;
-        }
-    }
-    else {
-        if ((0, node_fs_1.existsSync)((0, node_path_1.join)(wr, gradlewPath))) {
-            return gradlewPath;
-        }
-    }
-    return findGraldewFile(originalFileToSearch, wr, parent);
-}

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

@@ -1,3 +1,5 @@
+export declare const fileSeparator: string;
+export declare const newLineSeparator: string;
 export interface GradleReport {
     gradleFileToGradleProjectMap: Map<string, string>;
     buildFileToDepsMap: Map<string, string>;
@@ -7,16 +9,10 @@ export interface GradleReport {
     gradleProjectNameToProjectRootMap: Map<string, string>;
     gradleProjectToChildProjects: Map<string, string[]>;
 }
+export declare const GRADLE_BUILD_FILES: Set<string>;
+export declare const GRADLE_TEST_FILES: string[];
+export declare const gradleConfigGlob: string;
+export declare const gradleConfigAndTestGlob: string;
 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 populateGradleReport(workspaceRoot: string): Promise<void>;
 export declare function processProjectReports(projectReportLines: string[]): GradleReport;

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

@@ -1,54 +1,75 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.gradleConfigAndTestGlob = exports.gradleConfigGlob = exports.GRADLE_TEST_FILES = exports.GRADLE_BUILD_FILES = exports.newLineSeparator = exports.fileSeparator = void 0;
 exports.getCurrentGradleReport = getCurrentGradleReport;
 exports.populateGradleReport = populateGradleReport;
 exports.processProjectReports = processProjectReports;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const devkit_1 = require("@nx/devkit");
+const globs_1 = require("nx/src/utils/globs");
+const exec_gradle_1 = require("./exec-gradle");
 const workspace_context_1 = require("nx/src/utils/workspace-context");
 const path_1 = require("path");
-const split_config_files_1 = require("./split-config-files");
-const get_project_report_lines_1 = require("./get-project-report-lines");
+exports.fileSeparator = process.platform.startsWith('win')
+    ? 'file:///'
+    : 'file://';
+exports.newLineSeparator = process.platform.startsWith('win')
+    ? '\r\n'
+    : '\n';
 let gradleReportCache;
 let gradleCurrentConfigHash;
+exports.GRADLE_BUILD_FILES = new Set(['build.gradle', 'build.gradle.kts']);
+exports.GRADLE_TEST_FILES = [
+    '**/src/test/java/**/*Test.java',
+    '**/src/test/kotlin/**/*Test.kt',
+    '**/src/test/java/**/*Tests.java',
+    '**/src/test/kotlin/**/*Tests.kt',
+];
+exports.gradleConfigGlob = (0, globs_1.combineGlobPatterns)(...Array.from(exports.GRADLE_BUILD_FILES).map((file) => `**/${file}`));
+exports.gradleConfigAndTestGlob = (0, globs_1.combineGlobPatterns)(...Array.from(exports.GRADLE_BUILD_FILES).map((file) => `**/${file}`), ...exports.GRADLE_TEST_FILES);
 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`),
-            ],
-        ], []);
+        throw 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) {
+async function populateGradleReport(workspaceRoot) {
     const gradleConfigHash = await (0, workspace_context_1.hashWithWorkspaceContext)(workspaceRoot, [
-        split_config_files_1.gradleConfigAndTestGlob,
+        exports.gradleConfigGlob,
     ]);
     if (gradleReportCache && gradleConfigHash === gradleCurrentConfigHash) {
         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([]));
+    let projectReportLines;
+    try {
+        projectReportLines = await (0, exec_gradle_1.execGradleAsync)(['projectReportAll'], {
+            cwd: workspaceRoot,
+        });
+    }
+    catch (e) {
+        try {
+            projectReportLines = await (0, exec_gradle_1.execGradleAsync)(['projectReport'], {
+                cwd: workspaceRoot,
+            });
+            devkit_1.logger.warn('Could not run `projectReportAll` task. Ran `projectReport` instead. Please run `nx generate @nx/gradle:init` to generate the necessary tasks.');
+        }
+        catch (e) {
+            throw new devkit_1.AggregateCreateNodesError([
+                [
+                    null,
+                    new Error('Could not run `projectReportAll` or `projectReport` task. Please run `nx generate @nx/gradle:init` to generate the necessary tasks.'),
+                ],
+            ], []);
+        }
+    }
+    projectReportLines = projectReportLines
+        .toString()
+        .split(exports.newLineSeparator)
+        .filter((line) => line.trim() !== '');
     const gradleProjectReportEnd = performance.mark('gradleProjectReport:end');
     performance.measure('gradleProjectReport', gradleProjectReportStart.name, gradleProjectReportEnd.name);
-    gradleCurrentConfigHash = gradleConfigHash;
     gradleReportCache = processProjectReports(projectReportLines);
 }
 function processProjectReports(projectReportLines) {
@@ -83,21 +104,21 @@ function processProjectReports(projectReportLines) {
             if (line.endsWith(':dependencyReport')) {
                 const gradleProject = line.substring('> Task '.length, line.length - ':dependencyReport'.length);
                 while (index < projectReportLines.length &&
-                    !projectReportLines[index].includes(get_project_report_lines_1.fileSeparator)) {
+                    !projectReportLines[index].includes(exports.fileSeparator)) {
                     index++;
                 }
-                const [_, file] = projectReportLines[index].split(get_project_report_lines_1.fileSeparator);
+                const [_, file] = projectReportLines[index].split(exports.fileSeparator);
                 dependenciesMap.set(gradleProject, file);
             }
             if (line.endsWith('propertyReport')) {
                 const gradleProject = line.substring('> Task '.length, line.length - ':propertyReport'.length);
                 while (index < projectReportLines.length &&
-                    !projectReportLines[index].includes(get_project_report_lines_1.fileSeparator)) {
+                    !projectReportLines[index].includes(exports.fileSeparator)) {
                     index++;
                 }
-                const [_, file] = projectReportLines[index].split(get_project_report_lines_1.fileSeparator);
+                const [_, file] = projectReportLines[index].split(exports.fileSeparator);
                 const propertyReportLines = (0, node_fs_1.existsSync)(file)
-                    ? (0, node_fs_1.readFileSync)(file).toString().split(get_project_report_lines_1.newLineSeparator)
+                    ? (0, node_fs_1.readFileSync)(file).toString().split(exports.newLineSeparator)
                     : [];
                 let projectName, absBuildFilePath, absBuildDirPath;
                 const outputDirMap = new Map();
@@ -141,13 +162,13 @@ function processProjectReports(projectReportLines) {
             if (line.endsWith('taskReport')) {
                 const gradleProject = line.substring('> Task '.length, line.length - ':taskReport'.length);
                 while (index < projectReportLines.length &&
-                    !projectReportLines[index].includes(get_project_report_lines_1.fileSeparator)) {
+                    !projectReportLines[index].includes(exports.fileSeparator)) {
                     index++;
                 }
-                const [_, file] = projectReportLines[index].split(get_project_report_lines_1.fileSeparator);
+                const [_, file] = projectReportLines[index].split(exports.fileSeparator);
                 const taskTypeMap = new Map();
                 const tasksFileLines = (0, node_fs_1.existsSync)(file)
-                    ? (0, node_fs_1.readFileSync)(file).toString().split(get_project_report_lines_1.newLineSeparator)
+                    ? (0, node_fs_1.readFileSync)(file).toString().split(exports.newLineSeparator)
                     : [];
                 let i = 0;
                 while (i < tasksFileLines.length) {

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

@@ -1,8 +0,0 @@
-export declare const fileSeparator: string;
-export declare const newLineSeparator: string;
-/**
- * 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/src/utils/get-project-report-lines.js

@@ -1,53 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.newLineSeparator = exports.fileSeparator = void 0;
-exports.getProjectReportLines = getProjectReportLines;
-const devkit_1 = require("@nx/devkit");
-const exec_gradle_1 = require("./exec-gradle");
-const fs_1 = require("fs");
-const path_1 = require("path");
-exports.fileSeparator = process.platform.startsWith('win')
-    ? 'file:///'
-    : 'file://';
-exports.newLineSeparator = process.platform.startsWith('win')
-    ? '\r\n'
-    : '\n';
-/**
- * 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;
-    // if there is no build.gradle or build.gradle.kts file, we cannot run the projectReport nor projectReportAll task
-    if (!(0, fs_1.existsSync)((0, path_1.join)((0, path_1.dirname)(gradlewFile), 'build.gradle')) &&
-        !(0, fs_1.existsSync)((0, path_1.join)((0, path_1.dirname)(gradlewFile), 'build.gradle.kts'))) {
-        devkit_1.logger.warn(`Could not find build file near ${gradlewFile}. Please run 'nx generate @nx/gradle:init' to generate the necessary tasks.`);
-        return [];
-    }
-    try {
-        projectReportBuffer = await (0, exec_gradle_1.execGradleAsync)(gradlewFile, [
-            'projectReportAll',
-        ]);
-    }
-    catch (e) {
-        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.`);
-        }
-        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.`),
-                ],
-            ], []);
-        }
-    }
-    return projectReportBuffer
-        .toString()
-        .split(exports.newLineSeparator)
-        .filter((line) => line.trim() !== '');
-}

package/src/utils/split-config-files.d.ts

@@ -1,17 +0,0 @@
-export declare const GRADLE_BUILD_FILES: Set<string>;
-export declare const GRALDEW_FILES: Set<string>;
-export declare const GRADLE_TEST_FILES: string[];
-export declare const gradleConfigGlob: string;
-export declare const gradleConfigAndTestGlob: string;
-/**
- * This function split config files into build files, settings files, test files and project roots
- * @param files list of files to split
- * @returns object with buildFiles, gradlewFiles, testFiles and projectRoots
- * For gradlewFiles, it will start with settings files and find the nearest gradlew file in the workspace
- */
-export declare function splitConfigFiles(files: readonly string[]): {
-    buildFiles: string[];
-    gradlewFiles: string[];
-    testFiles: string[];
-    projectRoots: string[];
-};

package/src/utils/split-config-files.js

@@ -1,57 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gradleConfigAndTestGlob = exports.gradleConfigGlob = exports.GRADLE_TEST_FILES = exports.GRALDEW_FILES = exports.GRADLE_BUILD_FILES = void 0;
-exports.splitConfigFiles = splitConfigFiles;
-const globs_1 = require("nx/src/utils/globs");
-const node_path_1 = require("node:path");
-exports.GRADLE_BUILD_FILES = new Set(['build.gradle', 'build.gradle.kts']);
-exports.GRALDEW_FILES = new Set(['gradlew', 'gradlew.bat']);
-exports.GRADLE_TEST_FILES = [
-    '**/src/test/java/**/*Test.java',
-    '**/src/test/kotlin/**/*Test.kt',
-    '**/src/test/java/**/*Tests.java',
-    '**/src/test/kotlin/**/*Tests.kt',
-];
-exports.gradleConfigGlob = (0, globs_1.combineGlobPatterns)(...Array.from(exports.GRADLE_BUILD_FILES).map((file) => `**/${file}`));
-exports.gradleConfigAndTestGlob = (0, globs_1.combineGlobPatterns)(...Array.from(exports.GRADLE_BUILD_FILES).map((file) => `**/${file}`), ...Array.from(exports.GRALDEW_FILES).map((file) => `**/${file}`), ...exports.GRADLE_TEST_FILES);
-/**
- * This function split config files into build files, settings files, test files and project roots
- * @param files list of files to split
- * @returns object with buildFiles, gradlewFiles, testFiles and projectRoots
- * For gradlewFiles, it will start with settings files and find the nearest gradlew file in the workspace
- */
-function splitConfigFiles(files) {
-    const buildFiles = [];
-    const testFiles = [];
-    const gradlewFiles = [];
-    const projectRoots = new Set();
-    files.forEach((file) => {
-        const filename = (0, node_path_1.basename)(file);
-        const fileDirectory = (0, node_path_1.dirname)(file);
-        if (exports.GRADLE_BUILD_FILES.has(filename)) {
-            buildFiles.push(file);
-            projectRoots.add(fileDirectory);
-        }
-        else if (exports.GRALDEW_FILES.has(filename)) {
-            if (process.platform.startsWith('win')) {
-                if (filename === 'gradlew.bat') {
-                    gradlewFiles.push(file);
-                }
-            }
-            else {
-                if (filename === 'gradlew') {
-                    gradlewFiles.push(file);
-                }
-            }
-        }
-        else {
-            testFiles.push(file);
-        }
-    });
-    return {
-        buildFiles,
-        testFiles,
-        gradlewFiles,
-        projectRoots: Array.from(projectRoots),
-    };
-}