Merge pull request #567 from kotlin-orm/dev

Release 4.1.0

Author: vincentlauvlwj

.github/workflows/build.yml

@@ -14,19 +14,19 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        java: [8, 11, 17, 20]
+        java: [8, 11, 17, 21]
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: ${{ matrix.java }}
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Assemble the Project
         run: ./gradlew assemble
@@ -45,6 +45,8 @@ jobs:
             ktorm-core/build/reports/jacoco/test/jacocoTestReport.csv
             ktorm-global/build/reports/jacoco/test/jacocoTestReport.csv
             ktorm-jackson/build/reports/jacoco/test/jacocoTestReport.csv
+            ktorm-ksp-annotations/build/reports/jacoco/test/jacocoTestReport.csv
+            ktorm-ksp-compiler/build/reports/jacoco/test/jacocoTestReport.csv
             ktorm-support-mysql/build/reports/jacoco/test/jacocoTestReport.csv
             ktorm-support-oracle/build/reports/jacoco/test/jacocoTestReport.csv
             ktorm-support-postgresql/build/reports/jacoco/test/jacocoTestReport.csv
@@ -78,16 +80,16 @@ jobs:
     needs: build
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 8
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Assemble the Project
         run: ./gradlew assemble

README.md

@@ -260,7 +260,7 @@ object Employees : Table<Employee>("t_employee") {
 }
 ```
 
-> Naming Strategy: It's highly recommended to name your entity classes by singular nouns, name table objects by plurals (eg. Employee/Employees, Department/Departments). 
+> Naming Strategy: It's highly recommended to name your entity classes by singular nouns, name table objects by plurals (e.g. Employee/Employees, Department/Departments). 
 
 Now that column bindings are configured, so we can use [sequence APIs](#Entity-Sequence-APIs) to perform many operations on entities. Let's add two extension properties for `Database` first. These properties return new created sequence objects via `sequenceOf` and they can help us improve the readability of the code: 
 

buildSrc/build.gradle.kts

@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0")
-    api("org.moditect:moditect-gradle-plugin:1.0.0-rc3")
-    api("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.1")
+    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
+    api("org.moditect:moditect:1.0.0.RC1")
+    api("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6")
 }

buildSrc/src/main/kotlin/ktorm.modularity.gradle.kts

@@ -1,30 +1,37 @@
 
 plugins {
     id("kotlin")
-    id("org.moditect.gradleplugin")
 }
 
-moditect {
-    // Generate a multi-release jar, the module descriptor will be located at META-INF/versions/9/module-info.class
-    addMainModuleInfo {
-        jvmVersion.set("9")
-        overwriteExistingFiles.set(true)
-        module {
-            moduleInfoFile = file("src/main/moditect/module-info.java")
+val moditect by tasks.registering {
+    doLast {
+        // Generate a multi-release modulized jar, module descriptor position: META-INF/versions/9/module-info.class
+        val inputJar = tasks.jar.flatMap { it.archiveFile }.map { it.asFile.toPath() }.get()
+        val outputDir = file("build/moditect").apply { mkdirs() }.toPath()
+        val moduleInfo = file("src/main/moditect/module-info.java").readText()
+        val version = project.version.toString()
+        org.moditect.commands.AddModuleInfo(moduleInfo, null, version, inputJar, outputDir, "9", true).run()
+
+        // Replace the original jar with the modulized jar.
+        copy {
+            from(outputDir.resolve(inputJar.fileName))
+            into(inputJar.parent)
         }
     }
+}
 
-    // Let kotlin compiler know the module descriptor.
-    if (JavaVersion.current() >= JavaVersion.VERSION_1_9) {
-        sourceSets.main {
-            kotlin.srcDir("src/main/moditect")
-        }
+tasks {
+    moditect {
+        dependsOn(jar)
     }
+    jar {
+        finalizedBy(moditect)
+    }
+}
 
-    // Workaround to avoid circular task dependencies, see https://github.com/moditect/moditect-gradle-plugin/issues/14
-    afterEvaluate {
-        val compileJava = tasks.compileJava.get()
-        val addDependenciesModuleInfo = tasks.addDependenciesModuleInfo.get()
-        compileJava.setDependsOn(compileJava.dependsOn - addDependenciesModuleInfo)
+if (JavaVersion.current() >= JavaVersion.VERSION_1_9) {
+    // Let kotlin compiler know the module descriptor.
+    sourceSets.main {
+        kotlin.srcDir("src/main/moditect")
     }
 }

buildSrc/src/main/kotlin/ktorm.publish.gradle.kts

@@ -155,6 +155,11 @@ publishing {
                         id.set("brohacz")
                         name.set("Michal Brosig")
                     }
+                    developer {
+                        id.set("hc224")
+                        name.set("hc224")
+                        email.set("hc224@pm.me")
+                    }
                 }
             }
         }

detekt.yml

@@ -49,7 +49,7 @@ complexity:
     active: true
     threshold: 4
   ComplexInterface:
-    active: true
+    active: false
     threshold: 12
     includeStaticDeclarations: false
   CyclomaticComplexMethod:
@@ -75,7 +75,7 @@ complexity:
     active: false
     threshold: 7
   NestedBlockDepth:
-    active: true
+    active: false
     threshold: 5
   StringLiteralDuplication:
     active: false

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

ktorm-core/ktorm-core.gradle.kts

@@ -19,7 +19,7 @@ val testOutput by configurations.creating {
 }
 
 val testJar by tasks.registering(Jar::class) {
-    dependsOn("testClasses")
+    dependsOn(tasks.testClasses)
     from(sourceSets.test.map { it.output })
     archiveClassifier.set("test")
 }

ktorm-core/src/main/kotlin/org/ktorm/database/CachedRowSet.kt

@@ -609,6 +609,7 @@ public open class CachedRowSet(rs: ResultSet) : ResultSet {
                 return index
             }
         }
+
         throw SQLException("Invalid column name: $columnLabel")
     }
 

ktorm-core/src/main/kotlin/org/ktorm/database/Database.kt

@@ -147,7 +147,7 @@ public class Database(
     public val name: String
 
     /**
-     * The name of the connected database product, eg. MySQL, H2.
+     * The name of the connected database product, e.g. MySQL, H2.
      */
     public val productName: String