@nx/gradle 20.4.0-canary.20250114-6181592 → 20.4.0-canary.20250116-a127177

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.
Files changed (3) hide show
  1. package/package.json +2 -2
  2. package/src/utils/exec-gradle.js +4 -1
  3. package/src/utils/get-project-report-lines.js +25 -7
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/gradle",
3
- "version": "20.4.0-canary.20250114-6181592",
3
+ "version": "20.4.0-canary.20250116-a127177",
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": "20.4.0-canary.20250114-6181592"
37
+ "@nx/devkit": "20.4.0-canary.20250116-a127177"
38
38
  },
39
39
  "publishConfig": {
40
40
  "access": "public"
package/src/utils/exec-gradle.js CHANGED
@@ -34,12 +34,15 @@ function execGradleAsync(gradleBinaryPath, args, execOptions = {}) {
34
34
  cp.stdout?.on('data', (data) => {
35
35
  stdout += data;
36
36
  });
37
+ cp.stderr?.on('data', (data) => {
38
+ stdout += data;
39
+ });
37
40
  cp.on('exit', (code) => {
38
41
  if (code === 0) {
39
42
  res(stdout);
40
43
  }
41
44
  else {
42
- rej(new Error(`Executing Gradle with ${args.join(' ')} failed with code: ${code}. \nLogs: ${stdout}`));
45
+ rej(stdout);
43
46
  }
44
47
  });
45
48
  });
package/src/utils/get-project-report-lines.js CHANGED
@@ -31,17 +31,35 @@ async function getProjectReportLines(gradlewFile) {
31
31
  ]);
32
32
  }
33
33
  catch (e) {
34
- try {
35
- projectReportBuffer = await (0, exec_gradle_1.execGradleAsync)(gradlewFile, [
36
- 'projectReport',
37
- ]);
38
- devkit_1.logger.warn(`Could not run 'projectReportAll' task. Ran 'projectReport' instead. Please run 'nx generate @nx/gradle:init' to generate the necessary tasks. ${e.message}`);
34
+ if (e.toString()?.includes('ERROR: JAVA_HOME')) {
35
+ throw new devkit_1.AggregateCreateNodesError([
36
+ [
37
+ gradlewFile,
38
+ new Error(`Could not find Java. Please install Java and try again: https://www.java.com/en/download/help/index_installing.html.\n\r${e.toString()}`),
39
+ ],
40
+ ], []);
41
+ }
42
+ else if (e.toString()?.includes(`Task 'projectReportAll' not found`)) {
43
+ try {
44
+ projectReportBuffer = await (0, exec_gradle_1.execGradleAsync)(gradlewFile, [
45
+ 'projectReport',
46
+ ]);
47
+ devkit_1.logger.warn(`Could not run 'projectReportAll' task. Ran 'projectReport' instead. Please run 'nx generate @nx/gradle:init' to generate the necessary tasks.\n\r${e.toString()}`);
48
+ }
49
+ catch (e) {
50
+ throw new devkit_1.AggregateCreateNodesError([
51
+ [
52
+ gradlewFile,
53
+ new Error(`Could not run 'projectReportAll' or 'projectReport' task. Please run 'nx generate @nx/gradle:init' to generate the necessary tasks.\n\r${e.toString()}`),
54
+ ],
55
+ ], []);
56
+ }
39
57
  }
40
- catch (e) {
58
+ else {
41
59
  throw new devkit_1.AggregateCreateNodesError([
42
60
  [
43
61
  gradlewFile,
44
- new Error(`Could not run 'projectReportAll' or 'projectReport' task. Please run 'nx generate @nx/gradle:init' to generate the necessary tasks. ${e.message}`),
62
+ new Error(`Could not run 'projectReportAll' or 'projectReport' Gradle task. Please install Gradle and try again: https://gradle.org/install/.\r\n${e.toString()}`),
45
63
  ],
46
64
  ], []);
47
65
  }