From 29a19df7fcbe89f09f307fc58c68469a73d2011e Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 15 Feb 2024 20:30:10 +0600 Subject: [PATCH] update dependencies and version --- CHANGELOG.md | 4 ++++ build.gradle | 2 +- gradle.properties | 2 +- gradle/libs.versions.toml | 14 +++++++------- posts/panel/src/jvmMain/kotlin/Plugin.kt | 3 ++- posts/src/jvmMain/kotlin/Plugin.kt | 2 +- ratings/source/src/jvmMain/kotlin/Plugin.kt | 3 ++- .../timer/src/commonMain/kotlin/TimersHandler.kt | 1 + 8 files changed, 19 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 355c44d..399b4de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # PlaguPoster +## 0.5.3 + +* Dependencies update + ## 0.5.2 * Dependencies update diff --git a/build.gradle b/build.gradle index 2326bde..2540c45 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ allprojects { mavenLocal() mavenCentral() google() - maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" } + maven { url "https://nexus.inmo.dev/repository/maven-releases/" } } } diff --git a/gradle.properties b/gradle.properties index a1165e3..cd60e51 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,4 +10,4 @@ android.enableJetifier=true # Project data group=dev.inmo -version=0.5.2 +version=0.5.3 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 56da3b9..dd48679 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] -kotlin = "1.9.21" +kotlin = "1.9.22" kotlin-serialization = "1.6.2" -plagubot = "7.4.1" -tgbotapi = "9.4.2" -microutils = "0.20.19" -kslog = "1.3.1" -krontab = "2.2.4" -plagubot-plugins = "0.17.1" +plagubot = "8.1.1" +tgbotapi = "10.0.1" +microutils = "0.20.34" +kslog = "1.3.2" +krontab = "2.2.7" +plagubot-plugins = "0.18.1" dokka = "1.9.10" diff --git a/posts/panel/src/jvmMain/kotlin/Plugin.kt b/posts/panel/src/jvmMain/kotlin/Plugin.kt index 12df7ac..d886118 100644 --- a/posts/panel/src/jvmMain/kotlin/Plugin.kt +++ b/posts/panel/src/jvmMain/kotlin/Plugin.kt @@ -31,6 +31,7 @@ import dev.inmo.tgbotapi.extensions.utils.types.buttons.dataButton import dev.inmo.tgbotapi.extensions.utils.types.buttons.flatInlineKeyboard import dev.inmo.tgbotapi.types.IdChatIdentifier import dev.inmo.tgbotapi.types.MessageIdentifier +import dev.inmo.tgbotapi.types.ReplyParameters import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.CallbackDataInlineKeyboardButton import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import dev.inmo.tgbotapi.types.message.ParseMode @@ -112,7 +113,7 @@ object Plugin : Plugin { firstContent.chatId, text = config.text, parseMode = config.parseMode, - replyToMessageId = firstContent.messageId, + replyParameters = ReplyParameters(firstContent.chatId, firstContent.messageId), replyMarkup = InlineKeyboardMarkup(buttons), disableNotification = true ).also { sentMessage -> diff --git a/posts/src/jvmMain/kotlin/Plugin.kt b/posts/src/jvmMain/kotlin/Plugin.kt index 61eb501..e7f7a60 100644 --- a/posts/src/jvmMain/kotlin/Plugin.kt +++ b/posts/src/jvmMain/kotlin/Plugin.kt @@ -58,7 +58,7 @@ object Plugin : Plugin { } single { val config = get() - PostPublisher(get(), get(), config.chats.cacheChatId, config.chats.allTargetChatIds, config.deleteAfterPublishing) + PostPublisher(get(), get(), config.chats.cacheChatId, config.chats.allTargetChatIds.toList(), config.deleteAfterPublishing) } } diff --git a/ratings/source/src/jvmMain/kotlin/Plugin.kt b/ratings/source/src/jvmMain/kotlin/Plugin.kt index 819fd46..c855b64 100644 --- a/ratings/source/src/jvmMain/kotlin/Plugin.kt +++ b/ratings/source/src/jvmMain/kotlin/Plugin.kt @@ -37,6 +37,7 @@ import dev.inmo.tgbotapi.extensions.utils.extensions.sameMessage import dev.inmo.tgbotapi.extensions.utils.types.buttons.dataButton import dev.inmo.tgbotapi.extensions.utils.types.buttons.flatInlineKeyboard import dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard +import dev.inmo.tgbotapi.types.ReplyParameters import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.CallbackDataInlineKeyboardButton import dev.inmo.tgbotapi.types.message.textsources.bold import dev.inmo.tgbotapi.types.message.textsources.regular @@ -129,7 +130,7 @@ object Plugin : Plugin { content.chatId, config.ratingOfferText, config.variants.keys.toList(), - replyToMessageId = content.messageId + replyParameters = ReplyParameters(content.chatId, content.messageId) ) pollsToPostsIdsRepo.set(sent.content.poll.id, postId) pollsToMessageInfoRepo.set(sent.content.poll.id, sent.short()) diff --git a/triggers/timer/src/commonMain/kotlin/TimersHandler.kt b/triggers/timer/src/commonMain/kotlin/TimersHandler.kt index ce26046..44a704a 100644 --- a/triggers/timer/src/commonMain/kotlin/TimersHandler.kt +++ b/triggers/timer/src/commonMain/kotlin/TimersHandler.kt @@ -7,6 +7,7 @@ import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions import dev.inmo.micro_utils.repos.unset import dev.inmo.plaguposter.posts.models.PostId import dev.inmo.plaguposter.posts.sending.PostPublisher +import korlibs.time.millisecondsLong import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.delay