@nx/gradle 21.6.1-beta.1 → 21.6.1-beta.3

package/batch-runner/project.json

@@ -1,8 +1,9 @@
 {
   "name": "gradle-batch-runner",
-  "$schema": "node_modules/nx/schemas/project-schema.json",
-  "projectRoot": "packages/gradle/batch-runner",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "packages/gradle/batch-runner/src",
+  "projectType": "library",
+  "tags": [],
   "targets": {
     "assemble": {
       "executor": "@nx/gradle:gradle",

package/migrations.json

@@ -65,6 +65,12 @@
       "cli": "nx",
       "description": "Change dev.nx.gradle.project-graph to version 0.1.7 in build file",
       "factory": "./src/migrations/21-5-1/change-plugin-version-0-1-7"
+    },
+    "change-plugin-version-0-1-8": {
+      "version": "21.6.1-beta.2",
+      "cli": "nx",
+      "description": "Change dev.nx.gradle.project-graph to version 0.1.8 in build file",
+      "factory": "./src/migrations/21-6-1/change-plugin-version-0-1-8"
     }
   },
   "packageJsonUpdates": {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "21.6.1-beta.1",
+  "version": "21.6.1-beta.3",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -35,11 +35,11 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "21.6.1-beta.1",
+    "@nx/devkit": "21.6.1-beta.3",
     "toml-eslint-parser": "^0.10.0"
   },
   "devDependencies": {
-    "nx": "21.6.1-beta.1"
+    "nx": "21.6.1-beta.3"
   },
   "publishConfig": {
     "access": "public"

package/src/migrations/21-6-1/change-plugin-version-0-1-8.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-8.d.ts.map

package/src/migrations/21-6-1/change-plugin-version-0-1-8.d.ts.map

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

package/src/migrations/21-6-1/change-plugin-version-0-1-8.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.8
+ */
+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.8';
+    // 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/src/plugin/dependencies.js

@@ -8,7 +8,7 @@ const split_config_files_1 = require("../utils/split-config-files");
 const workspace_context_1 = require("nx/src/utils/workspace-context");
 const node_fs_1 = require("node:fs");
 const createDependencies = async (options, context) => {
-    const files = await (0, workspace_context_1.globWithWorkspaceContext)(devkit_1.workspaceRoot, Array.from(split_config_files_1.GRALDEW_FILES));
+    const files = await (0, workspace_context_1.globWithWorkspaceContext)(devkit_1.workspaceRoot, Array.from(split_config_files_1.GRADLEW_FILES));
     const { gradlewFiles } = (0, split_config_files_1.splitConfigFiles)(files);
     await (0, get_project_graph_from_gradle_plugin_1.populateProjectGraph)(context.workspaceRoot, gradlewFiles.map((file) => (0, node_path_1.join)(devkit_1.workspaceRoot, file)), options);
     const { dependencies: dependenciesFromReport } = (0, get_project_graph_from_gradle_plugin_1.getCurrentProjectGraphReport)();

package/src/plugin/utils/gradle-plugin-options.d.ts

@@ -1,7 +1,6 @@
 export interface GradlePluginOptions {
     testTargetName?: string;
     ciTestTargetName?: string;
-    ciIntTestTargetName?: string;
     [taskTargetName: string]: string | undefined | boolean;
 }
 export declare function normalizeOptions(options: GradlePluginOptions): GradlePluginOptions;

package/src/plugin/utils/gradle-plugin-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gradle-plugin-options.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/plugin/utils/gradle-plugin-options.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;CACxD;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,mBAAmB,GAC3B,mBAAmB,CAIrB"}
+{"version":3,"file":"gradle-plugin-options.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/plugin/utils/gradle-plugin-options.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;CACxD;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,mBAAmB,GAC3B,mBAAmB,CAIrB"}

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

@@ -1,5 +1,5 @@
 export declare const GRADLE_BUILD_FILES: Set<string>;
-export declare const GRALDEW_FILES: Set<string>;
+export declare const GRADLEW_FILES: Set<string>;
 export declare const GRADLE_TEST_FILES: string[];
 export declare const gradleConfigGlob: string;
 export declare const gradleConfigAndTestGlob: string;

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

@@ -1,11 +1,11 @@
 "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.gradleConfigAndTestGlob = exports.gradleConfigGlob = exports.GRADLE_TEST_FILES = exports.GRADLEW_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.GRADLEW_FILES = new Set(['gradlew', 'gradlew.bat']);
 exports.GRADLE_TEST_FILES = [
     '**/src/test/java/**/*Test.java',
     '**/src/test/kotlin/**/*Test.kt',
@@ -15,7 +15,7 @@ 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.GRALDEW_FILES), ...Array.from(exports.GRADLE_BUILD_FILES).map((file) => `**/${file}`), ...Array.from(exports.GRALDEW_FILES).map((file) => `**/${file}`), ...exports.GRADLE_TEST_FILES);
+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);
 /**
  * This function split config files into build files, settings files, test files and project roots
  * @param files list of files to split
@@ -34,7 +34,7 @@ function splitConfigFiles(files) {
             buildFiles.push(file);
             projectRoots.add(fileDirectory);
         }
-        else if (exports.GRALDEW_FILES.has(filename)) {
+        else if (exports.GRADLEW_FILES.has(filename)) {
             if (process.platform.startsWith('win')) {
                 if (filename === 'gradlew.bat') {
                     gradlewFiles.push(file);

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.4";
+export declare const gradleProjectGraphVersion = "0.1.7";
 //# 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.4';
+exports.gradleProjectGraphVersion = '0.1.7';