@nx/gradle 19.5.0-canary.20240711-2c4c2ae → 19.5.0-canary.20240712-0b0db78
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/src/generators/ci-workflow/generator.js +1 -2
- package/src/generators/init/init.js +3 -4
- package/src/migrations/19-4-0/add-project-report-all.js +1 -1
- package/src/migrations/19-4-1/change-regex-test-production.js +1 -1
- package/src/plugin/dependencies.js +2 -2
- package/src/plugin/nodes.js +2 -2
- package/src/utils/exec-gradle.d.ts +0 -2
- package/src/utils/exec-gradle.js +3 -4
- package/src/utils/get-gradle-report.js +4 -4
- package/src/utils/has-gradle-plugin.js +1 -2
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@nx/gradle",
|
3
|
-
"version": "19.5.0-canary.
|
3
|
+
"version": "19.5.0-canary.20240712-0b0db78",
|
4
4
|
"private": false,
|
5
5
|
"description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
|
6
6
|
"repository": {
|
@@ -34,7 +34,7 @@
|
|
34
34
|
"migrations": "./migrations.json"
|
35
35
|
},
|
36
36
|
"dependencies": {
|
37
|
-
"@nx/devkit": "19.5.0-canary.
|
37
|
+
"@nx/devkit": "19.5.0-canary.20240712-0b0db78"
|
38
38
|
},
|
39
39
|
"publishConfig": {
|
40
40
|
"access": "public"
|
@@ -1,6 +1,6 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.ciWorkflowGenerator =
|
3
|
+
exports.ciWorkflowGenerator = ciWorkflowGenerator;
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
5
5
|
const path_1 = require("path");
|
6
6
|
const nx_cloud_utils_1 = require("nx/src/utils/nx-cloud-utils");
|
@@ -21,7 +21,6 @@ async function ciWorkflowGenerator(tree, schema) {
|
|
21
21
|
(0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files', ci), '', options);
|
22
22
|
await (0, devkit_1.formatFiles)(tree);
|
23
23
|
}
|
24
|
-
exports.ciWorkflowGenerator = ciWorkflowGenerator;
|
25
24
|
function getTemplateData(tree, options) {
|
26
25
|
const { name: workflowName, fileName: workflowFileName } = (0, devkit_1.names)(options.name);
|
27
26
|
const packageManager = (0, devkit_1.detectPackageManager)();
|
@@ -1,6 +1,8 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.
|
3
|
+
exports.initGenerator = initGenerator;
|
4
|
+
exports.addBuildGradleFileNextToSettingsGradle = addBuildGradleFileNextToSettingsGradle;
|
5
|
+
exports.updateNxJsonConfiguration = updateNxJsonConfiguration;
|
4
6
|
const devkit_1 = require("@nx/devkit");
|
5
7
|
const child_process_1 = require("child_process");
|
6
8
|
const versions_1 = require("../../utils/versions");
|
@@ -27,7 +29,6 @@ Running 'gradle init':`);
|
|
27
29
|
}
|
28
30
|
return (0, devkit_1.runTasksInSerial)(...tasks);
|
29
31
|
}
|
30
|
-
exports.initGenerator = initGenerator;
|
31
32
|
function addPlugin(tree) {
|
32
33
|
const nxJson = (0, devkit_1.readNxJson)(tree);
|
33
34
|
if (!(0, has_gradle_plugin_1.hasGradlePlugin)(tree)) {
|
@@ -54,7 +55,6 @@ async function addBuildGradleFileNextToSettingsGradle(tree) {
|
|
54
55
|
addProjectReportToBuildGradle(settingsGradleFile, tree);
|
55
56
|
});
|
56
57
|
}
|
57
|
-
exports.addBuildGradleFileNextToSettingsGradle = addBuildGradleFileNextToSettingsGradle;
|
58
58
|
/**
|
59
59
|
* - creates a build.gradle file next to the settings.gradle file if it does not exist.
|
60
60
|
* - adds the project-report plugin to the build.gradle file if it does not exist.
|
@@ -134,5 +134,4 @@ function updateNxJsonConfiguration(tree) {
|
|
134
134
|
nxJson.namedInputs.production = Array.from(new Set([...productionFileSet, 'default', '!{projectRoot}/src/test/**/*']));
|
135
135
|
(0, devkit_1.updateNxJson)(tree, nxJson);
|
136
136
|
}
|
137
|
-
exports.updateNxJsonConfiguration = updateNxJsonConfiguration;
|
138
137
|
exports.default = initGenerator;
|
@@ -1,5 +1,6 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.default = update;
|
3
4
|
const init_1 = require("../../generators/init/init");
|
4
5
|
/**
|
5
6
|
* This migration adds task `projectReportAll` to build.gradle files
|
@@ -7,4 +8,3 @@ const init_1 = require("../../generators/init/init");
|
|
7
8
|
async function update(tree) {
|
8
9
|
await (0, init_1.addBuildGradleFileNextToSettingsGradle)(tree);
|
9
10
|
}
|
10
|
-
exports.default = update;
|
@@ -1,5 +1,6 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.default = update;
|
3
4
|
const devkit_1 = require("@nx/devkit");
|
4
5
|
const has_gradle_plugin_1 = require("../../utils/has-gradle-plugin");
|
5
6
|
// This function changes !{projectRoot}/test/**/* in nx.json for production to !{projectRoot}/src/test/**/*
|
@@ -18,4 +19,3 @@ function update(tree) {
|
|
18
19
|
(0, devkit_1.updateNxJson)(tree, nxJson);
|
19
20
|
}
|
20
21
|
}
|
21
|
-
exports.default = update;
|
@@ -1,6 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.
|
3
|
+
exports.createDependencies = void 0;
|
4
|
+
exports.processGradleDependencies = processGradleDependencies;
|
4
5
|
const devkit_1 = require("@nx/devkit");
|
5
6
|
const node_fs_1 = require("node:fs");
|
6
7
|
const node_path_1 = require("node:path");
|
@@ -79,4 +80,3 @@ function processGradleDependencies(depsFile, gradleProjectToProjectName, sourceP
|
|
79
80
|
}
|
80
81
|
}
|
81
82
|
}
|
82
|
-
exports.processGradleDependencies = processGradleDependencies;
|
package/src/plugin/nodes.js
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.createNodes = exports.makeCreateNodesForGradleConfigFile = exports.createNodesV2 =
|
3
|
+
exports.createNodes = exports.makeCreateNodesForGradleConfigFile = exports.createNodesV2 = void 0;
|
4
|
+
exports.writeTargetsToCache = writeTargetsToCache;
|
4
5
|
const devkit_1 = require("@nx/devkit");
|
5
6
|
const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
|
6
7
|
const node_fs_1 = require("node:fs");
|
@@ -29,7 +30,6 @@ function readTargetsCache(cachePath) {
|
|
29
30
|
function writeTargetsToCache(cachePath, results) {
|
30
31
|
(0, devkit_1.writeJsonFile)(cachePath, results);
|
31
32
|
}
|
32
|
-
exports.writeTargetsToCache = writeTargetsToCache;
|
33
33
|
exports.createNodesV2 = [
|
34
34
|
get_gradle_report_1.gradleConfigAndTestGlob,
|
35
35
|
async (files, options, context) => {
|
package/src/utils/exec-gradle.js
CHANGED
@@ -1,6 +1,8 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.
|
3
|
+
exports.getGradleBinaryPath = getGradleBinaryPath;
|
4
|
+
exports.getGradleExecFile = getGradleExecFile;
|
5
|
+
exports.execGradleAsync = execGradleAsync;
|
4
6
|
const devkit_1 = require("@nx/devkit");
|
5
7
|
const node_child_process_1 = require("node:child_process");
|
6
8
|
const node_fs_1 = require("node:fs");
|
@@ -15,11 +17,9 @@ function getGradleBinaryPath() {
|
|
15
17
|
}
|
16
18
|
return gradleBinaryPath;
|
17
19
|
}
|
18
|
-
exports.getGradleBinaryPath = getGradleBinaryPath;
|
19
20
|
function getGradleExecFile() {
|
20
21
|
return process.platform.startsWith('win') ? '.\\gradlew.bat' : './gradlew';
|
21
22
|
}
|
22
|
-
exports.getGradleExecFile = getGradleExecFile;
|
23
23
|
function execGradleAsync(args, execOptions = {}) {
|
24
24
|
const gradleBinaryPath = getGradleBinaryPath();
|
25
25
|
return new Promise((res, rej) => {
|
@@ -43,4 +43,3 @@ function execGradleAsync(args, execOptions = {}) {
|
|
43
43
|
});
|
44
44
|
});
|
45
45
|
}
|
46
|
-
exports.execGradleAsync = execGradleAsync;
|
@@ -1,6 +1,9 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.
|
3
|
+
exports.gradleConfigAndTestGlob = exports.gradleConfigGlob = exports.GRADLE_TEST_FILES = exports.GRADLE_BUILD_FILES = exports.newLineSeparator = exports.fileSeparator = void 0;
|
4
|
+
exports.getCurrentGradleReport = getCurrentGradleReport;
|
5
|
+
exports.populateGradleReport = populateGradleReport;
|
6
|
+
exports.processProjectReports = processProjectReports;
|
4
7
|
const node_fs_1 = require("node:fs");
|
5
8
|
const node_path_1 = require("node:path");
|
6
9
|
const devkit_1 = require("@nx/devkit");
|
@@ -28,7 +31,6 @@ function getCurrentGradleReport() {
|
|
28
31
|
}
|
29
32
|
return gradleReportCache;
|
30
33
|
}
|
31
|
-
exports.getCurrentGradleReport = getCurrentGradleReport;
|
32
34
|
async function populateGradleReport(workspaceRoot) {
|
33
35
|
const gradleConfigHash = await (0, workspace_context_1.hashWithWorkspaceContext)(workspaceRoot, [
|
34
36
|
exports.gradleConfigGlob,
|
@@ -67,7 +69,6 @@ async function populateGradleReport(workspaceRoot) {
|
|
67
69
|
performance.measure('gradleProjectReport', gradleProjectReportStart.name, gradleProjectReportEnd.name);
|
68
70
|
gradleReportCache = processProjectReports(projectReportLines);
|
69
71
|
}
|
70
|
-
exports.populateGradleReport = populateGradleReport;
|
71
72
|
function processProjectReports(projectReportLines) {
|
72
73
|
/**
|
73
74
|
* Map of Gradle File path to Gradle Project Name
|
@@ -181,4 +182,3 @@ function processProjectReports(projectReportLines) {
|
|
181
182
|
gradleProjectToProjectName,
|
182
183
|
};
|
183
184
|
}
|
184
|
-
exports.processProjectReports = processProjectReports;
|
@@ -1,9 +1,8 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.hasGradlePlugin =
|
3
|
+
exports.hasGradlePlugin = hasGradlePlugin;
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
5
5
|
function hasGradlePlugin(tree) {
|
6
6
|
const nxJson = (0, devkit_1.readNxJson)(tree);
|
7
7
|
return !!nxJson.plugins?.some((p) => typeof p === 'string' ? p === '@nx/gradle' : p.plugin === '@nx/gradle');
|
8
8
|
}
|
9
|
-
exports.hasGradlePlugin = hasGradlePlugin;
|