diff --git a/InlineQueriesBot/build.gradle b/InlineQueriesBot/build.gradle index a9bd552..2abd10e 100644 --- a/InlineQueriesBot/build.gradle +++ b/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.0.3' -} - diff --git a/RandomFileSenderBot/build.gradle b/RandomFileSenderBot/build.gradle index d4e2f24..8626fe1 100644 --- a/RandomFileSenderBot/build.gradle +++ b/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 { diff --git a/WebApp/build.gradle b/WebApp/build.gradle index 8e04927..86308f3 100644 --- a/WebApp/build.gradle +++ b/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 { diff --git a/gradle.properties b/gradle.properties index 8dd4b7a..cf84ddb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,9 +5,9 @@ org.gradle.jvmargs=-Xmx3148m kotlin.daemon.jvmargs=-Xmx3g -Xms500m -kotlin_version=2.1.0 -telegram_bot_api_version=23.1.2 -micro_utils_version=0.24.5 +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.0.3 +ktor_version=3.1.1 compose_version=1.7.3 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6b74f0f..32949f9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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