@nx/gradle 21.4.0-beta.11 → 21.4.0-beta.12

package/migrations.json

@@ -49,7 +49,7 @@
       "factory": "./src/migrations/21-3-11/change-plugin-version-0-1-4"
     },
     "change-plugin-version-0-1-5": {
-      "version": "21.4.0-beta.8",
+      "version": "21.4.0-beta.12",
       "cli": "nx",
       "description": "Change dev.nx.gradle.project-graph to version 0.1.5 in build file",
       "factory": "./src/migrations/21-4-0/change-plugin-version-0-1-5"

package/package.json

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

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

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

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

@@ -4,6 +4,7 @@ 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");
+const version_catalog_utils_1 = require("../../utils/version-catalog-utils");
 /* Change the plugin version to 0.1.5
  */
 async function update(tree) {
@@ -14,5 +15,9 @@ async function update(tree) {
     if (!(0, has_gradle_plugin_1.hasGradlePlugin)(tree)) {
         return;
     }
-    await (0, gradle_project_graph_plugin_utils_1.addNxProjectGraphPlugin)(tree, '0.1.5');
+    const gradlePluginVersionToUpdate = '0.1.5';
+    // Update version in version catalogs first
+    await (0, version_catalog_utils_1.updateNxPluginVersionInCatalogs)(tree, gradlePluginVersionToUpdate);
+    // Then update in build.gradle(.kts) files
+    await (0, gradle_project_graph_plugin_utils_1.addNxProjectGraphPlugin)(tree, gradlePluginVersionToUpdate);
 }

package/src/utils/version-catalog-utils.d.ts

@@ -0,0 +1,7 @@
+import { Tree } from '@nx/devkit';
+import { TomlTable } from 'smol-toml';
+export declare function findVersionCatalogFiles(tree: Tree): Promise<string[]>;
+export declare function updatePluginVersionInCatalog(catalogContent: TomlTable, pluginName: string, newVersion: string): string;
+export declare function extractPluginVersionFromCatalog(catalogContent: TomlTable, pluginName: string): string | null;
+export declare function updateNxPluginVersionInCatalogs(tree: Tree, expectedVersion: string): Promise<boolean>;
+//# sourceMappingURL=version-catalog-utils.d.ts.map

package/src/utils/version-catalog-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"version-catalog-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/utils/version-catalog-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAa,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAW3E;AAED,wBAAgB,4BAA4B,CAC1C,cAAc,EAAE,SAAS,EACzB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,MAAM,CA8CR;AAED,wBAAgB,+BAA+B,CAC7C,cAAc,EAAE,SAAS,EACzB,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,IAAI,CAwCf;AAED,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,OAAO,CAAC,CAoClB"}

package/src/utils/version-catalog-utils.js

@@ -0,0 +1,128 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findVersionCatalogFiles = findVersionCatalogFiles;
+exports.updatePluginVersionInCatalog = updatePluginVersionInCatalog;
+exports.extractPluginVersionFromCatalog = extractPluginVersionFromCatalog;
+exports.updateNxPluginVersionInCatalogs = updateNxPluginVersionInCatalogs;
+const devkit_1 = require("@nx/devkit");
+const TOML = require("smol-toml");
+const versions_1 = require("./versions");
+async function findVersionCatalogFiles(tree) {
+    const versionCatalogPaths = [];
+    const globFiles = await (0, devkit_1.globAsync)(tree, ['**/gradle/*.versions.toml']);
+    for (const filePath of globFiles) {
+        if (!versionCatalogPaths.includes(filePath)) {
+            versionCatalogPaths.push(filePath);
+        }
+    }
+    return versionCatalogPaths;
+}
+function updatePluginVersionInCatalog(catalogContent, pluginName, newVersion) {
+    if (catalogContent.plugins) {
+        for (const [pluginAlias, pluginConfig] of Object.entries(catalogContent.plugins)) {
+            if (typeof pluginConfig === 'string') {
+                // Handle simple format: plugin = "id:version"
+                if (pluginConfig.startsWith(`${pluginName}:`)) {
+                    catalogContent.plugins[pluginAlias] = `${pluginName}:${newVersion}`;
+                    break;
+                }
+            }
+            else if (typeof pluginConfig === 'object' && pluginConfig !== null) {
+                // Handle object format: { id = "plugin.name", version = "1.0.0" }
+                const config = pluginConfig;
+                if (config.id === pluginName) {
+                    if (config.version && typeof config.version === 'string') {
+                        // Direct version
+                        config.version = newVersion;
+                    }
+                    else if (config.version &&
+                        typeof config.version === 'object' &&
+                        config.version.ref &&
+                        catalogContent.versions) {
+                        // Version reference in object form: version = { ref = "nx-version" }
+                        const versionRef = config.version.ref;
+                        if (catalogContent.versions[versionRef]) {
+                            catalogContent.versions[versionRef] = newVersion;
+                        }
+                    }
+                    else if (config['version.ref'] && catalogContent.versions) {
+                        let versionRef = config['version.ref'];
+                        // Handle the case where version.ref might be an object with ref property
+                        if (typeof versionRef === 'object' && versionRef.ref) {
+                            versionRef = versionRef.ref;
+                        }
+                        if (catalogContent.versions[versionRef]) {
+                            catalogContent.versions[versionRef] = newVersion;
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+    }
+    return TOML.stringify(catalogContent);
+}
+function extractPluginVersionFromCatalog(catalogContent, pluginName) {
+    if (!catalogContent.plugins) {
+        return null;
+    }
+    for (const pluginConfig of Object.values(catalogContent.plugins)) {
+        if (typeof pluginConfig === 'string') {
+            // Handle simple format: plugin = "id:version"
+            if (pluginConfig.startsWith(`${pluginName}:`)) {
+                return pluginConfig.split(':')[1];
+            }
+        }
+        else if (typeof pluginConfig === 'object' && pluginConfig !== null) {
+            // Handle object format: { id = "plugin.name", version = "1.0.0" }
+            const config = pluginConfig;
+            if (config.id === pluginName) {
+                if (config.version && typeof config.version === 'string') {
+                    // Direct version
+                    return config.version;
+                }
+                else if (config.version &&
+                    typeof config.version === 'object' &&
+                    config.version.ref &&
+                    catalogContent.versions) {
+                    // Version reference in object form: version = { ref = "nx-version" }
+                    return catalogContent.versions[config.version.ref] || null;
+                }
+                else if (config['version.ref'] && catalogContent.versions) {
+                    // Version reference - look up the referenced version
+                    let versionRef = config['version.ref'];
+                    // Handle the case where version.ref might be an object with ref property
+                    if (typeof versionRef === 'object' && versionRef.ref) {
+                        versionRef = versionRef.ref;
+                    }
+                    return catalogContent.versions[versionRef] || null;
+                }
+            }
+        }
+    }
+    return null;
+}
+async function updateNxPluginVersionInCatalogs(tree, expectedVersion) {
+    const catalogFiles = await findVersionCatalogFiles(tree);
+    let updated = false;
+    for (const catalogPath of catalogFiles) {
+        if (!tree.exists(catalogPath)) {
+            continue;
+        }
+        const content = tree.read(catalogPath, 'utf-8');
+        if (!content) {
+            continue;
+        }
+        const parsedToml = TOML.parse(content);
+        if (!parsedToml.plugins) {
+            continue;
+        }
+        const currentVersion = extractPluginVersionFromCatalog(parsedToml, versions_1.gradleProjectGraphPluginName);
+        if (currentVersion && currentVersion !== expectedVersion) {
+            const updatedContent = updatePluginVersionInCatalog(parsedToml, versions_1.gradleProjectGraphPluginName, expectedVersion);
+            tree.write(catalogPath, updatedContent);
+            updated = true;
+        }
+    }
+    return updated;
+}