@nx/gradle 23.1.0-beta.6 → 23.1.0-beta.7

package/dist/src/migrations/23-1-0/change-plugin-version-0-1-24.d.ts

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

package/dist/src/migrations/23-1-0/change-plugin-version-0-1-24.js

@@ -0,0 +1,23 @@
+"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");
+const version_catalog_ast_utils_1 = require("../../utils/version-catalog-ast-utils");
+/* Change the plugin version to 0.1.24
+ */
+async function update(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson) {
+        return;
+    }
+    if (!(0, has_gradle_plugin_1.hasGradlePlugin)(tree)) {
+        return;
+    }
+    const gradlePluginVersionToUpdate = '0.1.24';
+    // Update version in version catalogs using AST-based approach to preserve formatting
+    await (0, version_catalog_ast_utils_1.updateNxPluginVersionInCatalogsAst)(tree, gradlePluginVersionToUpdate);
+    // Then update in build.gradle(.kts) files
+    await (0, gradle_project_graph_plugin_utils_1.addNxProjectGraphPlugin)(tree, gradlePluginVersionToUpdate);
+}

package/dist/src/migrations/23-1-0/change-plugin-version-0-1-24.md

@@ -0,0 +1,21 @@
+#### Change dev.nx.gradle.project-graph to version 0.1.24
+
+Change dev.nx.gradle.project-graph to version 0.1.24 in build file
+
+#### Sample Code Changes
+
+##### Before
+
+```text title="build.gradle"
+plugins {
+id "dev.nx.gradle.project-graph" version "0.1.23"
+}
+```
+
+##### After
+
+```text title="build.gradle"
+plugins {
+id "dev.nx.gradle.project-graph" version "0.1.24"
+}
+```

package/dist/src/plugin/dependencies.js

