Upgrade dependencies

Author: madhead

core/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    api(libs.tgbotapi.core)
+    api(libs.tgbotapi)
     implementation(libs.log4j.api)
 
     testImplementation(libs.junit.jupiter.api)

currencies/build.gradle.kts

@@ -7,11 +7,11 @@ dependencies {
     implementation(platform(libs.ktor.bom))
 
     api(project.projects.core)
-    api(libs.tgbotapi.core)
-    implementation(libs.tgbotapi.extensions.api)
+    api(libs.tgbotapi)
     implementation(libs.log4j.api)
     implementation(libs.ktor.client.apache)
-    implementation(libs.ktor.client.serialization)
+    implementation(libs.ktor.client.content.negotiation)
+    implementation(libs.ktor.serialization.kotlinx.json)
 
     testImplementation(libs.junit.jupiter.api)
     testImplementation(libs.junit.jupiter.params)

currencies/src/main/kotlin/by/jprof/telegram/bot/currencies/CurrenciesUpdateProcessor.kt

@@ -5,7 +5,7 @@ import by.jprof.telegram.bot.currencies.parser.MonetaryAmountParsingPipeline
 import by.jprof.telegram.bot.currencies.rates.ExchangeRateClient
 import dev.inmo.tgbotapi.bot.RequestsExecutor
 import dev.inmo.tgbotapi.extensions.api.send.reply
-import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2ParseMode
+import dev.inmo.tgbotapi.types.message.MarkdownV2
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.TextContent
 import dev.inmo.tgbotapi.types.update.MessageUpdate
@@ -50,7 +50,7 @@ class CurrenciesUpdateProcessor(
             .joinToString("\n")
 
         if (reply.isNotEmpty()) {
-            bot.reply(to = message, text = reply, parseMode = MarkdownV2ParseMode)
+            bot.reply(to = message, text = reply, parseMode = MarkdownV2)
         }
     }
 }

currencies/src/main/kotlin/by/jprof/telegram/bot/currencies/rates/ExchangeRateClient.kt

@@ -1,25 +1,25 @@
 package by.jprof.telegram.bot.currencies.rates
 
-import by.jprof.telegram.bot.currencies.CurrenciesUpdateProcessor
 import io.ktor.client.HttpClient
+import io.ktor.client.call.body
 import io.ktor.client.engine.apache.Apache
-import io.ktor.client.features.json.JsonFeature
-import io.ktor.client.features.json.serializer.KotlinxSerializer
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.client.request.get
 import io.ktor.client.request.parameter
 import io.ktor.client.request.url
+import io.ktor.serialization.kotlinx.json.json
+import java.io.Closeable
 import kotlinx.serialization.json.Json
 import org.apache.logging.log4j.LogManager
