@nx/gradle 21.4.0-beta.0 → 21.4.0-beta.10

package/migrations.json

@@ -41,6 +41,12 @@
       "cli": "nx",
       "description": "Change dev.nx.gradle.project-graph to version 0.1.2 in build file",
       "factory": "./src/migrations/21-3-0/change-plugin-version-0-1-2"
+    },
+    "change-plugin-version-0-1-4": {
+      "version": "21.3.11-beta.0",
+      "cli": "nx",
+      "description": "Change dev.nx.gradle.project-graph to version 0.1.4 in build file",
+      "factory": "./src/migrations/21-3-11/change-plugin-version-0-1-4"
     }
   },
   "packageJsonUpdates": {}

package/package.json

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

package/src/executors/gradle/gradle.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gradle.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/executors/gradle/gradle.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAMhD,wBAA8B,cAAc,CAC1C,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAyC/B"}
+{"version":3,"file":"gradle.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/executors/gradle/gradle.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAMhD,wBAA8B,cAAc,CAC1C,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA6D/B"}

package/src/executors/gradle/gradle.impl.js

@@ -17,6 +17,26 @@ async function gradleExecutor(options, context) {
     if (options.testClassName) {
         args.push(`--tests`, options.testClassName);
     }
+    // Pass any additional options not defined in the schema as gradle arguments
+    const knownOptions = new Set([
+        'taskName',
+        'testClassName',
+        'args',
+        'excludeDependsOn',
+        '__unparsed__',
+    ]);
+    Object.entries(options).forEach(([key, value]) => {
+        if (!knownOptions.has(key) && value !== undefined && value !== false) {
+            if (value === true) {
+                // Boolean flags like --continuous
+                args.push(`--${key}`);
+            }
+            else {
+                // Flags with values like --max-workers=4
+                args.push(`--${key}=${value}`);
+            }
+        }
+    });
     if (options.excludeDependsOn) {
         (0, get_exclude_task_1.getExcludeTasks)(new Set([`${context.projectName}:${context.targetName}`]), context.projectGraph.nodes).forEach((task) => {
             if (task) {
@@ -29,7 +49,7 @@ async function gradleExecutor(options, context) {
             command: `${gradlewPath} ${options.taskName}`,
             cwd: (0, node_path_1.dirname)(gradlewPath),
             args: args,
-            __unparsed__: [],
+            __unparsed__: options.__unparsed__ || [],
         }, context);
         return { success };
     }

package/src/executors/gradle/schema.d.ts

@@ -3,4 +3,5 @@ export interface GradleExecutorSchema {
   testClassName?: string;
   args?: string[] | string;
   excludeDependsOn: boolean;
+  __unparsed__?: string[];
 }

package/src/executors/gradle/schema.json

@@ -33,6 +33,14 @@
       "description": "If true, the tasks will not execute its dependsOn tasks (e.g. pass --exclude-task args to gradle command). If false, the task will execute its dependsOn tasks.",
       "default": true,
       "x-priority": "internal"
+    },
+    "__unparsed__": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "description": "Additional arguments to pass to the gradle command (automatically populated by Nx).",
+      "x-priority": "internal"
     }
   },
   "required": ["taskName"]

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

@@ -36,7 +36,7 @@ jobs:
           architecture: x64
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - uses: nrwl/nx-set-shas@v4
 <% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>

package/src/generators/ci-workflow/generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/generators/ci-workflow/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AA0CpB,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC1B,cAAc,CAAC,EAAE,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAMnE;AAsCD,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/generators/ci-workflow/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AA8CpB,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC1B,cAAc,CAAC,EAAE,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAMnE;AAsCD,eAAe,mBAAmB,CAAC"}

package/src/generators/ci-workflow/generator.js

