@nx/gradle 24.0.0-pr.37405.acdaf31 → 24.0.0-rc.0
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/dist/batch-runner/build/libs/gradle-batch-runner-all.jar +0 -0
- package/dist/batch-runner/build/libs/gradle-batch-runner.jar +0 -0
- package/dist/src/generators/init/gradle-project-graph-plugin-utils.js +5 -5
- package/dist/src/migrations/24-0-0/change-plugin-version-0-1-26.d.ts +2 -0
- package/dist/src/migrations/24-0-0/change-plugin-version-0-1-26.js +23 -0
- package/dist/src/migrations/24-0-0/change-plugin-version-0-1-26.md +21 -0
- package/dist/src/utils/versions.d.ts +1 -1
- package/dist/src/utils/versions.js +1 -1
- package/migrations.json +6 -0
- package/package.json +3 -3
|
Binary file
|
|
Binary file
|
|
@@ -208,15 +208,15 @@ async function addNxProjectGraphPluginToBuildGradle(gradleFilePath, buildGradleC
|
|
|
208
208
|
const applyPluginPattern = versionCatalogPluginAccessor
|
|
209
209
|
? new RegExp(`\\s*plugin\\(${versionCatalogPluginAccessor.replace(/\./g, '\\.')}\\)`)
|
|
210
210
|
: // Both DSL forms, so a re-run doesn't append a duplicate apply.
|
|
211
|
-
new RegExp(`\\s*plugin\\s*[:(]\\s*["']${versions_1.gradleProjectGraphPluginName.replace(/\./g, '\\.')}["']`);
|
|
211
|
+
new RegExp(`\\s*plugin\\s*[:(=]\\s*["']${versions_1.gradleProjectGraphPluginName.replace(/\./g, '\\.')}["']`);
|
|
212
212
|
if (buildGradleContent.includes('allprojects {')) {
|
|
213
213
|
if (!applyPluginPattern.test(buildGradleContent)) {
|
|
214
214
|
const applyPlugin = versionCatalogPluginAccessor
|
|
215
|
-
? `plugin(${versionCatalogPluginAccessor})`
|
|
215
|
+
? `apply plugin(${versionCatalogPluginAccessor})`
|
|
216
216
|
: isKotlinDsl
|
|
217
|
-
? `plugin
|
|
218
|
-
: `plugin: "${versions_1.gradleProjectGraphPluginName}"`;
|
|
219
|
-
buildGradleContent = buildGradleContent.replace(/allprojects\s*\{/, `allprojects {\n
|
|
217
|
+
? `apply(plugin = "${versions_1.gradleProjectGraphPluginName}")`
|
|
218
|
+
: `apply plugin: "${versions_1.gradleProjectGraphPluginName}"`;
|
|
219
|
+
buildGradleContent = buildGradleContent.replace(/allprojects\s*\{/, `allprojects {\n ${applyPlugin}`);
|
|
220
220
|
}
|
|
221
221
|
}
|
|
222
222
|
else {
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = update;
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const has_gradle_plugin_1 = require("../../utils/has-gradle-plugin");
|
|
6
|
+
const gradle_project_graph_plugin_utils_1 = require("../../generators/init/gradle-project-graph-plugin-utils");
|
|
7
|
+
const version_catalog_ast_utils_1 = require("../../utils/version-catalog-ast-utils");
|
|
8
|
+
/* Change the plugin version to 0.1.26
|
|
9
|
+
*/
|
|
10
|
+
async function update(tree) {
|
|
11
|
+
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
12
|
+
if (!nxJson) {
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
if (!(0, has_gradle_plugin_1.hasGradlePlugin)(tree)) {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
const gradlePluginVersionToUpdate = '0.1.26';
|
|
19
|
+
// Update version in version catalogs using AST-based approach to preserve formatting
|
|
20
|
+
await (0, version_catalog_ast_utils_1.updateNxPluginVersionInCatalogsAst)(tree, gradlePluginVersionToUpdate);
|
|
21
|
+
// Then update in build.gradle(.kts) files
|
|
22
|
+
await (0, gradle_project_graph_plugin_utils_1.addNxProjectGraphPlugin)(tree, gradlePluginVersionToUpdate);
|
|
23
|
+
}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
#### Change dev.nx.gradle.project-graph to version 0.1.26
|
|
2
|
+
|
|
3
|
+
Change dev.nx.gradle.project-graph to version 0.1.26 in build file
|
|
4
|
+
|
|
5
|
+
#### Sample Code Changes
|
|
6
|
+
|
|
7
|
+
##### Before
|
|
8
|
+
|
|
9
|
+
```text title="build.gradle"
|
|
10
|
+
plugins {
|
|
11
|
+
id "dev.nx.gradle.project-graph" version "0.1.25"
|
|
12
|
+
}
|
|
13
|
+
```
|
|
14
|
+
|
|
15
|
+
##### After
|
|
16
|
+
|
|
17
|
+
```text title="build.gradle"
|
|
18
|
+
plugins {
|
|
19
|
+
id "dev.nx.gradle.project-graph" version "0.1.26"
|
|
20
|
+
}
|
|
21
|
+
```
|
|
@@ -4,4 +4,4 @@ exports.gradleProjectGraphVersion = exports.gradleProjectGraphPluginName = expor
|
|
|
4
4
|
const path_1 = require("path");
|
|
5
5
|
exports.nxVersion = require((0, path_1.join)('@nx/gradle', 'package.json')).version;
|
|
6
6
|
exports.gradleProjectGraphPluginName = 'dev.nx.gradle.project-graph';
|
|
7
|
-
exports.gradleProjectGraphVersion = '0.1.
|
|
7
|
+
exports.gradleProjectGraphVersion = '0.1.26';
|
package/migrations.json
CHANGED
|
@@ -192,6 +192,12 @@
|
|
|
192
192
|
"description": "Replace the removed `@nx/gradle/plugin-v1` plugin with `@nx/gradle` in `nx.json`, map its options, and apply the `dev.nx.gradle.project-graph` Gradle plugin.",
|
|
193
193
|
"implementation": "./dist/src/migrations/update-24-0-0/migrate-plugin-v1-to-gradle",
|
|
194
194
|
"documentation": "./dist/src/migrations/update-24-0-0/migrate-plugin-v1-to-gradle.md"
|
|
195
|
+
},
|
|
196
|
+
"change-plugin-version-0-1-26": {
|
|
197
|
+
"version": "24.0.0-beta.5",
|
|
198
|
+
"description": "Change dev.nx.gradle.project-graph to version 0.1.26 in build file",
|
|
199
|
+
"implementation": "./dist/src/migrations/24-0-0/change-plugin-version-0-1-26",
|
|
200
|
+
"documentation": "./dist/src/migrations/24-0-0/change-plugin-version-0-1-26.md"
|
|
195
201
|
}
|
|
196
202
|
},
|
|
197
203
|
"packageJsonUpdates": {}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/gradle",
|
|
3
|
-
"version": "24.0.0-
|
|
3
|
+
"version": "24.0.0-rc.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"files": [
|
|
@@ -67,12 +67,12 @@
|
|
|
67
67
|
"supportsOptionalMigrations": true
|
|
68
68
|
},
|
|
69
69
|
"dependencies": {
|
|
70
|
-
"@nx/devkit": "24.0.0-
|
|
70
|
+
"@nx/devkit": "24.0.0-rc.0",
|
|
71
71
|
"toml-eslint-parser": "^0.10.0",
|
|
72
72
|
"tslib": "^2.3.0"
|
|
73
73
|
},
|
|
74
74
|
"devDependencies": {
|
|
75
|
-
"nx": "24.0.0-
|
|
75
|
+
"nx": "24.0.0-rc.0"
|
|
76
76
|
},
|
|
77
77
|
"publishConfig": {
|
|
78
78
|
"access": "public"
|