@nx/gradle 0.0.0-pr-11-e92ae29 → 0.0.0-pr-29464-ce29f31

package/executors.json

@@ -0,0 +1,10 @@
+{
+  "executors": {
+    "gradlew": {
+      "batchImplementation": "./src/executors/gradlew/gradlew.impl#batchGradlew",
+      "implementation": "./src/executors/gradlew/gradlew.impl",
+      "schema": "./src/executors/gradlew/schema.json",
+      "description": "gradlew.impl executor"
+    }
+  }
+}

package/native/gradle.properties

@@ -0,0 +1,7 @@
+# This file was generated by the Gradle 'init' task.
+# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configuration-cache=false
+version=0.0.1-alpha.3

package/native/project.json

@@ -0,0 +1,4 @@
+{
+  "name": "gradle-native-plugin",
+  "$schema": "node_modules/nx/schemas/project-schema.json"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "0.0.0-pr-11-e92ae29",
+  "version": "0.0.0-pr-29464-ce29f31",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -26,6 +26,7 @@
   "generators": "./generators.json",
   "exports": {
     ".": "./index.js",
+    "./plugin-v1": "./plugin-v1.js",
     "./package.json": "./package.json",
     "./migrations.json": "./migrations.json",
     "./generators.json": "./generators.json"
@@ -34,11 +35,12 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-11-e92ae29"
+    "@nx/devkit": "0.0.0-pr-29464-ce29f31"
   },
   "publishConfig": {
     "access": "public"
   },
+  "executors": "./executors.json",
   "types": "./index.d.ts",
   "type": "commonjs"
 }

package/plugin-v1.d.ts

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

package/plugin-v1.js

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

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

package/plugin.js

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

@@ -0,0 +1,8 @@
+import { ExecutorContext, TaskGraph } from '@nx/devkit';
+import { RunCommandsOptions } from 'nx/src/executors/run-commands/run-commands.impl';
+import { BatchResults } from 'nx/src/tasks-runner/batch/batch-messages';
+export declare function graldewExecutor(options: RunCommandsOptions, context: ExecutorContext): Promise<{
+    success: boolean;
+}>;
+export default graldewExecutor;
+export declare function batchGradlew(taskGraph: TaskGraph, inputs: Record<string, RunCommandsOptions>, overrides: RunCommandsOptions, context: ExecutorContext): Promise<BatchResults>;

package/src/executors/gradlew/gradlew.impl.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.graldewExecutor = graldewExecutor;
+exports.batchGradlew = batchGradlew;
+const run_commands_impl_1 = require("nx/src/executors/run-commands/run-commands.impl");
+const MAX_PROJECTS_IN_BATCH = 10;
+async function graldewExecutor(options, context) {
+    const results = await (0, run_commands_impl_1.default)(options, context);
+    return { success: results.success };
+}
+exports.default = graldewExecutor;
+async function batchGradlew(taskGraph, inputs, overrides, context) {
+    const regex = /[./\\]*gradlew[\w.-]*/;
+    let gradlewCommand;
+    const roots = taskGraph.roots.slice(0, MAX_PROJECTS_IN_BATCH);
+    const tasksRan = [];
+    const results = {};
+    const gradlewTasks = roots.flatMap((task) => {
+        const gradlewTask = inputs[task].command;
+        if (typeof gradlewTask !== 'string')
+            return [];
+        const match = gradlewTask.match(regex);
+        if (!match)
+            return [];
+        results[task] = { success: false, terminalOutput: '' };
+        tasksRan.push(task);
+        gradlewCommand = match[0]; // Store the first found gradlewCommand
+        return gradlewTask.replace(gradlewCommand, '').trim();
+    });
+    const startTime = Date.now();
+    const { success, terminalOutput } = await (0, run_commands_impl_1.default)({
+        command: `${gradlewCommand} ${gradlewTasks.join(' ')}`,
+        __unparsed__: [],
+        ...(overrides ?? {}),
+    }, context);
+    const endTime = Date.now();
+    tasksRan.forEach((task) => {
+        results[task] = {
+            success,
+            terminalOutput,
+            startTime,
+            endTime,
+        };
+    });
+    return results;
+}

