Merge fd4dea25a8 into f87a9c5c66

Update kotlin monorepo to v2.1.10

InlineQueriesBot/build.gradle

@@ -12,16 +12,14 @@ plugins {
     id "org.jetbrains.kotlin.multiplatform"
 }
 
+apply plugin: 'application'
+
+mainClassName="InlineQueriesBotKt"
+
 apply from: "$nativePartTemplate"
 
 kotlin {
-    jvm {
-        binaries {
-            executable {
-                mainClass.set("InlineQueriesBotKt")
-            }
-        }
-    }
+    jvm()
 
     sourceSets {
         commonMain {
@@ -29,14 +27,12 @@ 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,14 +12,12 @@ plugins {
     id "org.jetbrains.kotlin.multiplatform"
 }
 
+apply plugin: 'application'
+
+mainClassName="RandomFileSenderBotKt"
+
 kotlin {
-    jvm {
-        binaries {
-            executable {
-                mainClass.set("RandomFileSenderBotKt")
-            }
-        }
-    }
+    jvm()
 
     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.0.3'
+    implementation 'io.ktor:ktor-client-logging-jvm:3.1.0'
 }

WebApp/build.gradle

@@ -16,14 +16,10 @@ plugins {
     id "org.jetbrains.compose" version "$compose_version"
 }
 
+apply plugin: 'application'
+
 kotlin {
-    jvm {
-        binaries {
-            executable {
-                mainClass.set("WebAppServerKt")
-            }
-        }
-    }
+    jvm()
     js(IR) {
         browser()
         binaries.executable()
@@ -35,6 +31,7 @@ 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
             }
         }
 
@@ -42,7 +39,6 @@ kotlin {
             dependencies {
                 implementation "dev.inmo:tgbotapi.webapps:$telegram_bot_api_version"
                 implementation compose.web.core
-                implementation compose.runtime
             }
         }
 
@@ -51,11 +47,16 @@ 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.20
-telegram_bot_api_version=24.0.2
-micro_utils_version=0.25.3
+kotlin_version=2.1.10
+telegram_bot_api_version=23.2.1
+micro_utils_version=0.24.6
 serialization_version=1.8.0
-ktor_version=3.1.1
+ktor_version=3.1.0
 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.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip