migration onto kotlin 2.1.20 and ktgbotapi 24.0.2

HelloBot/src/main/kotlin/HelloBot.kt

@@ -7,13 +7,11 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onConten
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onMentionWithAnyContent
 import dev.inmo.tgbotapi.extensions.utils.extensions.raw.sender_chat
 import dev.inmo.tgbotapi.extensions.utils.extensions.raw.text
-import dev.inmo.tgbotapi.extensions.utils.formatting.chatLink
 import dev.inmo.tgbotapi.extensions.utils.formatting.linkMarkdownV2
 import dev.inmo.tgbotapi.extensions.utils.formatting.textMentionMarkdownV2
 import dev.inmo.tgbotapi.extensions.utils.ifFromChannelGroupContentMessage
 import dev.inmo.tgbotapi.types.chat.*
 import dev.inmo.tgbotapi.types.message.MarkdownV2
-import dev.inmo.tgbotapi.types.message.abstracts.ForumContentMessage
 import dev.inmo.tgbotapi.utils.PreviewFeature
 import dev.inmo.tgbotapi.utils.extensions.escapeMarkdownV2Common
 import kotlinx.coroutines.CoroutineScope
@@ -58,17 +56,8 @@ suspend fun main(vararg args: String) {
                         reply(message, answer, MarkdownV2)
                         return@onContentMessage
                     }
-                    "Oh, hi, " + when {
-                        chat is ForumChat && message is ForumContentMessage<*> -> {
-                            val baseTitle = (chat.username ?.username ?: getChat(chat).inviteLink) ?.let {
-                                chat.title.linkMarkdownV2(it)
-                            } ?: chat.title
-                            val additionalTitle = message.threadCreatingInfo ?.let {
-                                it.name.linkMarkdownV2(message.chat.id.chatLink)
-                            } ?: "Main topic"
-                            "$baseTitle \\($additionalTitle\\)"
-                        }
-                        chat is SupergroupChat -> (chat.username ?.username ?: getChat(chat).inviteLink) ?.let {
+                    "Oh, hi, " + when (chat) {
+                        is SupergroupChat -> (chat.username ?.username ?: getChat(chat).inviteLink) ?.let {
                             chat.title.linkMarkdownV2(it)
                         } ?: chat.title
                         else -> bot.getChat(chat).inviteLink ?.let {

InlineQueriesBot/build.gradle

@@ -12,14 +12,16 @@ plugins {
     id "org.jetbrains.kotlin.multiplatform"
 }
 
-apply plugin: 'application'
-
-mainClassName="InlineQueriesBotKt"
-
 apply from: "$nativePartTemplate"
 
 kotlin {
-    jvm()
+    jvm {
+        binaries {
+            executable {
+                mainClass.set("InlineQueriesBotKt")
+            }
+        }
+    }
 
     sourceSets {
         commonMain {
@@ -27,12 +29,14 @@ kotlin {
                 implementation kotlin('stdlib')
 
                 api "dev.inmo:tgbotapi:$telegram_bot_api_version"
+                api "dev.inmo:tgbotapi:$telegram_bot_api_version"
+            }
+        }
+        jvmMain {
+            dependencies {
+                api "io.ktor:ktor-client-logging-jvm:$ktor_version"
             }
         }
     }
 }
 
-dependencies {
-    implementation 'io.ktor:ktor-client-logging-jvm:3.1.0'
-}
-

RandomFileSenderBot/build.gradle

@@ -12,12 +12,14 @@ plugins {
     id "org.jetbrains.kotlin.multiplatform"
 }
 
-apply plugin: 'application'
-
-mainClassName="RandomFileSenderBotKt"
-
 kotlin {
-    jvm()
+    jvm {
+        binaries {
+            executable {
+                mainClass.set("RandomFileSenderBotKt")
+            }
+        }
+    }
 
     sourceSets {
         commonMain {

RightsChangerBot/build.gradle

@@ -18,5 +18,5 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     implementation "dev.inmo:tgbotapi:$telegram_bot_api_version"
-    implementation 'io.ktor:ktor-client-logging-jvm:3.1.0'
+    implementation 'io.ktor:ktor-client-logging-jvm:3.0.3'
 }

WebApp/build.gradle

@@ -16,10 +16,14 @@ plugins {
     id "org.jetbrains.compose" version "$compose_version"
 }
 
-apply plugin: 'application'
-
 kotlin {
-    jvm()
+    jvm {
+        binaries {
+            executable {
+                mainClass.set("WebAppServerKt")
+            }
+        }
+    }
     js(IR) {
         browser()
         binaries.executable()
@@ -31,7 +35,6 @@ kotlin {
                 implementation kotlin('stdlib')
                 implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version"
                 implementation "dev.inmo:tgbotapi.core:$telegram_bot_api_version"
-                implementation compose.runtime
             }
         }
 
@@ -39,6 +42,7 @@ kotlin {
             dependencies {
                 implementation "dev.inmo:tgbotapi.webapps:$telegram_bot_api_version"
                 implementation compose.web.core
+                implementation compose.runtime
             }
         }
 
@@ -47,16 +51,11 @@ kotlin {
                 implementation "dev.inmo:tgbotapi:$telegram_bot_api_version"
                 implementation "dev.inmo:micro_utils.ktor.server:$micro_utils_version"
                 implementation "io.ktor:ktor-server-cio:$ktor_version"
-                implementation compose.desktop.currentOs
             }
         }
     }
 }
 
-application {
-    mainClassName = "WebAppServerKt"
-}
-
 tasks.getByName("compileKotlinJvm")
         .dependsOn(jsBrowserDistribution)
 tasks.getByName("compileKotlinJvm").configure {

gradle.properties

@@ -5,9 +5,9 @@ org.gradle.jvmargs=-Xmx3148m
 kotlin.daemon.jvmargs=-Xmx3g -Xms500m
 
 
-kotlin_version=2.1.10
-telegram_bot_api_version=24.0.0
-micro_utils_version=0.24.6
+kotlin_version=2.1.20
+telegram_bot_api_version=24.0.2
+micro_utils_version=0.25.3
 serialization_version=1.8.0
-ktor_version=3.1.0
+ktor_version=3.1.1
 compose_version=1.7.3

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip