@nx/gradle 22.6.0-beta.12 → 22.6.0-beta.14

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 (10) hide show
  1. package/batch-runner/build/libs/gradle-batch-runner-all.jar +0 -0
  2. package/batch-runner/build/libs/gradle-batch-runner.jar +0 -0
  3. package/batch-runner/build/nx/gradle-batch-runner.json +1 -1
  4. package/package.json +3 -3
  5. package/project-graph/build/nx/gradle-project-graph.json +1 -1
  6. package/src/plugin/utils/get-project-graph-from-gradle-plugin.d.ts.map +1 -1
  7. package/src/plugin/utils/get-project-graph-from-gradle-plugin.js +2 -1
  8. package/src/utils/split-config-files.d.ts +1 -0
  9. package/src/utils/split-config-files.d.ts.map +1 -1
  10. package/src/utils/split-config-files.js +3 -2
package/src/plugin/utils/get-project-graph-from-gradle-plugin.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get-project-graph-from-gradle-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/plugin/utils/get-project-graph-from-gradle-plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,oBAAoB,EACpB,wBAAwB,EAExB,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAI9D,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE;QACL,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;KAClD,CAAC;IACF,YAAY,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACtC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IACzD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,uBAAwB,SAAQ,kBAAkB;IACjE,IAAI,EAAE,MAAM,CAAC;CACd;AAiBD,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,kBAAkB,QAgB5B;AASD,wBAAgB,4BAA4B,IAAI,kBAAkB,CAejE;AAED,wBAAgB,oBAAoB,IAAI,MAAM,EAAE,CAG/C;AAED;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CA8Df;AAED,wBAAgB,qBAAqB,CACnC,iBAAiB,EAAE,MAAM,EAAE,GAC1B,kBAAkB,CAiDpB"}
1
+ {"version":3,"file":"get-project-graph-from-gradle-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/plugin/utils/get-project-graph-from-gradle-plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,oBAAoB,EACpB,wBAAwB,EAExB,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAI9D,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE;QACL,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;KAClD,CAAC;IACF,YAAY,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACtC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IACzD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,uBAAwB,SAAQ,kBAAkB;IACjE,IAAI,EAAE,MAAM,CAAC;CACd;AAiBD,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,kBAAkB,QAgB5B;AASD,wBAAgB,4BAA4B,IAAI,kBAAkB,CAejE;AAED,wBAAgB,oBAAoB,IAAI,MAAM,EAAE,CAG/C;AAED;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CA8Df;AAED,wBAAgB,qBAAqB,CACnC,iBAAiB,EAAE,MAAM,EAAE,GAC1B,kBAAkB,CAkDpB"}
package/src/plugin/utils/get-project-graph-from-gradle-plugin.js CHANGED
@@ -99,8 +99,9 @@ function processNxProjectGraph(projectGraphLines) {
99
99
  while (index < projectGraphLines.length) {
100
100
  const line = projectGraphLines[index].trim();
101
101
  if (line.startsWith('> Task ') && line.endsWith(':nxProjectGraph')) {
102
+ index++; // Skip the task line before searching for the JSON file path
102
103
  while (index < projectGraphLines.length &&
103
- !projectGraphLines[index].includes('.json')) {
104
+ !projectGraphLines[index].trim().endsWith('.json')) {
104
105
  index++;
105
106
  }
106
107
  const file = projectGraphLines[index];
package/src/utils/split-config-files.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  export declare const GRADLE_BUILD_FILES: Set<string>;
2
2
  export declare const GRADLEW_FILES: Set<string>;
3
+ export declare const GRADLE_VERSION_CATALOG_GLOB = "**/gradle/*.versions.toml";
3
4
  export declare const GRADLE_TEST_FILES: string[];
4
5
  export declare const gradleConfigGlob: string;
5
6
  export declare const gradleConfigAndTestGlob: string;
package/src/utils/split-config-files.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"split-config-files.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/utils/split-config-files.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,kBAAkB,aAAgD,CAAC;AAChF,eAAO,MAAM,aAAa,aAAsC,CAAC;AACjE,eAAO,MAAM,iBAAiB,UAO7B,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAE5B,CAAC;AAEF,eAAO,MAAM,uBAAuB,QAMnC,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG;IAC1D,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAiCA"}
1
+ {"version":3,"file":"split-config-files.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/utils/split-config-files.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,kBAAkB,aAAgD,CAAC;AAChF,eAAO,MAAM,aAAa,aAAsC,CAAC;AACjE,eAAO,MAAM,2BAA2B,8BAA8B,CAAC;AACvE,eAAO,MAAM,iBAAiB,UAO7B,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAE5B,CAAC;AAEF,eAAO,MAAM,uBAAuB,QAOnC,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG;IAC1D,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAiCA"}
package/src/utils/split-config-files.js CHANGED
@@ -1,11 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.gradleConfigAndTestGlob = exports.gradleConfigGlob = exports.GRADLE_TEST_FILES = exports.GRADLEW_FILES = exports.GRADLE_BUILD_FILES = void 0;
3
+ exports.gradleConfigAndTestGlob = exports.gradleConfigGlob = exports.GRADLE_TEST_FILES = exports.GRADLE_VERSION_CATALOG_GLOB = exports.GRADLEW_FILES = exports.GRADLE_BUILD_FILES = void 0;
4
4
  exports.splitConfigFiles = splitConfigFiles;
5
5
  const globs_1 = require("nx/src/utils/globs");
6
6
  const node_path_1 = require("node:path");
7
7
  exports.GRADLE_BUILD_FILES = new Set(['build.gradle', 'build.gradle.kts']);
8
8
  exports.GRADLEW_FILES = new Set(['gradlew', 'gradlew.bat']);
9
+ exports.GRADLE_VERSION_CATALOG_GLOB = '**/gradle/*.versions.toml';
9
10
  exports.GRADLE_TEST_FILES = [
10
11
  '**/src/test/java/**/*Test.java',
11
12
  '**/src/test/kotlin/**/*Test.kt',
@@ -15,7 +16,7 @@ exports.GRADLE_TEST_FILES = [
15
16
  '**/src/test/groovy/**/*Tests.groovy',
16
17
  ];
17
18
  exports.gradleConfigGlob = (0, globs_1.combineGlobPatterns)(...Array.from(exports.GRADLE_BUILD_FILES).map((file) => `**/${file}`));
18
- 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);
19
+ 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);
19
20
  /**
20
21
  * This function split config files into build files, settings files, test files and project roots
21
22
  * @param files list of files to split