diff --git a/e2e/gradle/src/gradle-import.test.ts b/e2e/gradle/src/gradle-import.test.ts index 54688623b1..77898640ee 100644 --- a/e2e/gradle/src/gradle-import.test.ts +++ b/e2e/gradle/src/gradle-import.test.ts @@ -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, }); diff --git a/package.json b/package.json index ff78962b4f..a2950cc327 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/packages/gradle/batch-runner/project.json b/packages/gradle/batch-runner/project.json index 337e70d6f6..5e726e4c50 100644 --- a/packages/gradle/batch-runner/project.json +++ b/packages/gradle/batch-runner/project.json @@ -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", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2e324b2819..29c605c89f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -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)))