Update all major versions (#209)

* kotlin-assert
* Bump all versions
* Upload sarif if available

Author: nomisRev

.github/workflows/main.yml

@@ -34,7 +34,7 @@ jobs:
           path: '**/build/reports/**'
 
       - name: Upload Code Scanning code analysis report
-        if: always()
+        if: ${{ hashFiles('build/reports/detekt/main.sarif') != '' }}
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: 'build/reports/detekt/main.sarif'

build.gradle.kts

@@ -4,14 +4,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
   application
   alias(libs.plugins.kotest.multiplatform)
   id(libs.plugins.kotlin.jvm.pluginId)
-  alias(libs.plugins.dokka)
-  id(libs.plugins.detekt.pluginId)
   alias(libs.plugins.kover)
   alias(libs.plugins.kotlinx.serialization)
   alias(libs.plugins.sqldelight)
   alias(libs.plugins.ktor)
   alias(libs.plugins.spotless)
-  alias(libs.plugins.power.assert)
+  alias(libs.plugins.kotlin.assert)
 }
 
 application {
@@ -27,20 +25,13 @@ sqldelight {
   }
 }
 
-allprojects {
-  extra.set("dokka.outputDirectory", rootDir.resolve("docs"))
-  setupDetekt()
-}
-
 repositories {
   mavenCentral()
 }
 
 tasks {
   withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-      freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers"
-    }
+    kotlin.compilerOptions.freeCompilerArgs.add("-Xcontext-receivers")
   }
 
   test {

config/detekt/detekt.yml

@@ -15,11 +15,11 @@ processors:
 console-reports:
   active: true
   exclude:
-     - 'ProjectStatisticsReport'
-     - 'ComplexityReport'
-     - 'NotificationReport'
-     - 'FindingsReport'
-     - 'FileBasedFindingsReport'
+    - 'ProjectStatisticsReport'
+    - 'ComplexityReport'
+    - 'NotificationReport'
+    - 'FindingsReport'
+    - 'FileBasedFindingsReport'
   #  - 'LiteFindingsReport'
 
 output-reports:
@@ -687,4 +687,4 @@ style:
     active: true
     excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
     excludeImports:
-      - 'java.util.*'
+      - 'java.util.*'

docker-compose.yaml

@@ -4,7 +4,7 @@ services:
     image: postgres:latest
     restart: always
     ports:
-      - 5432:5432
+      - "5432:5432"
     container_name: ktor-arrow-example-database
     environment:
       - POSTGRES_USER=postgres

gradle.properties

@@ -4,3 +4,4 @@ projects.group = "io.github.nomisrev"
 projects.version = "0.0.1"
 
 org.gradle.jvmargs="-XX:MaxMetaspaceSize=512m"
+io.ktor.development=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

libs.versions.toml

@@ -1,27 +1,23 @@
 [versions]
-arrow = "1.2.1"
-arrowGradleConfig = "0.11.0"
+arrow = "2.0.1"
 coroutines = "1.7.3"
-dokka = "1.9.10"
-kotlin = "1.9.20"
-kotest = "5.8.0"
-kotest-plugin = "5.8.0"
-kover = "0.7.4"
-detekt = "1.23.3"
-ktor = "2.3.6"
-logback = "1.4.11"
-sqldelight="2.0.0"
-testcontainers="1.19.3"
-hikari="5.1.0"
-postgresql="42.7.0"
-kjwt="0.9.0"
-kotest-arrow="1.4.0"
+kotlin = "2.1.10"
+kotest = "5.9.1"
+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.6"
+slugify="3.0.7"
 suspendapp="0.4.0"
-cohort="2.3.0"
-spotless="6.22.0"
-power-assert = "0.13.0"
+cohort="2.6.1"
+spotless="7.0.2"
 
 [libraries]
 arrow-core = { module = "io.arrow-kt:arrow-core", version.ref = "arrow" }
@@ -31,7 +27,6 @@ suspendapp = { module = "io.arrow-kt:suspendapp", version.ref = "suspendapp" }
 suspendapp-ktor = { module = "io.arrow-kt:suspendapp-ktor", version.ref = "suspendapp" }
 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" }
-dokka-core = { module = "org.jetbrains.dokka:dokka-core", version.ref = "dokka" }
 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" }
@@ -44,7 +39,7 @@ 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-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor" }
-ktor-server-tests = { module = "io.ktor:ktor-server-tests", 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" }
@@ -65,7 +60,7 @@ sqldelight-postgresql = { module = "app.cash.sqldelight:postgresql-dialect", ver
 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-core = { module="com.sksamuel.cohort:cohort-core", version.ref="cohort" }
+cohort-ktor = { module="com.sksamuel.cohort:cohort-ktor", version.ref="cohort" }
 cohort-hikari = { module="com.sksamuel.cohort:cohort-hikari", version.ref="cohort" }
 
 [bundles]
@@ -96,20 +91,17 @@ kotest = [
     "kotest-testcontainers"
 ]
 cohort = [
-    "cohort-core",
+    "cohort-ktor",
     "cohort-hikari"
 ]
 
 [plugins]
-arrowGradleConfig-formatter = { id = "io.arrow-kt.arrow-gradle-config-formatter", version.ref = "arrowGradleConfig" }
-arrowGradleConfig-kotlin = { id = "io.arrow-kt.arrow-gradle-config-kotlin", version.ref = "arrowGradleConfig" }
-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
-kotest-multiplatform = { id = "io.kotest.multiplatform", version.ref = "kotest-plugin" }
+kotest-multiplatform = { id = "io.kotest.multiplatform", version.ref = "kotest" }
 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" }
 ktor = { id = "io.ktor.plugin", version.ref = "ktor" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
-power-assert = { id = "com.bnorm.power.kotlin-power-assert",  version.ref = "power-assert" }

src/main/kotlin/io/github/nomisrev/DomainError.kt

@@ -28,7 +28,7 @@ data class EmailAlreadyExists(val email: String) : UserError
 
 data class UsernameAlreadyExists(val username: String) : UserError
 
-object PasswordNotMatched : UserError
+data object PasswordNotMatched : UserError
 
 sealed interface JwtError : DomainError
 

src/main/kotlin/io/github/nomisrev/auth/jwt.kt

@@ -4,45 +4,42 @@ package io.github.nomisrev.auth
 
 import arrow.core.Either
 import io.github.nomisrev.repo.UserId
-import io.github.nomisrev.routes.respond
 import io.github.nomisrev.service.JwtService
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.auth.HttpAuthHeader
-import io.ktor.server.application.ApplicationCall
-import io.ktor.server.application.call
 import io.ktor.server.auth.parseAuthorizationHeader
 import io.ktor.server.response.respond
-import io.ktor.util.pipeline.PipelineContext
+import io.ktor.server.routing.RoutingContext
 
 @JvmInline value class JwtToken(val value: String)
 
 data class JwtContext(val token: JwtToken, val userId: UserId)
 
 // Small middleware to validate JWT token without using Ktor Auth / Nullable principle
-suspend inline fun PipelineContext<Unit, ApplicationCall>.jwtAuth(
+suspend inline fun RoutingContext.jwtAuth(
   jwtService: JwtService,
-  crossinline body: suspend PipelineContext<Unit, ApplicationCall>.(JwtContext) -> Unit
+  crossinline body: suspend RoutingContext.(JwtContext) -> Unit
 ) {
   optionalJwtAuth(jwtService) { context ->
     context?.let { body(this, it) } ?: call.respond(HttpStatusCode.Unauthorized)
   }
 }
 
-suspend inline fun PipelineContext<Unit, ApplicationCall>.optionalJwtAuth(
+suspend inline fun RoutingContext.optionalJwtAuth(
   jwtService: JwtService,
-  crossinline body: suspend PipelineContext<Unit, ApplicationCall>.(JwtContext?) -> Unit
+  crossinline body: suspend RoutingContext.(JwtContext?) -> Unit
 ) {
   jwtToken()?.let { token ->
     jwtService
       .verifyJwtToken(JwtToken(token))
       .fold(
-        { error -> respond(error) },
+        { error -> call.respond(error) },
         { userId -> body(this, JwtContext(JwtToken(token), userId)) }
       )
   } ?: body(this, null)
 }
 
-fun PipelineContext<Unit, ApplicationCall>.jwtToken(): String? =
+fun RoutingContext.jwtToken(): String? =
   Either.catch { (call.request.parseAuthorizationHeader() as? HttpAuthHeader.Single) }
     .getOrNull()
     ?.blob

src/main/kotlin/io/github/nomisrev/env/Dependencies.kt

@@ -1,6 +1,6 @@
 package io.github.nomisrev.env
 
-import arrow.fx.coroutines.continuations.ResourceScope
+import arrow.fx.coroutines.ResourceScope
 import com.sksamuel.cohort.HealthCheckRegistry
 import com.sksamuel.cohort.hikari.HikariConnectionsHealthCheck
 import io.github.nomisrev.repo.TagPersistence
@@ -16,7 +16,6 @@ import io.github.nomisrev.service.articleService
 import io.github.nomisrev.service.jwtService
 import io.github.nomisrev.service.slugifyGenerator
 import io.github.nomisrev.service.userService
-import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.Dispatchers
 
 class Dependencies(
@@ -41,9 +40,7 @@ suspend fun ResourceScope.dependencies(env: Env): Dependencies {
   val userService = userService(userRepo, jwtService)
 
   val checks =
-    HealthCheckRegistry(Dispatchers.Default) {
-      register(HikariConnectionsHealthCheck(hikari, 1), 5.seconds)
-    }
+    HealthCheckRegistry(Dispatchers.Default) { register(HikariConnectionsHealthCheck(hikari, 1)) }
 
   return Dependencies(
     userService = userService,