fix(gradle): fix gradle plugin path (nrwl#22405)

danielsharvey · Mar 20, 2024 · 64b2396 · 64b2396
1 parent a44475c
commit 64b2396
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/packages/gradle/src/generators/init/init.spec.ts b/packages/gradle/src/generators/init/init.spec.ts
@@ -25,7 +25,7 @@ describe('@nx/gradle:init', () => {
             "classesTargetName": "classes",
             "testTargetName": "test",
           },
-          "plugin": "@nx/gradle/plugin",
+          "plugin": "@nx/gradle",
         },
       ]
     `);
@@ -49,15 +49,15 @@ describe('@nx/gradle:init', () => {
             "classesTargetName": "classes",
             "testTargetName": "test",
           },
-          "plugin": "@nx/gradle/plugin",
+          "plugin": "@nx/gradle",
         },
       ]
     `);
   });
 
   it('should not add plugin if already in array', async () => {
     updateNxJson(tree, {
-      plugins: ['@nx/gradle/plugin'],
+      plugins: ['@nx/gradle'],
     });
     await initGenerator(tree, {
       skipFormat: true,
@@ -66,7 +66,7 @@ describe('@nx/gradle:init', () => {
     const nxJson = readNxJson(tree);
     expect(nxJson.plugins).toMatchInlineSnapshot(`
       [
-        "@nx/gradle/plugin",
+        "@nx/gradle",
       ]
     `);
   });

diff --git a/packages/gradle/src/generators/init/init.ts b/packages/gradle/src/generators/init/init.ts
@@ -51,7 +51,7 @@ function addPlugin(tree: Tree) {
   if (!hasGradlePlugin(tree)) {
     nxJson.plugins ??= [];
     nxJson.plugins.push({
-      plugin: '@nx/gradle/plugin',
+      plugin: '@nx/gradle',
       options: {
         testTargetName: 'test',
         classesTargetName: 'classes',

diff --git a/packages/gradle/src/utils/has-gradle-plugin.ts b/packages/gradle/src/utils/has-gradle-plugin.ts
@@ -3,8 +3,6 @@ import { readNxJson, Tree } from '@nx/devkit';
 export function hasGradlePlugin(tree: Tree): boolean {
   const nxJson = readNxJson(tree);
   return !!nxJson.plugins?.some((p) =>
-    typeof p === 'string'
-      ? p === '@nx/gradle/plugin'
-      : p.plugin === '@nx/gradle/plugin'
+    typeof p === 'string' ? p === '@nx/gradle' : p.plugin === '@nx/gradle'
   );
 }