From d842dab5b86cf51cdc5bad60001a9b4bfeb38b9a Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 25 Nov 2023 12:44:05 +0600 Subject: [PATCH 1/3] update dependencies --- GetMeBot/src/main/kotlin/GetMeBot.kt | 9 +++++++++ gradle.properties | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/GetMeBot/src/main/kotlin/GetMeBot.kt b/GetMeBot/src/main/kotlin/GetMeBot.kt index aa883dd..d13b0f9 100644 --- a/GetMeBot/src/main/kotlin/GetMeBot.kt +++ b/GetMeBot/src/main/kotlin/GetMeBot.kt @@ -1,5 +1,10 @@ +import dev.inmo.kslog.common.KSLog +import dev.inmo.kslog.common.LogLevel +import dev.inmo.kslog.common.defaultMessageFormatter +import dev.inmo.kslog.common.filter.filtered import dev.inmo.tgbotapi.bot.ktor.telegramBot import dev.inmo.tgbotapi.extensions.api.bot.getMe +import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog /** * This is one of the most easiest bot - it will just print information about itself @@ -7,6 +12,10 @@ import dev.inmo.tgbotapi.extensions.api.bot.getMe suspend fun main(vararg args: String) { val botToken = args.first() + KSLog.default = KSLog { level: LogLevel, tag: String?, message: Any, throwable: Throwable? -> + println(defaultMessageFormatter(level, tag, message, throwable)) + } + val bot = telegramBot(botToken) println(bot.getMe()) diff --git a/gradle.properties b/gradle.properties index bf3c103..19ba8de 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx2g kotlin_version=1.9.20 -telegram_bot_api_version=9.3.0 -micro_utils_version=0.20.12 -serialization_version=1.6.0 -ktor_version=2.3.5 +telegram_bot_api_version=9.4.0-branch_9.4.0-build1937 +micro_utils_version=0.20.14 +serialization_version=1.6.1 +ktor_version=2.3.6 From e1553736557aafbbf897eb2fef02dd0d69193678 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 25 Nov 2023 12:57:11 +0600 Subject: [PATCH 2/3] small improvement in GetMe --- GetMeBot/src/main/kotlin/GetMeBot.kt | 10 ++++++---- gradle.properties | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/GetMeBot/src/main/kotlin/GetMeBot.kt b/GetMeBot/src/main/kotlin/GetMeBot.kt index d13b0f9..c5917cd 100644 --- a/GetMeBot/src/main/kotlin/GetMeBot.kt +++ b/GetMeBot/src/main/kotlin/GetMeBot.kt @@ -2,6 +2,7 @@ import dev.inmo.kslog.common.KSLog import dev.inmo.kslog.common.LogLevel import dev.inmo.kslog.common.defaultMessageFormatter import dev.inmo.kslog.common.filter.filtered +import dev.inmo.kslog.common.setDefaultKSLog import dev.inmo.tgbotapi.bot.ktor.telegramBot import dev.inmo.tgbotapi.extensions.api.bot.getMe import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog @@ -12,10 +13,11 @@ import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog suspend fun main(vararg args: String) { val botToken = args.first() - KSLog.default = KSLog { level: LogLevel, tag: String?, message: Any, throwable: Throwable? -> - println(defaultMessageFormatter(level, tag, message, throwable)) - } - + setDefaultKSLog( + KSLog { level: LogLevel, tag: String?, message: Any, throwable: Throwable? -> + println(defaultMessageFormatter(level, tag, message, throwable)) + } + ) val bot = telegramBot(botToken) println(bot.getMe()) diff --git a/gradle.properties b/gradle.properties index 19ba8de..ee2091e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.parallel=true org.gradle.jvmargs=-Xmx2g -kotlin_version=1.9.20 -telegram_bot_api_version=9.4.0-branch_9.4.0-build1937 -micro_utils_version=0.20.14 +kotlin_version=1.9.21 +telegram_bot_api_version=9.4.0-branch_9.4.0-build1940 +micro_utils_version=0.20.15 serialization_version=1.6.1 ktor_version=2.3.6 From 2ac23f70ab7a932bdcfc6ca3a15188133d0d0f92 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 26 Nov 2023 15:28:56 +0600 Subject: [PATCH 3/3] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ee2091e..c42ceea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx2g kotlin_version=1.9.21 -telegram_bot_api_version=9.4.0-branch_9.4.0-build1940 +telegram_bot_api_version=9.4.1 micro_utils_version=0.20.15 serialization_version=1.6.1 ktor_version=2.3.6