diff --git a/cache/admins/micro_utils/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/micro_utils/DefaultAdminsCacheAPI.kt b/cache/admins/micro_utils/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/micro_utils/DefaultAdminsCacheAPI.kt index b7d2dfb..d28f7d8 100644 --- a/cache/admins/micro_utils/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/micro_utils/DefaultAdminsCacheAPI.kt +++ b/cache/admins/micro_utils/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/micro_utils/DefaultAdminsCacheAPI.kt @@ -34,7 +34,7 @@ class DefaultAdminsCacheAPIRepoImpl( private val scope: CoroutineScope ) : DefaultAdminsCacheAPIRepo { private val actor = scope.actorAsync>(Channel.UNLIMITED) { - safelyWithoutExceptions( + runCatchingLogging ( { e -> it.deferred.completeExceptionally(e) } diff --git a/cache/admins/micro_utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsCacheAPI.kt b/cache/admins/micro_utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsCacheAPI.kt index 9650bc2..70ceaa8 100644 --- a/cache/admins/micro_utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsCacheAPI.kt +++ b/cache/admins/micro_utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsCacheAPI.kt @@ -14,7 +14,7 @@ import kotlinx.serialization.* import kotlinx.serialization.json.Json import kotlinx.serialization.modules.SerializersModule import kotlinx.serialization.modules.polymorphic -import org.jetbrains.exposed.sql.Database +import org.jetbrains.exposed.v1.jdbc.Database val telegramAdminsSerializationFormat = Json { ignoreUnknownKeys = true diff --git a/cache/admins/plagubot/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsPlugin.kt b/cache/admins/plagubot/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsPlugin.kt index 517d0af..77dd5ec 100644 --- a/cache/admins/plagubot/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsPlugin.kt +++ b/cache/admins/plagubot/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsPlugin.kt @@ -16,7 +16,7 @@ import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import kotlinx.serialization.* import kotlinx.serialization.json.JsonObject -import org.jetbrains.exposed.sql.Database +import org.jetbrains.exposed.v1.jdbc.Database import org.koin.core.Koin import org.koin.core.module.Module import org.koin.core.qualifier.named diff --git a/cache/content/micro_utils/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/media/micro_utils/SimpleKeyValueMessageContentCache.kt b/cache/content/micro_utils/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/media/micro_utils/SimpleKeyValueMessageContentCache.kt index 9a27443..18a0f17 100644 --- a/cache/content/micro_utils/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/media/micro_utils/SimpleKeyValueMessageContentCache.kt +++ b/cache/content/micro_utils/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/media/micro_utils/SimpleKeyValueMessageContentCache.kt @@ -1,3 +1,5 @@ +@file:Suppress("RemoveExplicitTypeArguments", "unused") + package dev.inmo.tgbotapi.libraries.cache.media.micro_utils import dev.inmo.micro_utils.repos.* @@ -8,7 +10,6 @@ import dev.inmo.tgbotapi.types.MessageId import dev.inmo.tgbotapi.types.message.content.MessageContent import kotlinx.serialization.* import kotlinx.serialization.builtins.PairSerializer -import kotlinx.serialization.builtins.serializer import kotlinx.serialization.json.Json import kotlinx.serialization.modules.SerializersModule import kotlin.js.JsName @@ -52,11 +53,12 @@ val chatIdToMessageIdentifierSerializer = PairSerializer( val messageContentSerializer = PolymorphicSerializer(MessageContent::class) -inline fun KeyValueRepo.asMessageContentCache() = SimpleKeyValueMessageContentCache(this) +fun KeyValueRepo.asMessageContentCache() = SimpleKeyValueMessageContentCache(this) inline fun KeyValueRepo.asMessageContentCache( serialFormatCreator: (SerializersModule) -> StringFormat = { Json { serializersModule = it } } ): StandardKeyValueRepo, MessageContent> { + @Suppress("OPT_IN_USAGE") val serialFormat = serialFormatCreator(MessageContent.serializationModule()) return withMapper, MessageContent, String, String>( { serialFormat.encodeToString(chatIdToMessageIdentifierSerializer, this) }, @@ -71,6 +73,7 @@ inline fun KeyValueRepo.asMessageContentCache( inline fun KeyValueRepo.asMessageContentCache( serialFormatCreator: (SerializersModule) -> BinaryFormat ): StandardKeyValueRepo, MessageContent> { + @Suppress("OPT_IN_USAGE") val serialFormat = serialFormatCreator(MessageContent.serializationModule()) return withMapper, MessageContent, String, String>( { serialFormat.encodeToHexString(chatIdToMessageIdentifierSerializer, this) }, @@ -85,6 +88,7 @@ inline fun KeyValueRepo.asMessageContentCache( inline fun KeyValueRepo.asMessageContentCache( serialFormatCreator: (SerializersModule) -> BinaryFormat ): StandardKeyValueRepo, MessageContent> { + @Suppress("OPT_IN_USAGE") val serialFormat = serialFormatCreator(MessageContent.serializationModule()) return withMapper, MessageContent, ByteArray, ByteArray>( { serialFormat.encodeToByteArray(chatIdToMessageIdentifierSerializer, this) }, diff --git a/gradle.properties b/gradle.properties index 3da9b53..682d2a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,17 +6,17 @@ kotlin.incremental=true kotlin.incremental.js=true -kotlin_version=2.2.21 -kotlin_serialisation_core_version=1.9.0 +kotlin_version=2.3.10 +kotlin_serialisation_core_version=1.10.0 github_release_plugin_version=2.5.2 -tgbotapi_version=30.0.2 -micro_utils_version=0.26.8 -exposed_version=0.61.0 -plagubot_version=10.10.0 +tgbotapi_version=32.0.0 +micro_utils_version=0.29.1 +exposed_version=1.1.1 +plagubot_version=11.0.0 -nmcp_version=1.3.0 +nmcp_version=1.4.4 # Dokka @@ -25,4 +25,4 @@ dokka_version=2.1.0 # Project data group=dev.inmo -version=0.28.0 +version=0.29.0