Merge pull request #409 from mshima/modularized

JHipster 8 modularization integration.
jhipster · Jul 29, 2024 · e75bcf3 · e75bcf3
2 parents de71944 + 8171964
commit e75bcf3
Show file tree

Hide file tree

Showing 17 changed files with 572 additions and 197 deletions.
diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml
@@ -96,6 +96,9 @@ jobs:
                   node-version: 20
                   java-version: 11
                   binary-dir: ${{ github.workspace }}/jhipster-kotlin/cli
+            - run: |
+                  mkdir -p ~/.gradle
+                  echo "org.gradle.warning.mode=all" >> ~/.gradle/gradle.properties
             - name: 'SETUP: environment'
               id: setup
               uses: ./jhipster-kotlin/.github/actions/setup

diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml
@@ -96,6 +96,9 @@ jobs:
                   node-version: 20
                   java-version: 11
                   binary-dir: ${{ github.workspace }}/jhipster-kotlin/cli
+            - run: |
+                  mkdir -p ~/.gradle
+                  echo "org.gradle.warning.mode=all" >> ~/.gradle/gradle.properties
             - name: 'SETUP: environment'
               id: setup
               uses: ./jhipster-kotlin/.github/actions/setup

diff --git a/generators/detekt/__snapshots__/generator.spec.js.snap b/generators/detekt/__snapshots__/generator.spec.js.snap
@@ -2,17 +2,12 @@
 
 exports[`SubGenerator detekt of kotlin JHipster blueprint > gradle > should match source calls 1`] = `
 {
-  "addGradlePluginToBuildScript": [
+  "addGradleDependencyCatalogPlugin": [
     {
-      "group": "io.gitlab.arturbosch.detekt",
-      "name": "detekt-gradle-plugin",
-      "version": "\${detekt_version}",
-    },
-  ],
-  "addGradleProperty": [
-    {
-      "property": "detekt_version",
-      "value": "'DETEKT-GRADLE-VERSION'",
+      "addToBuild": true,
+      "id": "io.gitlab.arturbosch.detekt",
+      "pluginName": "detekt",
+      "version": "'DETEKT-GRADLE-VERSION'",
     },
   ],
   "applyFromGradle": [

diff --git a/generators/detekt/generator.js b/generators/detekt/generator.js
@@ -49,26 +49,12 @@ export default class extends BaseApplicationGenerator {
                 if (application.buildToolGradle) {
                     source.applyFromGradle({ script: 'gradle/detekt.gradle' });
 
-                    source.addGradleProperty({ property: 'detekt_version', value: application.javaDependencies['detekt-gradle'] });
-
-                    source.addGradlePluginToBuildScript({
-                        group: 'io.gitlab.arturbosch.detekt',
-                        name: 'detekt-gradle-plugin',
-                        version: '${detekt_version}',
+                    source.addGradleDependencyCatalogPlugin({
+                        pluginName: 'detekt',
+                        id: 'io.gitlab.arturbosch.detekt',
+                        version: application.javaDependencies['detekt-gradle'],
+                        addToBuild: true,
                     });
-
-                    /*
-                    // JHipster 8 based configuration
-                    source.addJavaDefinition({
-                        versions: [
-                            { name: 'detekt', version: DETEKT_VERSION },
-                        ],
-                    });
-
-                    source.addGradleDependencyCatalogPlugins([
-                        { pluginName: 'detekt', id: 'io.gitlab.arturbosch.detekt', version: application.javaDependencies['detekt-gradle'], addToBuild: true },
-                    ]);
-                    */
                 }
             },
 

diff --git a/generators/detekt/templates/gradle/detekt.gradle.ejs b/generators/detekt/templates/gradle/detekt.gradle.ejs
@@ -16,8 +16,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-apply plugin: "io.gitlab.arturbosch.detekt"
-
 detekt {
     input = files("src/main/kotlin")
     config = files("<%= detektConfigFile %>")

diff --git a/generators/kotlin/__snapshots__/generator.spec.js.snap b/generators/kotlin/__snapshots__/generator.spec.js.snap
@@ -2,27 +2,55 @@
 
 exports[`SubGenerator kotlin of kotlin JHipster blueprint > gradle > should match source calls 1`] = `
 {
-  "addGradlePluginToBuildScript": [
+  "addGradleDependencyCatalogLibrary": [
     {
       "group": "org.jetbrains.kotlin",
-      "name": "kotlin-gradle-plugin",
-      "version": "\${kotlin_version}",
+      "libraryName": "kotlin-bom",
+      "name": "kotlin-bom",
+      "scope": "implementation platform",
+      "version.ref": "kotlin",
     },
+  ],
+  "addGradleDependencyCatalogPlugin": [
     {
-      "group": "org.jetbrains.kotlin",
-      "name": "kotlin-allopen",
-      "version": "\${kotlin_version}",
+      "addToBuild": true,
+      "id": "org.jetbrains.kotlin.plugin.spring",
+      "pluginName": "kotlin-spring",
+      "version.ref": "kotlin",
     },
     {
-      "group": "org.jetbrains.kotlin",
-      "name": "kotlin-noarg",
-      "version": "\${kotlin_version}",
+      "addToBuild": true,
+      "id": "org.jetbrains.kotlin.plugin.jpa",
+      "pluginName": "kotlin-jpa",
+      "version.ref": "kotlin",
+    },
+    {
+      "addToBuild": true,
+      "id": "org.jetbrains.kotlin.plugin.allopen",
+      "pluginName": "kotlin-allopen",
+      "version.ref": "kotlin",
     },
   ],
-  "addGradleProperty": [
+  "addGradleDependencyCatalogPlugins": [
+    [
+      {
+        "addToBuild": true,
+        "id": "org.jetbrains.kotlin.jvm",
+        "pluginName": "kotlin",
+        "version.ref": "kotlin",
+      },
+      {
+        "addToBuild": true,
+        "id": "org.jetbrains.kotlin.kapt",
+        "pluginName": "kotlin-kapt",
+        "version.ref": "kotlin",
+      },
+    ],
+  ],
+  "addGradleDependencyCatalogVersion": [
     {
-      "property": "kotlin_version",
-      "value": "'KOTLIN-VERSION'",
+      "name": "kotlin",
+      "version": "'KOTLIN-VERSION'",
     },
   ],
   "applyFromGradle": [

diff --git a/generators/kotlin/generator.js b/generators/kotlin/generator.js
@@ -77,64 +77,57 @@ export default class extends BaseApplicationGenerator {
         return this.asPostWritingTaskGroup({
             async customizeGradle({ application, source }) {
                 if (application.buildToolGradle) {
+                    source.addGradleDependencyCatalogVersion({ name: 'kotlin', version: application.javaDependencies.kotlin });
+
                     source.applyFromGradle({
                         script: 'gradle/kotlin.gradle',
                     });
 
-                    source.addGradleProperty({ property: 'kotlin_version', value: application.javaDependencies.kotlin });
+                    source.addGradleDependencyCatalogPlugins([
+                        {
+                            pluginName: 'kotlin',
+                            id: 'org.jetbrains.kotlin.jvm',
+                            'version.ref': 'kotlin',
+                            addToBuild: true,
+                        },
+                        {
+                            pluginName: 'kotlin-kapt',
+                            id: 'org.jetbrains.kotlin.kapt',
+                            'version.ref': 'kotlin',
+                            addToBuild: true,
+                        },
+                    ]);
 
-                    source.addGradlePluginToBuildScript({
+                    source.addGradleDependencyCatalogLibrary({
+                        libraryName: 'kotlin-bom',
                         group: 'org.jetbrains.kotlin',
-                        name: 'kotlin-gradle-plugin',
-                        version: '${kotlin_version}',
+                        name: 'kotlin-bom',
+                        scope: 'implementation platform',
+                        'version.ref': 'kotlin',
                     });
+
                     if (application.backendTypeSpringBoot) {
-                        // Required for Spring plugin
-                        source.addGradlePluginToBuildScript({
-                            group: 'org.jetbrains.kotlin',
-                            name: 'kotlin-allopen',
-                            version: '${kotlin_version}',
+                        source.addGradleDependencyCatalogPlugin({
+                            pluginName: 'kotlin-spring',
+                            id: 'org.jetbrains.kotlin.plugin.spring',
+                            'version.ref': 'kotlin',
+                            addToBuild: true,
                         });
                         if (application.databaseTypeSql) {
-                            // Required for JPA plugin
-                            source.addGradlePluginToBuildScript({
-                                group: 'org.jetbrains.kotlin',
-                                name: 'kotlin-noarg',
-                                version: '${kotlin_version}',
+                            source.addGradleDependencyCatalogPlugin({
+                                pluginName: 'kotlin-jpa',
+                                id: 'org.jetbrains.kotlin.plugin.jpa',
+                                'version.ref': 'kotlin',
+                                addToBuild: true,
                             });
-                        }
-                    }
-
-                    /*
-                    // JHipster 8 based configuration
-                    source.addJavaDefinition({
-                        versions: [
-                            { name: 'kotlin', version: KOTLIN_VERSION },
-                        ],
-                    });
-
-                    source.addGradleDependencyCatalogPlugins([
-                        { pluginName: 'kotlin-jvm', id: 'org.jetbrains.kotlin.jvm', 'version.ref': 'kotlin', addToBuild: true },
-                        // Required for Spring plugin
-                        {
-                            pluginName: 'kotlin-allopen',
-                            id: 'org.jetbrains.kotlin.plugin.allopen',
-                            'version.ref': 'kotlin',
-                            addToBuild: true,
-                        },
-                    ]);
-                    if (application.databaseTypeSql) {
-                        // Required for JPA plugin
-                        source.addGradleDependencyCatalogPlugins([
-                            {
-                                pluginName: 'kotlin-noarg',
-                                id: 'org.jetbrains.kotlin.plugin.noarg',
+                            source.addGradleDependencyCatalogPlugin({
+                                pluginName: 'kotlin-allopen',
+                                id: 'org.jetbrains.kotlin.plugin.allopen',
                                 'version.ref': 'kotlin',
                                 addToBuild: true,
-                            },
-                        ]);
+                            });
+                        }
                     }
-                    */
                 }
             },
             async customizeMaven({ application, source }) {

diff --git a/generators/kotlin/templates/gradle/kotlin.gradle.ejs b/generators/kotlin/templates/gradle/kotlin.gradle.ejs
@@ -18,47 +18,41 @@
 -%>
 import org.gradle.internal.os.OperatingSystem
 
-apply plugin: "kotlin" // Required for Kotlin integration
-apply plugin: "kotlin-kapt" // Required for annotations processing
-apply plugin: "kotlin-spring" // See https://kotlinlang.org/docs/reference/compiler-plugins.html#spring-support
-<%_ if (databaseTypeSql) { _%>
-apply plugin: "kotlin-allopen" // See https://kotlinlang.org/docs/reference/compiler-plugins.html#using-in-gradle
-apply plugin: "kotlin-jpa" // See https://kotlinlang.org/docs/reference/compiler-plugins.html#jpa-support
-<%_ } _%>
-
-apply plugin: "org.jlleitschuh.gradle.ktlint"
-
 dependencies {
-    implementation platform("org.jetbrains.kotlin:kotlin-bom:${kotlin_version}")
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     implementation "org.jetbrains.kotlin:kotlin-reflect"
 
-    <%_ if (reactive) { _%>
+<%_ if (reactive) { _%>
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-debug"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactor"
     implementation "io.projectreactor.kotlin:reactor-kotlin-extensions"
-    <%_ } _%>
 
+<%_ } _%>
     kapt "org.mapstruct:mapstruct-processor:${mapstructVersion}"
-    <%_ if (databaseTypeSql) { _%>
+<%_ if (databaseTypeSql) { _%>
     kapt "org.hibernate:hibernate-jpamodelgen:${hibernateVersion}"
     kapt "org.glassfish.jaxb:jaxb-runtime:${jaxbRuntimeVersion}"
-    <%_ } _%>
-    <%_ if (databaseTypeCassandra) { _%>
+<%_ } _%>
+<%_ if (databaseTypeCassandra) { _%>
     kapt "com.datastax.oss:java-driver-mapper-processor:${cassandraDriverVersion}"
-    <%_ } _%>
+<%_ } _%>
 
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit"
-
     testImplementation "org.mockito.kotlin:mockito-kotlin:<%= javaDependencies['mockito-kotlin'] %>"
-}<%_ if (databaseTypeSql) { %>
+}
+
+kapt {
+    correctErrorTypes true
+}
 
+<%_ if (databaseTypeSql) { _%>
 allOpen {
     annotation("javax.persistence.Entity")
     annotation("javax.persistence.MappedSuperclass")
     annotation("javax.persistence.Embeddable")
-}<%_ } %>
+}
 
+<%_ } _%>
 [compileKotlin, compileTestKotlin]*.with {
     kotlinOptions {
         jvmTarget = "<%= javaVersion %>"
@@ -70,7 +64,6 @@ allOpen {
 ktlint {
     //See more options: https://github.com/JLLeitschuh/ktlint-gradle#configuration
     ignoreFailures = true
-    disabledRules = ["no-wildcard-imports", "filename"]
 }
 
 if (OperatingSystem.current().isWindows()) {
@@ -81,10 +74,9 @@ if (OperatingSystem.current().isWindows()) {
     }
 }
 
-//Reformat code before compilation
+// Reformat code before compilation
 compileKotlin.dependsOn ktlintFormat
 
-
 jacocoTestReport {
     // Add Kotlin sources to Jacoco source dirs
     sourceDirectories.from += sourceSets.main.kotlin.srcDirs

diff --git a/generators/ktlint/__snapshots__/generator.spec.js.snap b/generators/ktlint/__snapshots__/generator.spec.js.snap
@@ -2,12 +2,15 @@
 
 exports[`SubGenerator kotlin of kotlin JHipster blueprint > gradle > should match source calls 1`] = `
 {
-  "addGradlePluginToBuildScript": [
-    {
-      "group": "org.jlleitschuh.gradle",
-      "name": "ktlint-gradle",
-      "version": "'KTLINT-GRADLE-VERSION'",
-    },
+  "addGradleDependencyCatalogPlugins": [
+    [
+      {
+        "addToBuild": true,
+        "id": "org.jlleitschuh.gradle.ktlint",
+        "pluginName": "ktlint",
+        "version": "'KTLINT-GRADLE-VERSION'",
+      },
+    ],
   ],
 }
 `;

diff --git a/generators/ktlint/generator.js b/generators/ktlint/generator.js
@@ -122,15 +122,14 @@ export default class extends BaseApplicationGenerator {
             },
             addDependencies({ application, source }) {
                 if (application.buildToolGradle) {
-                    source.addGradlePluginToBuildScript({
-                        group: 'org.jlleitschuh.gradle',
-                        name: 'ktlint-gradle',
-                        version: application.javaDependencies['ktlint-gradle'],
-                    });
-
-                    /* JHipster 8 based configuration
-                    source.addGradleDependencyCatalogPlugins([{ pluginName: 'ktlint', id: 'org.jlleitschuh.gradle.ktlint', version: KTLINT_GRADLE_VERSION, addToBuild: true }]);
-                    */
+                    source.addGradleDependencyCatalogPlugins([
+                        {
+                            pluginName: 'ktlint',
+                            id: 'org.jlleitschuh.gradle.ktlint',
+                            version: application.javaDependencies['ktlint-gradle'],
+                            addToBuild: true,
+                        },
+                    ]);
                 } else {
                     source.addJavaDefinition({
                         versions: [{ name: 'ktlint-maven-plugin', version: application.javaDependencies['ktlint-maven'] }],