@nx/gradle 19.2.0-beta.5 → 19.2.0-beta.7
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
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@nx/gradle",
|
3
|
-
"version": "19.2.0-beta.
|
3
|
+
"version": "19.2.0-beta.7",
|
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.2.0-beta.
|
37
|
+
"@nx/devkit": "19.2.0-beta.7"
|
38
38
|
},
|
39
39
|
"publishConfig": {
|
40
40
|
"access": "public"
|
package/src/plugin/nodes.js
CHANGED
@@ -28,7 +28,7 @@ exports.createNodesV2 = [
|
|
28
28
|
const optionsHash = (0, file_hasher_1.hashObject)(options);
|
29
29
|
const cachePath = (0, node_path_1.join)(cache_directory_1.projectGraphCacheDirectory, `gradle-${optionsHash}.hash`);
|
30
30
|
const targetsCache = readTargetsCache(cachePath);
|
31
|
-
(0, get_gradle_report_1.populateGradleReport)(context.workspaceRoot);
|
31
|
+
await (0, get_gradle_report_1.populateGradleReport)(context.workspaceRoot);
|
32
32
|
const gradleReport = (0, get_gradle_report_1.getCurrentGradleReport)();
|
33
33
|
try {
|
34
34
|
return await (0, devkit_1.createNodesFromFiles)((0, exports.makeCreateNodes)(gradleReport, targetsCache), configFiles, options, context);
|
@@ -38,9 +38,9 @@ exports.createNodesV2 = [
|
|
38
38
|
}
|
39
39
|
},
|
40
40
|
];
|
41
|
-
const makeCreateNodes = (gradleReport, targetsCache) => (gradleFilePath, options, context) => {
|
41
|
+
const makeCreateNodes = (gradleReport, targetsCache) => async (gradleFilePath, options, context) => {
|
42
42
|
const projectRoot = (0, node_path_1.dirname)(gradleFilePath);
|
43
|
-
const hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options ?? {}, context);
|
43
|
+
const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options ?? {}, context);
|
44
44
|
targetsCache[hash] ??= createGradleProject(gradleReport, gradleFilePath, options, context);
|
45
45
|
const project = targetsCache[hash];
|
46
46
|
if (!project) {
|
@@ -59,12 +59,12 @@ exports.makeCreateNodes = makeCreateNodes;
|
|
59
59
|
*/
|
60
60
|
exports.createNodes = [
|
61
61
|
get_gradle_report_1.gradleConfigGlob,
|
62
|
-
(configFile, options, context) => {
|
62
|
+
async (configFile, options, context) => {
|
63
63
|
devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.');
|
64
|
-
(0, get_gradle_report_1.populateGradleReport)(context.workspaceRoot);
|
64
|
+
await (0, get_gradle_report_1.populateGradleReport)(context.workspaceRoot);
|
65
65
|
const gradleReport = (0, get_gradle_report_1.getCurrentGradleReport)();
|
66
66
|
const internalCreateNodes = (0, exports.makeCreateNodes)(gradleReport, {});
|
67
|
-
return internalCreateNodes(configFile, options, context);
|
67
|
+
return await internalCreateNodes(configFile, options, context);
|
68
68
|
},
|
69
69
|
];
|
70
70
|
function createGradleProject(gradleReport, gradleFilePath, options, context) {
|
@@ -9,5 +9,5 @@ export interface GradleReport {
|
|
9
9
|
}
|
10
10
|
export declare const gradleConfigGlob = "**/build.{gradle.kts,gradle}";
|
11
11
|
export declare function getCurrentGradleReport(): GradleReport;
|
12
|
-
export declare function populateGradleReport(workspaceRoot: string): void
|
12
|
+
export declare function populateGradleReport(workspaceRoot: string): Promise<void>;
|
13
13
|
export declare function processProjectReports(projectReportLines: string[]): GradleReport;
|
@@ -22,8 +22,8 @@ function getCurrentGradleReport() {
|
|
22
22
|
return gradleReportCache;
|
23
23
|
}
|
24
24
|
exports.getCurrentGradleReport = getCurrentGradleReport;
|
25
|
-
function populateGradleReport(workspaceRoot) {
|
26
|
-
const gradleConfigHash = (0, workspace_context_1.hashWithWorkspaceContext)(workspaceRoot, [
|
25
|
+
async function populateGradleReport(workspaceRoot) {
|
26
|
+
const gradleConfigHash = await (0, workspace_context_1.hashWithWorkspaceContext)(workspaceRoot, [
|
27
27
|
exports.gradleConfigGlob,
|
28
28
|
]);
|
29
29
|
if (gradleReportCache && gradleConfigHash === gradleCurrentConfigHash) {
|