migration onto kotlin 2.1.20 and ktgbotapi 24.0.2

This commit is contained in:
2025-03-26 11:36:45 +06:00
parent f6bce640da
commit 7bbb6a6fee
5 changed files with 33 additions and 28 deletions

View File

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

View File

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

View File

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

View File

@@ -5,9 +5,9 @@ org.gradle.jvmargs=-Xmx3148m
kotlin.daemon.jvmargs=-Xmx3g -Xms500m kotlin.daemon.jvmargs=-Xmx3g -Xms500m
kotlin_version=2.1.0 kotlin_version=2.1.20
telegram_bot_api_version=23.1.2 telegram_bot_api_version=24.0.2
micro_utils_version=0.24.5 micro_utils_version=0.25.3
serialization_version=1.8.0 serialization_version=1.8.0
ktor_version=3.0.3 ktor_version=3.1.1
compose_version=1.7.3 compose_version=1.7.3

View File

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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