Merge pull request #879 from InsanusMokrassar/16.0.0

16.0.0
InsanusMokrassar · Aug 11, 2024 · a162c3a · a162c3a
2 parents 6016387 + e9f7028
commit a162c3a
Show file tree

Hide file tree

Showing 17 changed files with 2,624 additions and 2,486 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .idea
+.kotlin
 out/*
 *.iml
 target

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # TelegramBotAPI changelog
 
+## 16.0.0
+
+**THIS UPDATE CONTAINS KOTLIN UPDATE UP TO 2.0**
+
+* `Version`:
+  * `Kotlin`: `1.9.23` -> `2.0.10`
+  * `Serialization`: `1.6.3` -> `1.7.1`
+  * `MicroUtils`: `0.21.2` -> `0.22.0`
+  * `KSLog`: `1.3.4` -> `1.3.5`
+
 ## 15.3.0
 
 **THIS UPDATE CONTAINS ADDING OF SUPPORT FOR BOTS API 7.8**
@@ -11,8 +21,6 @@
   * Add `BusinessConnectionId` to pin/unpin methods
 * `WebApp`:
   * Add `shareToStory` in `WebApp`
-
-
 
 ## 15.2.0
 

diff --git a/gradle.properties b/gradle.properties
@@ -6,4 +6,4 @@ kotlin.incremental=true
 kotlin.incremental.js=true
 
 library_group=dev.inmo
-library_version=15.3.0
+library_version=16.0.0
diff --git 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.10"
+kotlin-serialization = "1.7.1"
 kotlin-coroutines = "1.8.1"
 
 javax-activation = "1.1.1"
@@ -10,18 +10,18 @@ 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.10-1.0.24"
+kotlin-poet = "1.18.1"
 
-microutils = "0.21.2"
-kslog = "1.3.4"
+microutils = "0.22.0"
+kslog = "1.3.5"
 
 versions = "0.51.0"
 
 github-release-plugin = "2.5.2"
 dokka = "1.9.20"
 
-validator = "0.14.0"
+validator = "0.16.2"
 
 [libraries]
 

diff --git 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
@@ -38,7 +38,6 @@ kotlin {
         jsTest {
             dependencies {
                 implementation libs.kotlin.test.js
-                implementation libs.kotlin.test.junit
             }
         }
         all {

diff --git a/tgbotapi.api/api/tgbotapi.api.api b/tgbotapi.api/api/tgbotapi.api.api
@@ -88,13 +88,13 @@ public final class dev/inmo/tgbotapi/extensions/api/EditLiveLocationInfo : dev/i
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class dev/inmo/tgbotapi/extensions/api/EditLiveLocationInfo$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
+public synthetic class dev/inmo/tgbotapi/extensions/api/EditLiveLocationInfo$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Ldev/inmo/tgbotapi/extensions/api/EditLiveLocationInfo$$serializer;
-	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ldev/inmo/tgbotapi/extensions/api/EditLiveLocationInfo;
+	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
+	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ldev/inmo/tgbotapi/extensions/api/EditLiveLocationInfo;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/inmo/tgbotapi/extensions/api/EditLiveLocationInfo;)V
+	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
+	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/inmo/tgbotapi/extensions/api/EditLiveLocationInfo;)V
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
 	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
 }

diff --git a/tgbotapi.behaviour_builder.fsm/api/tgbotapi.behaviour_builder.fsm.api b/tgbotapi.behaviour_builder.fsm/api/tgbotapi.behaviour_builder.fsm.api
diff --git a/...otlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MentionTriggers.kt b/...otlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MentionTriggers.kt
@@ -162,7 +162,7 @@ suspend fun <BC : BehaviourContext> BC.onMentionWithMediaGroupContent(
     username: Username,
     initialFilter: CommonMessageFilter<MediaGroupContent<MediaGroupPartContent>>? = null,
     subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MediaGroupContent<MediaGroupPartContent>>, Update>? = null,
-    markerFactory: MarkerFactory<in CommonMessage<MediaGroupPartContent>, Any>? = AnyMarkerFactory(),
+    markerFactory: MarkerFactory<in CommonMessage<MediaGroupContent<MediaGroupPartContent>>, Any>? = AnyMarkerFactory(),
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<MediaGroupContent<MediaGroupPartContent>>>
 ) = onMention(username, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
 

diff --git a/tgbotapi.core/api/tgbotapi.core.api b/tgbotapi.core/api/tgbotapi.core.api
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/KtorRequestsExecutor.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/KtorRequestsExecutor.kt
@@ -4,6 +4,7 @@ import dev.inmo.kslog.common.KSLog
 import dev.inmo.tgbotapi.bot.BaseRequestsExecutor
 import dev.inmo.tgbotapi.bot.settings.limiters.ExceptionsOnlyLimiter
 import dev.inmo.tgbotapi.bot.settings.limiters.RequestLimiter
+import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
 import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
@@ -26,7 +27,10 @@ expect class KtorRequestsExecutor internal constructor(
     pipelineStepsHolder: KtorPipelineStepsHolder,
     logger: KSLog,
     diff: Unit // just a diff property to know where constructor and where calling function with defaults
-) : BaseRequestsExecutor
+) : BaseRequestsExecutor {
+    override suspend fun <T : Any> execute(request: Request<T>): T
+    override fun close()
+}
 
 fun KtorRequestsExecutor(
     telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper,

diff --git a/...e/src/commonMain/kotlin/dev/inmo/tgbotapi/types/business_connection/BusinessConnection.kt b/...e/src/commonMain/kotlin/dev/inmo/tgbotapi/types/business_connection/BusinessConnection.kt
@@ -56,7 +56,6 @@ sealed interface BusinessConnection : WithBusinessConnectionId {
         override val isEnabled: Boolean = false
     }
 
-    @Serializer(BusinessConnection::class)
     companion object : KSerializer<BusinessConnection> {
         override val descriptor: SerialDescriptor
             get() = RawBusinessConnection.serializer().descriptor

diff --git a/....core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestUsers.kt b/....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<KeyboardButtonRequestUsers> {
         @Serializable
         private data class Surrogate(

diff --git a/...pi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardMarkupSerializer.kt b/...pi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardMarkupSerializer.kt
@@ -1,6 +1,7 @@
 package dev.inmo.tgbotapi.types.buttons
 
 import dev.inmo.tgbotapi.utils.RiskFeature
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.InternalSerializationApi
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.*
@@ -9,7 +10,7 @@ import kotlinx.serialization.encoding.Encoder
 
 @RiskFeature
 object KeyboardMarkupSerializer : KSerializer<KeyboardMarkup> {
-    @OptIn(InternalSerializationApi::class)
+    @OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class)
     override val descriptor: SerialDescriptor = buildSerialDescriptor(
         KeyboardMarkup::class.toString(),
         PolymorphicKind.OPEN

diff --git a/...ommonMain/kotlin/dev/inmo/tgbotapi/types/buttons/inline/InlineKeyboardButtonsShortcuts.kt b/...ommonMain/kotlin/dev/inmo/tgbotapi/types/buttons/inline/InlineKeyboardButtonsShortcuts.kt
@@ -1,3 +1,5 @@
+@file:Suppress("unused")
+
 package dev.inmo.tgbotapi.types.buttons.inline
 
 import dev.inmo.tgbotapi.types.LoginURL

diff --git a/tgbotapi.utils/api/tgbotapi.utils.api b/tgbotapi.utils/api/tgbotapi.utils.api
@@ -2687,13 +2687,13 @@ public final class dev/inmo/tgbotapi/extensions/utils/SlotMachineResult {
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class dev/inmo/tgbotapi/extensions/utils/SlotMachineResult$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
+public synthetic class dev/inmo/tgbotapi/extensions/utils/SlotMachineResult$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Ldev/inmo/tgbotapi/extensions/utils/SlotMachineResult$$serializer;
-	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ldev/inmo/tgbotapi/extensions/utils/SlotMachineResult;
+	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
+	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ldev/inmo/tgbotapi/extensions/utils/SlotMachineResult;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/inmo/tgbotapi/extensions/utils/SlotMachineResult;)V
+	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
+	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/inmo/tgbotapi/extensions/utils/SlotMachineResult;)V
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
 	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
 }
@@ -2932,13 +2932,13 @@ public final class dev/inmo/tgbotapi/extensions/utils/extensions/venue/Foursquar
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class dev/inmo/tgbotapi/extensions/utils/extensions/venue/Foursquare$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
+public synthetic class dev/inmo/tgbotapi/extensions/utils/extensions/venue/Foursquare$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Ldev/inmo/tgbotapi/extensions/utils/extensions/venue/Foursquare$$serializer;
-	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ldev/inmo/tgbotapi/extensions/utils/extensions/venue/Foursquare;
+	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
+	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ldev/inmo/tgbotapi/extensions/utils/extensions/venue/Foursquare;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/inmo/tgbotapi/extensions/utils/extensions/venue/Foursquare;)V
+	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
+	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/inmo/tgbotapi/extensions/utils/extensions/venue/Foursquare;)V
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
 	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
 }
@@ -2972,13 +2972,13 @@ public final class dev/inmo/tgbotapi/extensions/utils/extensions/venue/GooglePla
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class dev/inmo/tgbotapi/extensions/utils/extensions/venue/GooglePlace$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
+public synthetic class dev/inmo/tgbotapi/extensions/utils/extensions/venue/GooglePlace$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Ldev/inmo/tgbotapi/extensions/utils/extensions/venue/GooglePlace$$serializer;
-	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ldev/inmo/tgbotapi/extensions/utils/extensions/venue/GooglePlace;
+	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
+	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ldev/inmo/tgbotapi/extensions/utils/extensions/venue/GooglePlace;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/inmo/tgbotapi/extensions/utils/extensions/venue/GooglePlace;)V
+	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
+	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/inmo/tgbotapi/extensions/utils/extensions/venue/GooglePlace;)V
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
 	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
 }

diff --git a/tgbotapi/api/tgbotapi.api b/tgbotapi/api/tgbotapi.api
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     .idea
+    .kotlin
     out/*
     *.iml
     target
@@ Expand Down @@