-import java.io.Closeable
 
 class ExchangeRateClient : Closeable {
     companion object {
         private val logger = LogManager.getLogger(ExchangeRateClient::class.java)!!
     }
 
     private val client = HttpClient(Apache) {
-        install(JsonFeature) {
-            serializer = KotlinxSerializer(
+        install(ContentNegotiation) {
+            json(
                 Json {
                     ignoreUnknownKeys = true
                 }
@@ -28,12 +28,12 @@ class ExchangeRateClient : Closeable {
     }
 
     suspend fun convert(amount: Double, from: String, to: String): Conversion? = try {
-        client.get<Conversion> {
+        client.get {
             url("https://api.exchangerate.host/convert")
             parameter("amount", amount)
             parameter("from", from)
             parameter("to", to)
-        }
+        }.body()
     } catch (e: Exception) {
         logger.error("Conversion exception", e)
         null

dialogs/build.gradle.kts

@@ -4,6 +4,6 @@ plugins {
 }
 
 dependencies {
-    api(libs.tgbotapi.core)
+    api(libs.tgbotapi)
     implementation(libs.kotlinx.serialization.core)
 }

dialogs/src/main/kotlin/by/jprof/telegram/bot/dialogs/model/quizoji/WaitingForOptions.kt

@@ -1,7 +1,7 @@
 package by.jprof.telegram.bot.dialogs.model.quizoji
 
 import by.jprof.telegram.bot.dialogs.model.DialogState
-import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
+import dev.inmo.tgbotapi.types.message.content.MessageContent
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

eval/build.gradle.kts

@@ -4,10 +4,8 @@ plugins {
 
 dependencies {
     api(project.projects.core)
-    api(libs.tgbotapi.core)
+    api(libs.tgbotapi)
     implementation(project.projects.votes.tgbotapiExtensions)
-    implementation(libs.tgbotapi.extensions.api)
-    implementation(libs.tgbotapi.extensions.utils)
     implementation(libs.log4j.api)
 
     testImplementation(libs.junit.jupiter.api)

gradle/libs.versions.toml

@@ -1,34 +1,34 @@
 [versions]
 coroutines = "1.6.4"
 
-aws-lambda-java-events = "3.10.0"
+aws-lambda-java-events = "3.11.0"
 aws-lambda-java-core = "1.2.1"
-aws-lambda-java-log4j2 = "1.2.0"
-awssdk = "2.17.56"
+aws-lambda-java-log4j2 = "1.5.1"
+awssdk = "2.18.8"
 
-koin = "3.1.2"
+koin = "3.2.2"
 
-ktor = "1.6.8"
+ktor = "2.1.3"
 
-graphql-kotlin = "5.5.0"
+graphql-kotlin = "6.2.5"
 
-kotlinx-serialization = "1.3.0"
-jackson = "2.13.0"
-kaml = "0.43.0"
+kotlinx-serialization = "1.4.1"
+jackson = "2.13.4"
+kaml = "0.49.0"
 
-tgbotapi = "0.35.9"
+tgbotapi = "4.1.2"
 
-jsoup = "1.14.3"
+jsoup = "1.15.3"
 
 skija = "0.93.1"
 
-google-api-services-youtube = "v3-rev20210915-1.32.1"
+google-api-services-youtube = "v3-rev20220926-2.0.0"
 
-log4j = "2.16.0"
+log4j = "2.19.0"
 
-junit5 = "5.8.1"
-aws-junit5 = "6.0.1"
-mockk = "1.12.0"
+junit5 = "5.9.1"
+aws-junit5 = "7.1.2"
+mockk = "1.13.2"
 
 [libraries]
 kotlinx-coroutines-jdk8 = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-jdk8", version.ref = "coroutines" }
@@ -43,7 +43,8 @@ koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin"
 
 ktor-bom = { group = "io.ktor", name = "ktor-bom", version.ref = "ktor" }
 ktor-client-apache = { group = "io.ktor", name = "ktor-client-apache" }
-ktor-client-serialization = { group = "io.ktor", name = "ktor-client-serialization" }
+ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation" }
+ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json" }
 
 graphql-kotlin-ktor-client = { group = "com.expediagroup", name = "graphql-kotlin-ktor-client", version.ref = "graphql-kotlin" }
 
@@ -52,9 +53,7 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa
 jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" }
 kaml = { group = "com.charleskorn.kaml", name = "kaml", version.ref = "kaml" }
 
-tgbotapi-core = { group = "dev.inmo", name = "tgbotapi.core", version.ref = "tgbotapi" }
-tgbotapi-extensions-api = { group = "dev.inmo", name = "tgbotapi.extensions.api", version.ref = "tgbotapi" }
-tgbotapi-extensions-utils = { group = "dev.inmo", name = "tgbotapi.extensions.utils", version.ref = "tgbotapi" }
+tgbotapi = { group = "dev.inmo", name = "tgbotapi", version.ref = "tgbotapi" }
 
 jsoup = { group = "org.jsoup", name = "jsoup", version.ref = "jsoup" }
 
@@ -76,6 +75,5 @@ aws-junit5-dynamo-v2 = { group = "me.madhead.aws-junit5", name = "dynamo-v2", ve
 mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
 
 [bundles]
-tgbotapi = ["tgbotapi-core", "tgbotapi-extensions-api"]
 log4j = ["log4j-core", "log4j-slf4j-impl"]
 aws-lambda = ["aws-lambda-java-events", "aws-lambda-java-core", "aws-lambda-java-log4j2", "jackson-databind"]

herald/build.gradle.kts

@@ -13,7 +13,6 @@ dependencies {
 
     implementation(libs.kotlinx.serialization.core)
     implementation(libs.kaml)
-    implementation(libs.tgbotapi.extensions.api)
     implementation(project.projects.votes.dynamodb)
     implementation(project.projects.votes.tgbotapiExtensions)
     implementation(project.projects.votes.dynamodb)

herald/src/main/kotlin/by/jprof/telegram/bot/herald/impl/send.kt

@@ -4,24 +4,26 @@ import by.jprof.telegram.bot.herald.model.Post
 import by.jprof.telegram.bot.votes.dynamodb.dao.VotesDAO
 import by.jprof.telegram.bot.votes.model.Votes
 import by.jprof.telegram.bot.votes.tgbotapi_extensions.toInlineKeyboardMarkup
-import dev.inmo.tgbotapi.bot.Ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.api.chat.get.getChat
 import dev.inmo.tgbotapi.extensions.api.send.media.sendPhoto
 import dev.inmo.tgbotapi.extensions.api.send.sendMessage
+import dev.inmo.tgbotapi.extensions.api.telegramBot
 import dev.inmo.tgbotapi.requests.abstracts.InputFile
 import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
-import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2ParseMode
-import dev.inmo.tgbotapi.types.chat.abstracts.UsernameChat
+import dev.inmo.tgbotapi.types.chat.UsernameChat
+import dev.inmo.tgbotapi.types.message.MarkdownV2
 import dev.inmo.tgbotapi.types.toChatId
-import dev.inmo.tgbotapi.utils.StorageFile
 import dev.inmo.tgbotapi.utils.extensions.escapeMarkdownV2Common
-import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider
-import software.amazon.awssdk.regions.Region
-import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
+import io.ktor.utils.io.streams.asInput
 import kotlin.io.path.Path
 import kotlin.io.path.absolute
+import kotlin.io.path.inputStream
 import kotlin.io.path.isRegularFile
+import kotlin.io.path.name
 import kotlin.system.exitProcess
+import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider
+import software.amazon.awssdk.regions.Region
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 
 suspend fun send(post: Post) {
     val image = post.image()
@@ -36,17 +38,18 @@ suspend fun send(post: Post) {
                     chatId = chat.toChatId(),
                     fileId = image,
                     text = post.content.forChat(chat),
-                    parseMode = MarkdownV2ParseMode,
+                    parseMode = MarkdownV2,
                     replyMarkup = votes?.toInlineKeyboardMarkup(),
                 )
             }
+
             else -> {
                 println("Sending text to $chat")
 
                 bot.sendMessage(
                     chatId = chat.toChatId(),
                     text = post.content.forChat(chat),
-                    parseMode = MarkdownV2ParseMode,
+                    parseMode = MarkdownV2,
                     replyMarkup = votes?.toInlineKeyboardMarkup(),
                     disableWebPagePreview = post.frontmatter.disableWebPagePreview,
                 )
@@ -77,7 +80,10 @@ private fun Post.image(): InputFile? {
     val imagePath = this.frontmatter.image?.let { cwd.resolve(it) }
 
     return if (imagePath != null && imagePath.isRegularFile()) {
-        MultipartFile(StorageFile(imagePath.toFile()))
+        MultipartFile(
+            filename = imagePath.name,
+            inputSource = { imagePath.inputStream().asInput() }
+        )
     } else {
         null
     }