package/src/executors/gradlew/schema.json

@@ -0,0 +1,9 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "version": 2,
+  "title": "GradlewImpl executor",
+  "description": "The GradlewImpl executor is used to run Gradle tasks.",
+  "type": "object",
+  "properties": {},
+  "required": []
+}

package/src/generators/ci-workflow/files/circleci/.circleci/config.yml.template

@@ -10,7 +10,7 @@ jobs:
       _JAVA_OPTIONS: "-Xmx3g"
       GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2"
     docker:
-      - image: cimg/openjdk:17.0-node
+      - image: cimg/openjdk:21.0-node
     steps:
       - checkout
 

package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml.template

@@ -24,15 +24,15 @@ jobs:
       <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
       # - run: <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-jvm" --stop-agents-after="build"
 
-      - name: Set up JDK 17 for x64
+      - name: Set up JDK 21 for x64
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           architecture: x64
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v4
 
       - uses: nrwl/nx-set-shas@v4
 

package/src/generators/init/init.js

@@ -7,6 +7,7 @@ const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const has_gradle_plugin_1 = require("../../utils/has-gradle-plugin");
 const path_1 = require("path");
+const nativePluginName = 'dev.nx.gradle.native';
 async function initGenerator(tree, options) {
     const tasks = [];
     if (!options.skipPackageJson && tree.exists('package.json')) {
@@ -32,7 +33,6 @@ function addPlugin(tree) {
                 testTargetName: 'test',
                 classesTargetName: 'classes',
                 buildTargetName: 'build',
-                includeSubprojectsTasks: false,
             },
         });
         (0, devkit_1.updateNxJson)(tree, nxJson);
@@ -46,15 +46,14 @@ async function addBuildGradleFileNextToSettingsGradle(tree) {
         '**/settings.gradle?(.kts)',
     ]);
     settingsGradleFiles.forEach((settingsGradleFile) => {
-        addProjectReportToBuildGradle(settingsGradleFile, tree);
+        addCreateNodesPluginToBuildGradle(settingsGradleFile, tree);
     });
 }
 /**
  * - creates a build.gradle file next to the settings.gradle file if it does not exist.
- * - adds the project-report plugin to the build.gradle file if it does not exist.
- * - adds a task to generate project reports for all subprojects and included builds.
+ * - adds the createNodes plugin to the build.gradle file if it does not exist.
  */