@@ -11,9 +11,12 @@ function getCiCommands(ci) {
             return [
                 {
                     comments: [
-                        `Change from check to check-ci if you turn on the atomizer. Learn more: https://nx.dev/nx-api/gradle#splitting-e2e-tests.`,
+                        `# Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected.`,
+                        `# Change from build to build-ci if you turn on the atomizer. Learn more: https://nx.dev/nx-api/gradle#splitting-e2e-tests.`,
                     ],
-                    command: `./nx affected --base=$NX_BASE --head=$NX_HEAD -t assemble check`,
+                },
+                {
+                    command: `./nx affected --base=$NX_BASE --head=$NX_HEAD -t build`,
                 },
                 getNxCloudFixCiCommand(),
             ];
@@ -22,9 +25,10 @@ function getCiCommands(ci) {
             return [
                 {
                     comments: [
-                        `Change from check to check-ci if you turn on the atomizer. Learn more: https://nx.dev/nx-api/gradle#splitting-tests`,
+                        `# Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected.`,
+                        `# Change from build to build-ci if you turn on the atomizer. Learn more: https://nx.dev/nx-api/gradle#splitting-tests`,
                     ],
-                    command: `./nx affected -t assemble check`,
+                    command: `./nx affected -t build`,
                 },
                 getNxCloudFixCiCommand(),
             ];

package/src/generators/init/gradle-project-graph-plugin-utils.js

@@ -137,7 +137,11 @@ async function addNxProjectGraphPluginToBuildGradle(gradleFilePath, buildGradleC
     const applyPluginPattern = new RegExp(`\\s*plugin\\(["']${versions_1.gradleProjectGraphPluginName}["']\\)`);
     if (buildGradleContent.includes('allprojects {')) {
         if (!applyPluginPattern.test(buildGradleContent)) {
-            devkit_1.logger.warn(`Please add the ${versions_1.gradleProjectGraphPluginName} plugin to your ${gradleFilePath}:\nallprojects {\n  apply {\n      plugin(\"${versions_1.gradleProjectGraphPluginName}\")\n  }\n}`);
+            // Add plugin to existing allprojects block
+            const applyPlugin = isKotlinDsl
+                ? `plugin("${versions_1.gradleProjectGraphPluginName}")`
+                : `plugin "${versions_1.gradleProjectGraphPluginName}"`;
+            buildGradleContent = buildGradleContent.replace(/allprojects\s*\{/, `allprojects {\n    apply ${applyPlugin}`);
         }
     }
     else {

package/src/migrations/21-3-11/change-plugin-version-0-1-4.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export default function update(tree: Tree): Promise<void>;
+//# sourceMappingURL=change-plugin-version-0-1-4.d.ts.map

package/src/migrations/21-3-11/change-plugin-version-0-1-4.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"change-plugin-version-0-1-4.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/migrations/21-3-11/change-plugin-version-0-1-4.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAc,MAAM,YAAY,CAAC;AAM9C,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,iBAS9C"}

package/src/migrations/21-3-11/change-plugin-version-0-1-4.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const devkit_1 = require("@nx/devkit");
+const has_gradle_plugin_1 = require("../../utils/has-gradle-plugin");
+const gradle_project_graph_plugin_utils_1 = require("../../generators/init/gradle-project-graph-plugin-utils");
+/* Change the plugin version to 0.1.4
+ */
+async function update(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson) {
+        return;
+    }
+    if (!(0, has_gradle_plugin_1.hasGradlePlugin)(tree)) {
+        return;
+    }
+    await (0, gradle_project_graph_plugin_utils_1.addNxProjectGraphPlugin)(tree, '0.1.4');
+}

package/src/plugin/nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/plugin/nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,oBAAoB,EAIpB,mBAAmB,EAEnB,wBAAwB,EACzB,MAAM,YAAY,CAAC;AAepB,OAAO,EACL,mBAAmB,EAEpB,MAAM,+BAA+B,CAAC;AAEvC,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC;AAMnE,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,QAE5E;AAED,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAoC5D,CAAC;AAEF,eAAO,MAAM,kCAAkC,GAE3C,UAAU,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,EACvD,gBAAe,aAAkB,EACjC,gBAAe,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAM,KAC3D,mBAkCF,CAAC"}
+{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/plugin/nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,oBAAoB,EAIpB,mBAAmB,EAEnB,wBAAwB,EAEzB,MAAM,YAAY,CAAC;AAepB,OAAO,EACL,mBAAmB,EAEpB,MAAM,+BAA+B,CAAC;AAEvC,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC;AAMnE,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,QAE5E;AAED,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAoC5D,CAAC;AAEF,eAAO,MAAM,kCAAkC,GAE3C,UAAU,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,EACvD,gBAAe,aAAkB,EACjC,gBAAe,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAM,KAC3D,mBAmCF,CAAC"}

package/src/plugin/nodes.js

@@ -52,10 +52,11 @@ const makeCreateNodesForGradleConfigFile = (projects, projectsCache = {}, extern
     if (!project) {
         return {};
     }
-    project.root = projectRoot;
+    const normalizedProjectRoot = (0, devkit_1.normalizePath)(projectRoot);
+    project.root = normalizedProjectRoot;
     return {
         projects: {
-            [projectRoot]: project,
+            [normalizedProjectRoot]: project,
         },
         externalNodes: externalNodes,
     };

package/src/utils/versions.d.ts

@@ -1,4 +1,4 @@
 export declare const nxVersion: any;
 export declare const gradleProjectGraphPluginName = "dev.nx.gradle.project-graph";
-export declare const gradleProjectGraphVersion = "0.1.0";
+export declare const gradleProjectGraphVersion = "0.1.4";
 //# sourceMappingURL=versions.d.ts.map

package/src/utils/versions.js

@@ -3,4 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.gradleProjectGraphVersion = exports.gradleProjectGraphPluginName = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.gradleProjectGraphPluginName = 'dev.nx.gradle.project-graph';
-exports.gradleProjectGraphVersion = '0.1.0';
+exports.gradleProjectGraphVersion = '0.1.4';