Update versions

Author: nomisRev

build.gradle.kts

@@ -2,14 +2,15 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 @Suppress("DSL_SCOPE_VIOLATION") plugins {
   application
-  alias(libs.plugins.kotest.multiplatform)
-  id(libs.plugins.kotlin.jvm.pluginId)
+  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.kotlin.assert)
   alias(libs.plugins.kover)
   alias(libs.plugins.kotlinx.serialization)
+  alias(libs.plugins.kotest.multiplatform)
   alias(libs.plugins.sqldelight)
   alias(libs.plugins.ktor)
   alias(libs.plugins.spotless)
-  alias(libs.plugins.kotlin.assert)
+  alias(libs.plugins.version.catalog.update)
 }
 
 application {
@@ -25,10 +26,6 @@ sqldelight {
   }
 }
 
-repositories {
-  mavenCentral()
-}
-
 tasks {
   withType<KotlinCompile>().configureEach {
     kotlin.compilerOptions.freeCompilerArgs.add("-Xcontext-receivers")
@@ -41,16 +38,18 @@ tasks {
 
 ktor {
   docker {
-    jreVersion = JavaVersion.VERSION_19
+    jreVersion = JavaVersion.VERSION_21
     localImageName = "ktor-arrow-example"
-    imageTag = "latest"
   }
 }
 
 spotless {
   kotlin {
     targetExclude("**/build/**")
-    ktfmt("0.46").googleStyle()
+    ktfmt().googleStyle().configure {
+      it.setRemoveUnusedImports(true)
+      it.setManageTrailingCommas(true)
+    }
   }
 }
 

buildSrc/build.gradle.kts

@@ -1,107 +1,115 @@
 [versions]
 arrow = "2.0.1"
-coroutines = "1.7.3"
-kotlin = "2.1.10"
+cohort = "2.6.1"
+coroutines = "1.10.1"
+detekt = "1.23.8"
+hikari = "6.3.0"
+kjwt = "1.0.0"
 kotest = "5.9.1"
+kotest-arrow = "2.0.0"
+kotest-testcontainers = "2.0.2"
+kotlin = "2.1.20"
 kover = "0.9.1"
-detekt = "1.23.7"
-ktor = "3.1.0"
-logback = "1.5.16"
-sqldelight="2.0.2"
-testcontainers="1.20.4"
-hikari="6.2.1"
-postgresql="42.7.5"
-kjwt="1.0.0"
-kotest-arrow="2.0.0"
-kotest-testcontainers="2.0.2"
-slugify="3.0.7"
-suspendapp="0.4.0"
-cohort="2.6.1"
-spotless="7.0.2"
+ktor = "3.1.2"
+logback = "1.5.18"
+postgresql = "42.7.5"
+slugify = "3.0.7"
+spotless = "7.0.2"
+sqldelight = "2.0.2"
+suspendapp = "0.5.0"
+testcontainers = "1.20.6"
+version-catalog-update = "1.0.0"
 
 [libraries]
 arrow-core = { module = "io.arrow-kt:arrow-core", version.ref = "arrow" }
-arrow-optics = { module = "io.arrow-kt:arrow-optics", version.ref = "arrow" }
 arrow-fx = { module = "io.arrow-kt:arrow-fx-coroutines", version.ref = "arrow" }
-suspendapp = { module = "io.arrow-kt:suspendapp", version.ref = "suspendapp" }
-suspendapp-ktor = { module = "io.arrow-kt:suspendapp-ktor", version.ref = "suspendapp" }
+arrow-optics = { module = "io.arrow-kt:arrow-optics", version.ref = "arrow" }
+cohort-hikari = { module = "com.sksamuel.cohort:cohort-hikari", version.ref = "cohort" }
+cohort-ktor = { module = "com.sksamuel.cohort:cohort-ktor", version.ref = "cohort" }
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", version.ref = "coroutines" }
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
+detekt-gradle = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
+hikari = { module = "com.zaxxer:HikariCP", version.ref = "hikari" }
+kjwt-core = { module = "io.github.nefilim.kjwt:kjwt-core", version.ref = "kjwt" }
+kotest-arrow = { module = "io.kotest.extensions:kotest-assertions-arrow", version.ref = "kotest-arrow" }
+kotest-arrow-fx = { module = "io.kotest.extensions:kotest-assertions-arrow-fx-coroutines", version.ref = "kotest-arrow" }
 kotest-assertionsCore = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
 kotest-frameworkEngine = { module = "io.kotest:kotest-framework-engine", version.ref = "kotest" }
 kotest-property = { module = "io.kotest:kotest-property", version.ref = "kotest" }
 kotest-runnerJUnit5 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
-kotest-arrow = { module = "io.kotest.extensions:kotest-assertions-arrow", version.ref = "kotest-arrow" }
-kotest-arrow-fx = { module = "io.kotest.extensions:kotest-assertions-arrow-fx-coroutines", version.ref = "kotest-arrow" }
 kotest-testcontainers = { module = "io.kotest.extensions:kotest-extensions-testcontainers", version.ref = "kotest-testcontainers" }
+kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
+ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
+ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
+ktor-client-resources = { module = "io.ktor:ktor-client-resources", version.ref = "ktor" }
+ktor-client-serialization = { module = "io.ktor:ktor-client-serialization", version.ref = "ktor" }
+ktor-serialization = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
+ktor-server-auth = { module = "io.ktor:ktor-server-auth", version.ref = "ktor" }
+ktor-server-auth-jwt = { module = "io.ktor:ktor-server-auth-jwt", version.ref = "ktor" }
 ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor" }
 ktor-server-core = { module = "io.ktor:ktor-server-core", version.ref = "ktor" }
 ktor-server-cors = { module = "io.ktor:ktor-server-cors", version.ref = "ktor" }
 ktor-server-defaultheaders = { module = "io.ktor:ktor-server-default-headers", version.ref = "ktor" }
+ktor-server-html = { module = "io.ktor:ktor-server-html-builder", version.ref = "ktor" }
 ktor-server-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor" }
-ktor-server-tests = { module = "io.ktor:ktor-server-test-host", version.ref = "ktor" }
-ktor-server-auth = { module = "io.ktor:ktor-server-auth", version.ref = "ktor" }
-ktor-server-auth-jwt = { module = "io.ktor:ktor-server-auth-jwt", version.ref = "ktor" }
 ktor-server-resources = { module = "io.ktor:ktor-server-resources", version.ref = "ktor" }
-ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
-ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
-ktor-client-serialization = { module = "io.ktor:ktor-client-serialization", version.ref = "ktor" }
-ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
-ktor-client-resources = { module = "io.ktor:ktor-client-resources", version.ref = "ktor" }
-ktor-serialization = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
-ktor-server-html = { module = "io.ktor:ktor-server-html-builder", version.ref = "ktor" }
+ktor-server-tests = { module = "io.ktor:ktor-server-test-host", version.ref = "ktor" }
 logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
-kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-detekt-gradle = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
+postgresql = { module = "org.postgresql:postgresql", version.ref = "postgresql" }
+slugify = { module = "com.github.slugify:slugify", version.ref = "slugify" }
+sqldelight-jdbc = { module = "app.cash.sqldelight:jdbc-driver", version.ref = "sqldelight" }
+sqldelight-postgresql = { module = "app.cash.sqldelight:postgresql-dialect", version.ref = "sqldelight" }
+suspendapp = { module = "io.arrow-kt:suspendapp", version.ref = "suspendapp" }
+suspendapp-ktor = { module = "io.arrow-kt:suspendapp-ktor", version.ref = "suspendapp" }
 testcontainers-postgresql = { module = "org.testcontainers:postgresql", version.ref = "testcontainers" }
-hikari = { module = "com.zaxxer:HikariCP", version.ref="hikari" }
-sqldelight-jdbc = { module = "app.cash.sqldelight:jdbc-driver", version.ref="sqldelight" }
-sqldelight-postgresql = { module = "app.cash.sqldelight:postgresql-dialect", version.ref="sqldelight" }
-postgresql = { module="org.postgresql:postgresql", version.ref="postgresql" }
-kjwt-core = { module="io.github.nefilim.kjwt:kjwt-core", version.ref="kjwt" }
-slugify = { module="com.github.slugify:slugify", version.ref="slugify" }
-cohort-ktor = { module="com.sksamuel.cohort:cohort-ktor", version.ref="cohort" }
-cohort-hikari = { module="com.sksamuel.cohort:cohort-hikari", version.ref="cohort" }
 
 [bundles]
-arrow = ["arrow-core", "arrow-fx"]
-suspendapp = ["suspendapp", "suspendapp-ktor"]
-ktor-server = [
-    "ktor-server-core",
-    "ktor-server-cors",
-    "ktor-server-content-negotiation",
-    "ktor-server-defaultheaders",
-    "ktor-server-netty",
-    "ktor-server-auth",
-    "ktor-serialization",
-    "ktor-server-resources"
+arrow = [
+    "arrow-core",
+    "arrow-fx",
 ]
-ktor-client = [
-    "ktor-client-content-negotiation",
-    "ktor-client-serialization",
-    "ktor-client-resources"
+cohort = [
+    "cohort-hikari",
+    "cohort-ktor",
 ]
 kotest = [
+    "kotest-arrow",
+    "kotest-arrow-fx",
     "kotest-assertionsCore",
     "kotest-frameworkEngine",
     "kotest-property",
     "kotest-runnerJUnit5",
-    "kotest-arrow",
-    "kotest-arrow-fx",
-    "kotest-testcontainers"
+    "kotest-testcontainers",
 ]
-cohort = [
-    "cohort-ktor",
-    "cohort-hikari"
+ktor-client = [
+    "ktor-client-content-negotiation",
+    "ktor-client-resources",
+    "ktor-client-serialization",
+]
+ktor-server = [
+    "ktor-serialization",
+    "ktor-server-auth",
+    "ktor-server-content-negotiation",
+    "ktor-server-core",
+    "ktor-server-cors",
+    "ktor-server-defaultheaders",
+    "ktor-server-netty",
+    "ktor-server-resources",
+]
+suspendapp = [
+    "suspendapp",
+    "suspendapp-ktor",
 ]
 
 [plugins]
-kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
+detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 kotest-multiplatform = { id = "io.kotest.multiplatform", version.ref = "kotest" }
+kotlin-assert = { id = "org.jetbrains.kotlin.plugin.power-assert", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-kotlin-assert = { id = "org.jetbrains.kotlin.plugin.power-assert",  version.ref = "kotlin" }
-detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
+kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
 ktor = { id = "io.ktor.plugin", version.ref = "ktor" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
+sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
+version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog-update" }

buildSrc/settings.gradle.kts

@@ -1,24 +1,7 @@
 rootProject.name = "ktor-arrow-sample"
 
-plugins {
-  id("com.gradle.enterprise") version "3.15.1"
-}
-
 dependencyResolutionManagement {
-  versionCatalogs {
-    create("libs") {
-      from(files("libs.versions.toml"))
-    }
-  }
-
   repositories {
     mavenCentral()
   }
 }
-
-gradleEnterprise {
-  buildScan {
-    termsOfServiceUrl = "https://gradle.com/terms-of-service"
-    termsOfServiceAgree = "yes"
-  }
-}

buildSrc/src/main/kotlin/io/github/nomisrev/Detekt.kt

@@ -18,7 +18,7 @@ data class JwtContext(val token: JwtToken, val userId: UserId)
 // Small middleware to validate JWT token without using Ktor Auth / Nullable principle
 suspend inline fun RoutingContext.jwtAuth(
   jwtService: JwtService,
-  crossinline body: suspend RoutingContext.(JwtContext) -> Unit
+  crossinline body: suspend RoutingContext.(JwtContext) -> Unit,
 ) {
   optionalJwtAuth(jwtService) { context ->
     context?.let { body(this, it) } ?: call.respond(HttpStatusCode.Unauthorized)
@@ -27,14 +27,14 @@ suspend inline fun RoutingContext.jwtAuth(
 
 suspend inline fun RoutingContext.optionalJwtAuth(
   jwtService: JwtService,
-  crossinline body: suspend RoutingContext.(JwtContext?) -> Unit
+  crossinline body: suspend RoutingContext.(JwtContext?) -> Unit,
 ) {
   jwtToken()?.let { token ->
     jwtService
       .verifyJwtToken(JwtToken(token))
       .fold(
         { error -> call.respond(error) },
-        { userId -> body(this, JwtContext(JwtToken(token), userId)) }
+        { userId -> body(this, JwtContext(JwtToken(token), userId)) },
       )
   } ?: body(this, null)
 }

buildSrc/src/main/kotlin/predef.kt

@@ -24,7 +24,7 @@ class Dependencies(
   val articleService: ArticleService,
   val healthCheck: HealthCheckRegistry,
   val tagPersistence: TagPersistence,
-  val userPersistence: UserPersistence
+  val userPersistence: UserPersistence,
 )
 
 suspend fun ResourceScope.dependencies(env: Env): Dependencies {

libs.versions.toml gradle/libs.versions.tomllibs.versions.toml renamed to gradle/libs.versions.toml

@@ -33,6 +33,6 @@ data class Env(
   data class Auth(
     val secret: String = getenv("JWT_SECRET") ?: AUTH_SECRET,
     val issuer: String = getenv("JWT_ISSUER") ?: AUTH_ISSUER,
-    val duration: Duration = (getenv("JWT_DURATION")?.toIntOrNull() ?: AUTH_DURATION).days
+    val duration: Duration = (getenv("JWT_DURATION")?.toIntOrNull() ?: AUTH_DURATION).days,
   )
 }