build: add missing code (#784)

* build: add missing code * build: work in progress * build: work in progress * build: work in progress * build: work in progress * build: work in progress * build: work in progress * build: work in progress * build: work in progress * build: work in progress * build: work in progress * build: work in progress * build: work in progress * build: work in progress * build: work in progress * build: work in progress * build: work in progress * build: work in progress * build: work in progress --------- Co-authored-by: khalilou88 <[email protected]>
khalilou88 · Jan 22, 2024 · daf4ca6 · daf4ca6
1 parent 48bf823
commit daf4ca6
Show file tree

Hide file tree

Showing 19 changed files with 321 additions and 69 deletions.
diff --git a/.github/workflows/plugin-e2e.yml b/.github/workflows/plugin-e2e.yml
@@ -28,7 +28,7 @@ on:
           - nx-maven quarkus bom e2e
           - nx-maven spring-boot bom e2e
           - nx-maven spring-boot-parent-pom e2e
-          - should create a micronaut java application
+          - should create a sb java application
       os:
         type: choice
         description: Os

diff --git a/DEV.md b/DEV.md
@@ -0,0 +1,3 @@
+nx local-registry
+
+nx run-many --targets publish --ver 0.0.0-e2e --tag e2e
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -66,6 +66,7 @@
     "nx": "17.2.8",
     "prettier": "^3.1.1",
     "prettier-plugin-java": "^2.5.0",
+    "smol-toml": "^1.1.3",
     "tcp-port-used": "^1.0.2",
     "tmp": "^0.2.1",
     "tree-kill": "1.2.2",

diff --git a/packages/nx-gradle/package.json b/packages/nx-gradle/package.json
@@ -34,6 +34,7 @@
     "@jnxplus/common": "0.18.5",
     "nx": ">=17.0.0",
     "tslib": "^2.6.2",
-    "@nx/devkit": ">=17.0.0"
+    "@nx/devkit": ">=17.0.0",
+    "smol-toml": "^1.1.3"
   }
 }
diff --git a/packages/nx-gradle/src/generators/application/generator.ts b/packages/nx-gradle/src/generators/application/generator.ts
@@ -31,6 +31,7 @@ import {
   getVersionManagement,
 } from '../../utils';
 import { NxGradleAppGeneratorSchema } from './schema';
+import { addMissingCode } from '../../utils/libs-versions-toml';
 
 export default async function (
   tree: Tree,
@@ -324,6 +325,14 @@ async function applicationGenerator(
 ) {
   const normalizedOptions = normalizeOptions(tree, options);
 
+  await addMissingCode(
+    tree,
+    normalizedOptions.versionManagement,
+    normalizedOptions.gradleRootDirectory,
+    options.framework,
+    options.language,
+  );
+
   const projectConfiguration: ProjectConfiguration = {
     root: normalizedOptions.projectRoot,
     projectType: 'application',

diff --git a/packages/nx-gradle/src/generators/init/files/gradle/catalog/kmp/libs.versions.toml b/packages/nx-gradle/src/generators/init/files/gradle/catalog/kmp/libs.versions.toml
diff --git a/packages/nx-gradle/src/generators/init/files/gradle/catalog/micronaut/libs.versions.toml b/packages/nx-gradle/src/generators/init/files/gradle/catalog/micronaut/libs.versions.toml
diff --git a/packages/nx-gradle/src/generators/init/files/gradle/catalog/none/libs.versions.toml b/packages/nx-gradle/src/generators/init/files/gradle/catalog/none/libs.versions.toml
diff --git a/packages/nx-gradle/src/generators/init/files/gradle/catalog/quarkus/libs.versions.toml b/packages/nx-gradle/src/generators/init/files/gradle/catalog/quarkus/libs.versions.toml
diff --git a/packages/nx-gradle/src/generators/init/files/gradle/catalog/spring-boot/libs.versions.toml b/packages/nx-gradle/src/generators/init/files/gradle/catalog/spring-boot/libs.versions.toml
diff --git a/...es/nx-gradle/src/generators/init/files/gradle/config/none/build.gradle__kotlinExtension__ b/...es/nx-gradle/src/generators/init/files/gradle/config/none/build.gradle__kotlinExtension__
@@ -14,13 +14,11 @@ plugins {
   alias libs.plugins.github.khalilou88.jnxplus
   // this is necessary to avoid the plugins to be loaded multiple times
   // in each subproject's classloader
-  alias libs.plugins.jetbrains.kotlin.jvm apply false
 <% } -%>
 <% if(dsl === 'kotlin') { -%>
   alias(libs.plugins.github.khalilou88.jnxplus)
   // this is necessary to avoid the plugins to be loaded multiple times
   // in each subproject's classloader
-  alias(libs.plugins.jetbrains.kotlin.jvm) apply false
 <% } -%>
 }
 <% } -%>
diff --git a/packages/nx-gradle/src/generators/init/generator.ts b/packages/nx-gradle/src/generators/init/generator.ts
@@ -23,6 +23,7 @@ import {
   writeJson,
 } from '@nx/devkit';
 import * as path from 'path';
+import { addLibsVersionsToml } from '../../utils/libs-versions-toml';
 import { NxGradleInitGeneratorSchema } from './schema';
 
 interface NormalizedSchema extends NxGradleInitGeneratorSchema {
@@ -86,11 +87,12 @@ function addFiles(tree: Tree, options: NormalizedSchema) {
   );
 
   if (options.versionManagement === 'version-catalog') {
-    generateFiles(
+    addLibsVersionsToml(
       tree,
-      path.join(__dirname, 'files', 'gradle', 'catalog', options.preset),
-      joinPathFragments(options.gradleRootDirectory, 'gradle'),
-      templateOptions,
+      options.gradleRootDirectory,
+      options.javaVersion,
+      options.preset,
+      'java',
     );
   }
 }

diff --git a/packages/nx-gradle/src/generators/library/generator.ts b/packages/nx-gradle/src/generators/library/generator.ts
@@ -29,6 +29,7 @@ import {
   getVersionManagement,
 } from '../../utils';
 import { NxGradleLibGeneratorSchema } from './schema';
+import { addMissingCode } from '../../utils/libs-versions-toml';
 
 export default async function (
   tree: Tree,
@@ -276,6 +277,14 @@ async function libraryGenerator(
 ) {
   const normalizedOptions = normalizeOptions(tree, options);
 
+  await addMissingCode(
+    tree,
+    normalizedOptions.versionManagement,
+    normalizedOptions.gradleRootDirectory,
+    options.framework,
+    options.language,
+  );
+
   const projectConfiguration: ProjectConfiguration = {
     root: normalizedOptions.projectRoot,
     projectType: 'library',
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		nx local-registry

		nx run-many --targets publish --ver 0.0.0-e2e --tag e2e