fix(gradle): fix gradle on windows (#31595)

<!-- Please make sure you have read the submission guidelines before
posting an PR -->
<!--
https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-a-pr
-->

<!-- Please make sure that your commit message follows our format -->
<!-- Example: `fix(nx): must begin with lowercase` -->

<!-- If this is a particularly complex change or feature addition, you
can request a dedicated Nx release for this pull request branch. Mention
someone from the Nx team or the `@nrwl/nx-pipelines-reviewers` and they
will confirm if the PR warrants its own release for testing purposes,
and generate it for you if appropriate. -->

## Current Behavior
<!-- This is the behavior we have today -->
fix to run gradle on windows
./gradlew command is only macos

## Expected Behavior
<!-- This is the behavior we should expect with the changes in this PR
-->
use @nx/gradle:gradle executor instead of command ./gradlew

## Related Issue(s)
<!-- Please link the issue being fixed so it gets closed when this is
merged. -->

Fixes #
This commit is contained in:
Emily Xiong 2025-06-17 11:35:01 -04:00 committed by GitHub
parent d0d62846a2
commit 7f349fb6bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 19 additions and 8 deletions

View File

@ -95,6 +95,7 @@ describe('Nx Import Gradle', () => {
);
expect(gradlePlugin).toBeDefined();
expect(() => {
runCLI('reset', { env: { CI: 'false' } });
runCLI(`show projects`);
runCLI('build kotlin-app');
}).not.toThrow();
@ -151,6 +152,7 @@ describe('Nx Import Gradle', () => {
gradlePlugin.exclude = [];
updateJson('nx.json', () => nxJson);
expect(() => {
runCLI('reset', { env: { CI: 'false' } });
runCLI(`show projects`);
runCLI('build groovy-app');
}).not.toThrow();
@ -173,13 +175,6 @@ function setupGradleProjectGit(
`{"name": "${tempGradleProjectName}"}`
);
execSync(`./gradlew --stop`, {
cwd: tempGraldeProjectPath,
});
execSync(`./gradlew clean`, {
cwd: tempGraldeProjectPath,
});
execSync(`git init`, {
cwd: tempGraldeProjectPath,
});

View File

@ -86,6 +86,7 @@
"@nx/esbuild": "21.2.0-beta.4",
"@nx/eslint": "21.2.0-beta.4",
"@nx/eslint-plugin": "21.2.0-beta.4",
"@nx/gradle": "21.2.0-beta.4",
"@nx/jest": "21.2.0-beta.4",
"@nx/js": "21.2.0-beta.4",
"@nx/key": "2.0.1",

View File

@ -5,7 +5,10 @@
"sourceRoot": "packages/gradle/batch-runner/src",
"targets": {
"assemble": {
"command": "./gradlew :batch-runner:assemble",
"executor": "@nx/gradle:gradle",
"options": {
"taskName": "batch-runner:assemble"
},
"inputs": [
"{projectRoot}/src/**",
"{projectRoot}/build.gradle.kts",

12
pnpm-lock.yaml generated
View File

@ -348,6 +348,9 @@ importers:
'@nx/eslint-plugin':
specifier: 21.2.0-beta.4
version: 21.2.0-beta.4(@babel/traverse@7.27.1)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@typescript-eslint/parser@8.32.1(eslint@8.57.0)(typescript@5.8.3))(eslint-config-prettier@10.1.2(eslint@8.57.0))(eslint@8.57.0)(nx@21.2.0-beta.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.8.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0))
'@nx/gradle':
specifier: 21.2.0-beta.4
version: 21.2.0-beta.4(nx@21.2.0-beta.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))
'@nx/jest':
specifier: 21.2.0-beta.4
version: 21.2.0-beta.4(@babel/traverse@7.27.1)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(babel-plugin-macros@3.1.0)(nx@21.2.0-beta.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(ts-node@10.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(typescript@5.8.3))(typescript@5.8.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0))
@ -5783,6 +5786,9 @@ packages:
'@zkochan/js-yaml':
optional: true
'@nx/gradle@21.2.0-beta.4':
resolution: {integrity: sha512-hudVH5CkK1jf9D5Qq+xWTRmalBmEPkk/4A0Jog2dMX0R3+VQiTeA7rpPN2hLfS4ShPjdif3lYR/e+6LecLBT0A==}
'@nx/graph@0.4.2':
resolution: {integrity: sha512-8sdn77o3O/BeKukKRDTPcktbMGLq4w0B5cij3SUJjzFXEZUmKCKs4LXt4VO48EV0qB4zEmuNYdhVp2erfDF7Jg==}
peerDependencies:
@ -25922,6 +25928,12 @@ snapshots:
- supports-color
- verdaccio
'@nx/gradle@21.2.0-beta.4(nx@21.2.0-beta.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))':
dependencies:
'@nx/devkit': 21.2.0-beta.4(nx@21.2.0-beta.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))
transitivePeerDependencies:
- nx
'@nx/graph@0.4.2(@nx/devkit@21.2.0-beta.4(nx@21.2.0-beta.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))))(nx@21.2.0-beta.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(react-dom@18.3.1(react@18.3.1))(react-router-dom@6.26.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)':
dependencies:
'@nx/devkit': 21.2.0-beta.4(nx@21.2.0-beta.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.21)(typescript@5.8.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))