From 47efedf3117d9efa05037f3221f76e82c571f2e1 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 15 Jul 2025 13:35:35 +0600 Subject: [PATCH 1/2] start migration onto 27.0.0 --- gradle.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9cc4c87..93d80cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,9 +5,9 @@ org.gradle.jvmargs=-Xmx3148m kotlin.daemon.jvmargs=-Xmx3g -Xms500m -kotlin_version=2.1.20 -telegram_bot_api_version=26.1.0 -micro_utils_version=0.25.7 -serialization_version=1.8.1 -ktor_version=3.1.3 +kotlin_version=2.2.0 +telegram_bot_api_version=27.0.0-branch_27.0.0-build2869 +micro_utils_version=0.26.0 +serialization_version=1.8.2 +ktor_version=3.2.1 compose_version=1.8.0 From e6e3eabf97502a52c127cd4d36f1920a5f7b5ed5 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 22 Jul 2025 19:52:24 +0600 Subject: [PATCH 2/2] update dependencies --- .../src/commonMain/kotlin/ResenderBot.kt | 10 +++++++++- gradle.properties | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ResenderBot/ResenderBotLib/src/commonMain/kotlin/ResenderBot.kt b/ResenderBot/ResenderBotLib/src/commonMain/kotlin/ResenderBot.kt index 094ff67..e5ebe67 100644 --- a/ResenderBot/ResenderBotLib/src/commonMain/kotlin/ResenderBot.kt +++ b/ResenderBot/ResenderBotLib/src/commonMain/kotlin/ResenderBot.kt @@ -1,3 +1,6 @@ +import dev.inmo.kslog.common.KSLog +import dev.inmo.kslog.common.defaultMessageFormatter +import dev.inmo.kslog.common.filter.filtered import dev.inmo.micro_utils.coroutines.subscribeLoggingDropExceptions import dev.inmo.tgbotapi.extensions.api.bot.getMe import dev.inmo.tgbotapi.extensions.api.send.withTypingAction @@ -10,7 +13,9 @@ import dev.inmo.tgbotapi.extensions.utils.withContentOrNull import dev.inmo.tgbotapi.types.ReplyParameters import dev.inmo.tgbotapi.types.message.abstracts.BusinessContentMessage import dev.inmo.tgbotapi.types.message.content.TextContent +import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog import dev.inmo.tgbotapi.utils.extensions.threadIdOrNull +import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.currentCoroutineContext @@ -19,7 +24,10 @@ suspend fun activateResenderBot( token: String, print: (Any) -> Unit ) { - telegramBotWithBehaviourAndLongPolling(token, scope = CoroutineScope(currentCoroutineContext() + SupervisorJob())) { + telegramBotWithBehaviourAndLongPolling( + token, + scope = CoroutineScope(currentCoroutineContext() + SupervisorJob()), + ) { onContentMessage( subcontextUpdatesFilter = MessageFilterByChat, initialFilter = { it !is BusinessContentMessage<*> || !it.sentByBusinessConnectionOwner } diff --git a/gradle.properties b/gradle.properties index 93d80cc..adaf888 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,8 +6,8 @@ kotlin.daemon.jvmargs=-Xmx3g -Xms500m kotlin_version=2.2.0 -telegram_bot_api_version=27.0.0-branch_27.0.0-build2869 -micro_utils_version=0.26.0 -serialization_version=1.8.2 -ktor_version=3.2.1 +telegram_bot_api_version=27.0.0 +micro_utils_version=0.26.1 +serialization_version=1.9.0 +ktor_version=3.2.2 compose_version=1.8.0