From 9584df0e76af769c50c29d54301d3fc63e0a72d9 Mon Sep 17 00:00:00 2001 From: Alan Brault Date: Fri, 5 Jun 2026 07:03:40 -0400 Subject: [PATCH] chore(deps): update dependencies Signed-off-by: Alan Brault --- build.gradle.kts | 20 +++++++++++-------- .../demos/kotlinapi/config/MongoConfig.kt | 4 ++-- .../health/MongoHealthService.kt | 9 +++------ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a3f3d5a..d2899f1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,10 @@ plugins { - kotlin("jvm") version "2.2.21" - kotlin("plugin.spring") version "2.2.21" - id("org.springframework.boot") version "4.1.0-M2" + kotlin("jvm") version "2.4.0" + kotlin("plugin.spring") version "2.4.0" + id("org.springframework.boot") version "4.1.0-RC1" id("io.spring.dependency-management") version "1.1.7" id("org.jlleitschuh.gradle.ktlint") version "14.2.0" - id("tech.mappie.plugin") version "2.2.21-2.1.1" + id("tech.mappie.plugin") version "2.4.0-2.4.1" id("com.github.ben-manes.versions") version "0.54.0" } @@ -56,7 +56,7 @@ dependencies { // Third-party libs still use Jackson 2.x (see resolutionStrategy below) implementation("tools.jackson.core:jackson-core:3.1.0") implementation("tools.jackson.core:jackson-databind:3.1.0") - implementation("tools.jackson.module:jackson-module-kotlin:3.1.3") + implementation("tools.jackson.module:jackson-module-kotlin:3.1.4") // ════════════════════════════════════════════════════════════════════════════════ // Data Persistence (MongoDB) @@ -87,7 +87,7 @@ dependencies { // ════════════════════════════════════════════════════════════════════════════════ // Mapping & Utilities // ════════════════════════════════════════════════════════════════════════════════ - implementation("tech.mappie:mappie-api:2.2.21-2.1.1") + implementation("tech.mappie:mappie-api:2.4.0-2.4.1") // ════════════════════════════════════════════════════════════════════════════════ // UUID Generation @@ -110,7 +110,7 @@ dependencies { testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.11.0") // Kotlin-native mocking (more idiomatic than Mockito for Kotlin) - testImplementation("io.mockk:mockk:1.14.9") + testImplementation("io.mockk:mockk:1.14.11") testImplementation("com.ninja-squad:springmockk:5.0.1") testRuntimeOnly("org.junit.platform:junit-platform-launcher") @@ -138,12 +138,16 @@ configurations.all { useVersion("2.21.1") // Core Jackson 2.x libraries } } + // Force kotlinx-coroutines to 1.11.0 to prevent version conflicts + if (requested.group == "org.jetbrains.kotlinx" && requested.name.startsWith("kotlinx-coroutines")) { + useVersion("1.11.0") + } } } kotlin { compilerOptions { - freeCompilerArgs.addAll("-Xjsr305=strict", "-Xannotation-default-target=param-property") + freeCompilerArgs.addAll("-Xjsr305=strict") } } diff --git a/src/main/kotlin/io/visus/demos/kotlinapi/config/MongoConfig.kt b/src/main/kotlin/io/visus/demos/kotlinapi/config/MongoConfig.kt index c2b88d0..67eb0a1 100644 --- a/src/main/kotlin/io/visus/demos/kotlinapi/config/MongoConfig.kt +++ b/src/main/kotlin/io/visus/demos/kotlinapi/config/MongoConfig.kt @@ -2,8 +2,8 @@ package io.visus.demos.kotlinapi.config import com.mongodb.ConnectionString import com.mongodb.MongoClientSettings -import com.mongodb.client.MongoClient -import com.mongodb.client.MongoClients +import com.mongodb.reactivestreams.client.MongoClient +import com.mongodb.reactivestreams.client.MongoClients import io.visus.demos.kotlinapi.converters.BinaryToUuidConverter import io.visus.demos.kotlinapi.converters.UuidToBinaryConverter import org.springframework.beans.factory.annotation.Value diff --git a/src/main/kotlin/io/visus/demos/kotlinapi/infrastructure/health/MongoHealthService.kt b/src/main/kotlin/io/visus/demos/kotlinapi/infrastructure/health/MongoHealthService.kt index fa0faf5..616878b 100644 --- a/src/main/kotlin/io/visus/demos/kotlinapi/infrastructure/health/MongoHealthService.kt +++ b/src/main/kotlin/io/visus/demos/kotlinapi/infrastructure/health/MongoHealthService.kt @@ -1,11 +1,10 @@ package io.visus.demos.kotlinapi.infrastructure.health -import com.mongodb.client.MongoClient +import com.mongodb.reactivestreams.client.MongoClient import io.visus.demos.kotlinapi.domain.HealthIndicator import io.visus.demos.kotlinapi.domain.model.ComponentHealth import io.visus.demos.kotlinapi.domain.model.ComponentStatus -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext +import kotlinx.coroutines.reactive.awaitFirstOrNull import org.bson.Document import org.springframework.stereotype.Service @@ -17,9 +16,7 @@ class MongoHealthService( try { val command = Document("ping", 1) - withContext(Dispatchers.IO) { - mongoClient.getDatabase("admin").runCommand(command) - } + mongoClient.getDatabase("admin").runCommand(command).awaitFirstOrNull() ComponentHealth( name = "mongodb",