-function addProjectReportToBuildGradle(settingsGradleFile, tree) {
+function addCreateNodesPluginToBuildGradle(settingsGradleFile, tree) {
     const filename = (0, path_1.basename)(settingsGradleFile);
     let gradleFilePath = 'build.gradle';
     if (filename.endsWith('.kts')) {
@@ -68,53 +67,37 @@ function addProjectReportToBuildGradle(settingsGradleFile, tree) {
     else {
         buildGradleContent = tree.read(gradleFilePath).toString();
     }
-    if (buildGradleContent.includes('allprojects')) {
-        if (!buildGradleContent.includes('"project-report"')) {
-            devkit_1.logger.warn(`Please add the project-report plugin to your ${gradleFilePath}:
+    const applyNodesPlugin = `plugin("${nativePluginName}")`;
+    if (buildGradleContent.includes('allprojects {')) {
+        if (!buildGradleContent.includes(applyNodesPlugin)) {
+            devkit_1.logger.warn(`Please add the ${nativePluginName} plugin to your ${gradleFilePath}:
 allprojects {
   apply {
-      plugin("project-report")
+      ${applyNodesPlugin}
   }
 }`);
         }
     }
     else {
-        buildGradleContent += `\n\rallprojects {
-  apply {
-      plugin("project-report")
-  }
-}`;
+        buildGradleContent = `${buildGradleContent}\n\rallprojects {
+    apply {
+        ${applyNodesPlugin}
     }
-    if (!buildGradleContent.includes(`tasks.register("projectReportAll")`)) {
-        if (gradleFilePath.endsWith('.kts')) {
-            buildGradleContent += `\n\rtasks.register("projectReportAll") {
-    // All project reports of subprojects
-    allprojects.forEach {
-        dependsOn(it.tasks.get("projectReport"))
+  }`;
     }
-
-    // All projectReportAll of included builds
-    gradle.includedBuilds.forEach {
-        dependsOn(it.task(":projectReportAll"))
-    }
-}`;
-        }
-        else {
-            buildGradleContent += `\n\rtasks.register("projectReportAll") {
-        // All project reports of subprojects
-        allprojects.forEach {
-            dependsOn(it.tasks.getAt("projectReport"))
-        }
-    
-        // All projectReportAll of included builds
-        gradle.includedBuilds.forEach {
-            dependsOn(it.task(":projectReportAll"))
-        }
-    }`;
+    const nodesPlugin = filename.endsWith('.kts')
+        ? `id("${nativePluginName}") version("+")`
+        : `id "${nativePluginName}" version "+"`;
+    if (buildGradleContent.includes('plugins {')) {
+        if (!buildGradleContent.includes(nativePluginName)) {
+            buildGradleContent = buildGradleContent.replace('plugins {', `plugins {
+    ${nodesPlugin}`);
         }
     }
-    if (buildGradleContent) {
-        tree.write(gradleFilePath, buildGradleContent);
+    else {
+        buildGradleContent = `plugins {
+    ${nodesPlugin}
+}\n\r${buildGradleContent}`;
     }
 }
 function updateNxJsonConfiguration(tree) {

package/src/migrations/19-4-0/add-project-report-all.d.ts

@@ -3,3 +3,7 @@ import { Tree } from '@nx/devkit';
  * This migration adds task `projectReportAll` to build.gradle files
  */
 export default function update(tree: Tree): Promise<void>;
+/**
+ * This function creates and populate build.gradle file next to the settings.gradle file.
+ */
+export declare function addBuildGradleFileNextToSettingsGradle(tree: Tree): Promise<void>;

package/src/migrations/19-4-0/add-project-report-all.js

@@ -1,10 +1,91 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = update;
-const init_1 = require("../../generators/init/init");
+exports.addBuildGradleFileNextToSettingsGradle = addBuildGradleFileNextToSettingsGradle;
+const devkit_1 = require("@nx/devkit");
+const node_path_1 = require("node:path");
 /**
  * This migration adds task `projectReportAll` to build.gradle files
  */
 async function update(tree) {
-    await (0, init_1.addBuildGradleFileNextToSettingsGradle)(tree);
+    await addBuildGradleFileNextToSettingsGradle(tree);
+}
+/**
+ * This function creates and populate build.gradle file next to the settings.gradle file.
+ */
+async function addBuildGradleFileNextToSettingsGradle(tree) {
+    const settingsGradleFiles = await (0, devkit_1.globAsync)(tree, [
+        '**/settings.gradle?(.kts)',
+    ]);
+    settingsGradleFiles.forEach((settingsGradleFile) => {
+        addProjectReportToBuildGradle(settingsGradleFile, tree);
+    });
+}
+/**
+ * - creates a build.gradle file next to the settings.gradle file if it does not exist.
+ * - adds the project-report plugin to the build.gradle file if it does not exist.
+ * - adds a task to generate project reports for all subprojects and included builds.
+ */
+function addProjectReportToBuildGradle(settingsGradleFile, tree) {
+    const filename = (0, node_path_1.basename)(settingsGradleFile);
+    let gradleFilePath = 'build.gradle';
+    if (filename.endsWith('.kts')) {
+        gradleFilePath = 'build.gradle.kts';
+    }
+    gradleFilePath = (0, node_path_1.join)((0, node_path_1.dirname)(settingsGradleFile), gradleFilePath);
+    let buildGradleContent = '';
+    if (!tree.exists(gradleFilePath)) {
+        tree.write(gradleFilePath, buildGradleContent); // create a build.gradle file near settings.gradle file if it does not exist
+    }
+    else {
+        buildGradleContent = tree.read(gradleFilePath).toString();
+    }
+    if (buildGradleContent.includes('allprojects')) {
+        if (!buildGradleContent.includes('"project-report"')) {
+            devkit_1.logger.warn(`Please add the project-report plugin to your ${gradleFilePath}:
+allprojects {
+  apply {
+      plugin("project-report")
+  }
+}`);
+        }
+    }
+    else {
+        buildGradleContent += `\n\rallprojects {
+  apply {
+      plugin("project-report")
+  }
+}`;
+    }
+    if (!buildGradleContent.includes(`tasks.register("projectReportAll")`)) {
+        if (gradleFilePath.endsWith('.kts')) {
+            buildGradleContent += `\n\rtasks.register("projectReportAll") {
+    // All project reports of subprojects
+    allprojects.forEach {
+        dependsOn(it.tasks.get("projectReport"))
+    }
+
+    // All projectReportAll of included builds
+    gradle.includedBuilds.forEach {
+        dependsOn(it.task(":projectReportAll"))
+    }
+}`;
+        }
+        else {
+            buildGradleContent += `\n\rtasks.register("projectReportAll") {
+        // All project reports of subprojects
+        allprojects.forEach {
+            dependsOn(it.tasks.getAt("projectReport"))
+        }
+    
+        // All projectReportAll of included builds
+        gradle.includedBuilds.forEach {
+            dependsOn(it.task(":projectReportAll"))
+        }
+    }`;
+        }
+    }
+    if (buildGradleContent) {
+        tree.write(gradleFilePath, buildGradleContent);
+    }
 }

package/src/plugin/dependencies.js

@@ -3,62 +3,30 @@ 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");
+const get_nodes_from_gradle_plugin_1 = require("./utils/get-nodes-from-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, buildFileToDepsMap, 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 = buildFileToDepsMap.get(gradleFile);
-        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 { dependencies: dependenciesFromReport } = (0, get_nodes_from_gradle_plugin_1.getCurrentNodesReport)();
+    const dependencies = [];
+    dependenciesFromReport.forEach((dependencyFromPlugin) => {
+        try {
+            const source = (0, node_path_1.relative)(devkit_1.workspaceRoot, dependencyFromPlugin.source) || '.';
+            const sourceProjectName = Object.values(context.projects).find((project) => source === project.root)?.name ?? dependencyFromPlugin.source;
+            const target = (0, node_path_1.relative)(devkit_1.workspaceRoot, dependencyFromPlugin.target) || '.';
+            const targetProjectName = Object.values(context.projects).find((project) => target === project.root)?.name ?? dependencyFromPlugin.target;
+            if (!sourceProjectName || !targetProjectName) {
+                return;
             }
-        });
-    }
-    const gradleDependenciesEnd = performance.mark('gradleDependencies:end');
-    performance.measure('gradleDependencies', gradleDependenciesStart.name, gradleDependenciesEnd.name);
-    return Array.from(dependencies);
+            const dependency = {
+                source: sourceProjectName,
+                target: targetProjectName,
+                type: devkit_1.DependencyType.static,
+                sourceFile: (0, node_path_1.relative)(devkit_1.workspaceRoot, dependencyFromPlugin.sourceFile),
+            };
+            (0, devkit_1.validateDependency)(dependency, context);
+            dependencies.push(dependency);
+        }
+        catch { } // ignore invalid dependencies
+    });
+    return 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/src/plugin/nodes.d.ts

@@ -1,20 +1,7 @@
-import { CreateNodes, CreateNodesV2, ProjectConfiguration, CreateNodesFunction } 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;
-}
+import { CreateNodesV2, ProjectConfiguration, CreateNodesFunction, ProjectGraphExternalNode } from '@nx/devkit';
+import { GradlePluginOptions } from './utils/gradle-plugin-options';
 type GradleTargets = Record<string, Partial<ProjectConfiguration>>;
 export declare function writeTargetsToCache(cachePath: string, results: GradleTargets): void;
 export declare const createNodesV2: CreateNodesV2<GradlePluginOptions>;
-export declare const makeCreateNodesForGradleConfigFile: (gradleReport: GradleReport, targetsCache?: GradleTargets, gradleProjectRootToTestFilesMap?: Record<string, string[]>) => CreateNodesFunction;
-/**
- @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 declare const makeCreateNodesForGradleConfigFile: (projects: Record<string, Partial<ProjectConfiguration>>, targetsCache?: GradleTargets, externalNodes?: Record<string, ProjectGraphExternalNode>) => CreateNodesFunction;
 export {};