diff --git a/.gitignore b/.gitignore index 0e47a00d49..d344e95940 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea +.kotlin out/* *.iml target diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ae72b5fdf6..a014a1cd61 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -kotlin = "1.9.23" -kotlin-serialization = "1.6.3" +kotlin = "2.0.0" +kotlin-serialization = "1.7.1" kotlin-coroutines = "1.8.1" javax-activation = "1.1.1" @@ -10,10 +10,10 @@ korlibs = "5.4.0" uuid = "0.8.4" ktor = "2.3.11" -ksp = "1.9.23-1.0.20" -kotlin-poet = "1.16.0" +ksp = "2.0.0-1.0.23" +kotlin-poet = "1.18.0" -microutils = "0.21.2" +microutils = "0.22.0" kslog = "1.3.4" versions = "0.51.0" diff --git a/mppJsProject.gradle b/mppJsProject.gradle index f7499b3c3b..5e0b8b40e3 100644 --- a/mppJsProject.gradle +++ b/mppJsProject.gradle @@ -25,7 +25,6 @@ kotlin { jsTest { dependencies { implementation libs.kotlin.test.js - implementation libs.kotlin.test.junit } } } diff --git a/mppProjectWithSerialization.gradle b/mppProjectWithSerialization.gradle index aca28aecce..0f22c297ec 100644 --- a/mppProjectWithSerialization.gradle +++ b/mppProjectWithSerialization.gradle @@ -38,7 +38,6 @@ kotlin { jsTest { dependencies { implementation libs.kotlin.test.js - implementation libs.kotlin.test.junit } } all { diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestUsers.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestUsers.kt index 5aa0860985..e84a480e0d 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestUsers.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestUsers.kt @@ -83,7 +83,6 @@ sealed interface KeyboardButtonRequestUsers { get() = null } - @Serializer(KeyboardButtonRequestUsers::class) companion object : KSerializer { @Serializable private data class Surrogate(