@@ -15,20 +15,20 @@ const createDependencies = async (options, context) => {
     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;
+            // Report paths are workspace-relative with `/` separators
+            const sourceProjectName = Object.values(context.projects).find((project) => dependencyFromPlugin.source === project.root)?.name ?? dependencyFromPlugin.source;
+            const targetProjectName = Object.values(context.projects).find((project) => dependencyFromPlugin.target === project.root)?.name ?? dependencyFromPlugin.target;
+            const sourceFile = dependencyFromPlugin.sourceFile;
             if (!sourceProjectName ||
                 !targetProjectName ||
-                !(0, node_fs_1.existsSync)(dependencyFromPlugin.sourceFile)) {
+                !(0, node_fs_1.existsSync)((0, node_path_1.join)(devkit_1.workspaceRoot, sourceFile))) {
                 return;
             }
             const dependency = {
                 source: sourceProjectName,
                 target: targetProjectName,
                 type: devkit_1.DependencyType.static,
-                sourceFile: (0, devkit_1.normalizePath)((0, node_path_1.relative)(devkit_1.workspaceRoot, dependencyFromPlugin.sourceFile)),
+                sourceFile,
             };
             (0, devkit_1.validateDependency)(dependency, context);
             dependencies.push(dependency);

package/dist/src/plugin/nodes.js

@@ -88,9 +88,10 @@ exports.createNodes = [
                 const gradleFilePath = allBuildFiles[i];
                 const projectRoot = buildFileProjectRoots[i];
                 const hash = buildFileHashes[i];
-                // Get project from cache or nodes
+                // Get project from cache or nodes (report keys are workspace-relative
+                // with `/` separators)
                 if (!pluginCache.has(hash)) {
-                    const nodeProject = nodes[projectRoot] ?? nodes[(0, node_path_1.join)(devkit_1.workspaceRoot, projectRoot)];
+                    const nodeProject = nodes[(0, devkit_1.normalizePath)(projectRoot)];
                     if (nodeProject) {
                         pluginCache.set(hash, nodeProject);
                     }

package/dist/src/plugin/utils/get-project-graph-from-gradle-plugin.d.ts

@@ -10,6 +10,8 @@ export interface ProjectGraphReport {
 }
 export interface ProjectGraphReportCache extends ProjectGraphReport {
     hash: string;
+    /** The @nx/gradle version that wrote the cache. */
+    pluginVersion?: string;
 }
 export declare function writeProjectGraphReportToCache(cachePath: string, results: ProjectGraphReport, hash: string): void;
 export declare function getCurrentProjectGraphReport(): ProjectGraphReport;

package/dist/src/plugin/utils/get-project-graph-from-gradle-plugin.js

@@ -10,6 +10,7 @@ const node_path_1 = require("node:path");
 const devkit_1 = require("@nx/devkit");
 const workspace_context_1 = require("nx/src/utils/workspace-context");
 const split_config_files_1 = require("../../utils/split-config-files");
+const versions_1 = require("../../utils/versions");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const get_project_graph_lines_1 = require("./get-project-graph-lines");
 const gradle_plugin_options_1 = require("./gradle-plugin-options");
@@ -18,7 +19,12 @@ function readProjectGraphReportCache(cachePath, hash) {
     const projectGraphReportCache = (0, node_fs_1.existsSync)(cachePath)
         ? (0, devkit_1.readJsonFile)(cachePath)
         : undefined;
-    if (!projectGraphReportCache || projectGraphReportCache.hash !== hash) {
+    if (!projectGraphReportCache ||
+        projectGraphReportCache.hash !== hash ||
+        // Reports written by other @nx/gradle versions may use a different format
+        // (e.g. absolute machine paths before 0.1.24) — regenerate instead of
+        // trusting them, including when restored from another machine's cache.
+        projectGraphReportCache.pluginVersion !== versions_1.nxVersion) {
         return;
     }
     return projectGraphReportCache;
@@ -26,6 +32,7 @@ function readProjectGraphReportCache(cachePath, hash) {
 function writeProjectGraphReportToCache(cachePath, results, hash) {
     let projectGraphReportJson = {
         hash,
+        pluginVersion: versions_1.nxVersion,
         ...results,
     };
     try {
@@ -97,6 +104,12 @@ async function populateProjectGraph(workspaceRoot, gradlewFiles, options) {
     const gradleProjectGraphReportEnd = performance.mark('gradleProjectGraphReport:end');
     performance.measure('gradleProjectGraphReport', gradleProjectGraphReportStart.name, gradleProjectGraphReportEnd.name);
     projectGraphReportCache = processNxProjectGraph(projectGraphLines);
+    // An empty report can be legitimate (e.g. no project produced nodes), but
+    // don't cache it so a transiently-degraded run cannot pin the workspace to
+    // a graph without gradle projects.
+    if (Object.keys(projectGraphReportCache.nodes).length === 0) {
+        return;
+    }
     writeProjectGraphReportToCache(projectGraphReportCachePath, projectGraphReportCache, gradleConfigHash);
 }
 function processNxProjectGraph(projectGraphLines) {
@@ -111,11 +124,17 @@ function processNxProjectGraph(projectGraphLines) {
         const line = projectGraphLines[index].trim();
         if (line.startsWith('> Task ') && line.endsWith(':nxProjectGraph')) {
             index++; // Skip the task line before searching for the JSON file path
+            // The task prints its report file path; stop searching at the next task
+            // header (e.g. the path was never printed) or the end of the output.
             while (index < projectGraphLines.length &&
-                !projectGraphLines[index].trim().endsWith('.json')) {
+                !projectGraphLines[index].trim().endsWith('.json') &&
+                !projectGraphLines[index].trim().startsWith('> Task ')) {
                 index++;
             }
-            const file = projectGraphLines[index];
+            const file = projectGraphLines[index]?.trim();
+            if (!file?.endsWith('.json')) {
+                continue;
+            }
             const projectGraphReportJson = (0, devkit_1.readJsonFile)(file);
             projectGraphReportForAllProjects.nodes = {
                 ...projectGraphReportForAllProjects.nodes,

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

@@ -16,7 +16,19 @@ exports.GRADLE_TEST_FILES = [
     '**/src/test/groovy/**/*Tests.groovy',
 ];
 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), ...Array.from(exports.GRADLEW_FILES), ...Array.from(exports.GRADLE_BUILD_FILES).map((file) => `**/${file}`), ...Array.from(exports.GRADLEW_FILES).map((file) => `**/${file}`), ...exports.GRADLE_TEST_FILES, exports.GRADLE_VERSION_CATALOG_GLOB);
+// Files that influence Gradle's configuration phase and therefore the project
+// graph report: any *.gradle(.kts) script (build, settings, script plugins),
+// gradle.properties, the wrapper pin, and buildSrc build logic.
+const GRADLE_CONFIG_FILE_PATTERNS = [
+    '*.gradle',
+    '*.gradle.kts',
+    'gradle.properties',
+    'gradle/wrapper/gradle-wrapper.properties',
+    'buildSrc/**/*.kt',
+    'buildSrc/**/*.java',
+    'buildSrc/**/*.groovy',
+];
+exports.gradleConfigAndTestGlob = (0, globs_1.combineGlobPatterns)(...GRADLE_CONFIG_FILE_PATTERNS, ...GRADLE_CONFIG_FILE_PATTERNS.map((pattern) => `**/${pattern}`), ...Array.from(exports.GRADLEW_FILES), ...Array.from(exports.GRADLEW_FILES).map((file) => `**/${file}`), ...exports.GRADLE_TEST_FILES, exports.GRADLE_VERSION_CATALOG_GLOB);
 /**
  * This function split config files into build files, settings files, test files and project roots
  * @param files list of files to split

package/dist/src/utils/versions.d.ts

@@ -1,3 +1,3 @@
 export declare const nxVersion: any;
 export declare const gradleProjectGraphPluginName = "dev.nx.gradle.project-graph";
-export declare const gradleProjectGraphVersion = "0.1.23";
+export declare const gradleProjectGraphVersion = "0.1.24";

package/dist/src/utils/versions.js

@@ -4,4 +4,4 @@ exports.gradleProjectGraphVersion = exports.gradleProjectGraphPluginName = expor
 const path_1 = require("path");
 exports.nxVersion = require((0, path_1.join)('@nx/gradle', 'package.json')).version;
 exports.gradleProjectGraphPluginName = 'dev.nx.gradle.project-graph';
-exports.gradleProjectGraphVersion = '0.1.23';
+exports.gradleProjectGraphVersion = '0.1.24';

package/migrations.json

@@ -173,6 +173,13 @@
       "description": "Change dev.nx.gradle.project-graph to version 0.1.23 in build file",
       "factory": "./dist/src/migrations/23-1-0/change-plugin-version-0-1-23",
       "documentation": "./dist/src/migrations/23-1-0/change-plugin-version-0-1-23.md"
+    },
+    "change-plugin-version-0-1-24": {
+      "version": "23.1.0-beta.7",
+      "cli": "nx",
+      "description": "Change dev.nx.gradle.project-graph to version 0.1.24 in build file",
+      "factory": "./dist/src/migrations/23-1-0/change-plugin-version-0-1-24",
+      "documentation": "./dist/src/migrations/23-1-0/change-plugin-version-0-1-24.md"
     }
   },
   "packageJsonUpdates": {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "23.1.0-beta.6",
+  "version": "23.1.0-beta.7",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -78,10 +78,10 @@
     "toml-eslint-parser": "^0.10.0",
     "tree-kill": "^1.2.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.1.0-beta.6"
+    "@nx/devkit": "23.1.0-beta.7"
   },
   "devDependencies": {
-    "nx": "23.1.0-beta.6"
+    "nx": "23.1.0-beta.7"
   },
   "publishConfig": {
     "access": "public"