update samples for 3.2.2

Author: pull-vert

samples/kotysa-ktor-jdbc/build.gradle

@@ -51,6 +51,6 @@ test {
 }
 
 wrapper {
-    gradleVersion = '8.3'
+    gradleVersion = '8.5'
     distributionType = Wrapper.DistributionType.ALL
 }

samples/kotysa-ktor-jdbc/gradle.properties

@@ -3,25 +3,25 @@ version=0.1
 
 # plugins
 # https://kotlinlang.org/docs/releases.html#release-details
-kotlin_version=1.9.10
+kotlin_version=1.9.22
 
 # main
 # https://github.com/ktorio/ktor/releases
-ktor_version=2.3.4
+ktor_version=2.3.8
 # https://mvnrepository.com/artifact/ch.qos.logback/logback-core
-logback_version=1.4.11
+logback_version=1.4.14
 # https://mvnrepository.com/artifact/com.h2database/h2
-h2_version=2.2.222
+h2_version=2.2.224
 # https://mvnrepository.com/artifact/org.kodein.di/kodein-di-framework-ktor-server-jvm
-kodein_di_ktor_version=7.20.2
+kodein_di_ktor_version=7.21.2
 # https://github.com/Kotlin/kotlinx-datetime/releases
-kotlinx_datetime_version=0.4.1
+kotlinx_datetime_version=0.5.0
 # https://github.com/ufoss-org/kotysa/releases
-kotysa_version=3.2.1
+kotysa_version=3.2.2
 
 #tests
 # https://github.com/kotest/kotest/releases
-kotest_version=5.7.1
+kotest_version=5.8.0
 # https://github.com/kotest/kotest-assertions-ktor
 kotest_assertions_ktor_version=2.0.0
 

samples/kotysa-ktor-jdbc/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 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.5-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

samples/kotysa-ktor-jdbc/gradle/wrapper/gradle-wrapper.properties

@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

samples/kotysa-ktor-jdbc/gradlew

@@ -1,10 +1,15 @@
 module kotysa.ktor.jdbc {
     requires java.sql;
     requires com.h2database;
+    requires io.ktor.http;
+    requires io.ktor.serialization.kotlinx.json;
+    requires io.ktor.server.content.negotiation;
     requires io.ktor.server.core;
     requires io.ktor.server.host.common;
     requires io.ktor.server.netty;
     requires kotlin.stdlib;
+    requires kotlinx.datetime;
+    requires kotlinx.serialization.core;
     requires kotysa.core;
     requires kotysa.jdbc;
 

samples/kotysa-ktor-jdbc/src/main/java/module-info.java

@@ -10,8 +10,8 @@ import org.ufoss.kotysa.h2.dateTime
 import java.util.*
 
 data class Role(
-        val label: String,
-        val id: UUID = UUID.randomUUID()
+    val label: String,
+    val id: UUID = UUID.randomUUID()
 )
 
 @Serializable
@@ -23,31 +23,32 @@ data class User(
     val roleId: UUID,
     val alias: String? = null,
     val creationTime: LocalDateTime = Clock.System.now().toLocalDateTime(TimeZone.UTC),
-    val id: Int? = null
+    val id: Int = 0
 )
 
 /**
  * Not an entity
  * name = first_name and last_name
  */
 data class UserDto(
-        val name: String,
-        val alias: String?,
-        val role: String
+    val name: String,
+    val alias: String?,
+    val role: String
 )
 
 // Mapping
 
 object Roles : H2Table<Role>() {
     val id = uuid(Role::id)
-            .primaryKey()
+        .primaryKey()
     val label = varchar(Role::label)
         .unique()
 }
 
 object Users : H2Table<User>("users") {
-    val id = autoIncrementInteger(User::id)
-            .primaryKey()
+    val id = integer(User::id)
+        .identity()
+        .primaryKey()
     val firstname = varchar(User::firstname)
     val lastname = varchar(User::lastname)
     val isAdmin = boolean(User::isAdmin)

samples/kotysa-ktor-jdbc/src/main/kotlin/com/sample/Models.kt

@@ -26,7 +26,7 @@ class IntegrationTests : StringSpec({
         kotysaApiTest {
             val response = client.get("/api/users/123")
             response shouldHaveStatus HttpStatusCode.OK
-            response.body<User>().id!! shouldBeExactly 123
+            response.body<User>().id shouldBeExactly 123
         }
     }
 })

samples/kotysa-ktor-jdbc/src/test/kotlin/com/sample/IntegrationTests.kt

@@ -52,6 +52,6 @@ test {
 }
 
 wrapper {
-    gradleVersion = '8.3'
+    gradleVersion = '8.5'
     distributionType = Wrapper.DistributionType.ALL
 }

samples/kotysa-ktor-r2dbc-coroutines/build.gradle

@@ -3,25 +3,25 @@ version=0.1
 
 # plugins
 # https://kotlinlang.org/docs/releases.html#release-details
-kotlin_version=1.9.10
+kotlin_version=1.9.22
 
 # main
 # https://github.com/ktorio/ktor/releases
-ktor_version=2.3.4
+ktor_version=2.3.8
 # https://mvnrepository.com/artifact/ch.qos.logback/logback-core
-logback_version=1.4.11
+logback_version=1.4.14
 # https://search.maven.org/artifact/io.r2dbc/r2dbc-h2
 h2_version=1.0.0.RELEASE
 # https://mvnrepository.com/artifact/org.kodein.di/kodein-di-framework-ktor-server-jvm
-kodein_di_ktor_version=7.20.2
+kodein_di_ktor_version=7.21.2
 # https://github.com/Kotlin/kotlinx-datetime/releases
-kotlinx_datetime_version=0.4.1
+kotlinx_datetime_version=0.5.0
 # https://github.com/ufoss-org/kotysa/releases
-kotysa_version=3.2.1
+kotysa_version=3.2.2
 
 # tests
 # https://github.com/kotest/kotest/releases
-kotest_version=5.7.1
+kotest_version=5.8.0
 # https://github.com/kotest/kotest-assertions-ktor
 kotest_assertions_ktor_version=2.0.0