Update gradle.properties

0.6.3

build.gradle

@@ -7,10 +7,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
     }
 }
@@ -20,6 +18,7 @@ allprojects {
         mavenLocal()
         mavenCentral()
         google()
+        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
     }
 }
 

cache/admins/common/build.gradle

@@ -1,10 +1,9 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJavaWithJsProjectPath"
 
 kotlin {
     sourceSets {

cache/admins/common/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsCacheAPI.kt

@@ -7,8 +7,8 @@ import dev.inmo.tgbotapi.types.message.abstracts.GroupContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 
 interface AdminsCacheAPI {
-    suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>?
+    suspend fun getChatAdmins(chatId: IdChatIdentifier): List<AdministratorChatMember>?
-    suspend fun isAdmin(chatId: ChatId, userId: UserId): Boolean = getChatAdmins(chatId) ?.any {
+    suspend fun isAdmin(chatId: IdChatIdentifier, userId: UserId): Boolean = getChatAdmins(chatId) ?.any {
         it.user.id == userId
     } == true
     suspend fun sentByAdmin(groupContentMessage: GroupContentMessage<*>): Boolean

cache/admins/common/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsCacheSettingsAPI.kt

@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.libraries.cache.admins
 
 import com.soywiz.klock.minutes
-import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.Seconds
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.serialization.Serializable
@@ -23,22 +23,22 @@ data class AdminsCacheSettings(
 }
 
 interface AdminsCacheSettingsAPI {
-    suspend fun getChatSettings(chatId: ChatId): AdminsCacheSettings?
+    suspend fun getChatSettings(chatId: IdChatIdentifier): AdminsCacheSettings?
 }
 
 interface MutableAdminsCacheSettingsAPI : AdminsCacheSettingsAPI {
-    val chatSettingsUpdatedFlow: SharedFlow<Pair<ChatId, AdminsCacheSettings>>
+    val chatSettingsUpdatedFlow: SharedFlow<Pair<IdChatIdentifier, AdminsCacheSettings>>
 
-    suspend fun setChatSettings(chatId: ChatId, settings: AdminsCacheSettings)
+    suspend fun setChatSettings(chatId: IdChatIdentifier, settings: AdminsCacheSettings)
 }
 
 fun AdminsCacheSettingsAPI.asMutable(): MutableAdminsCacheSettingsAPI? = this as? MutableAdminsCacheSettingsAPI
 
 @Serializable
 class StaticAdminsCacheSettingsAPI(
-    private val settings: Map<ChatId, AdminsCacheSettings>
+    private val settings: Map<IdChatIdentifier, AdminsCacheSettings>
 ) : AdminsCacheSettingsAPI {
-    override suspend fun getChatSettings(chatId: ChatId): AdminsCacheSettings? = settings[chatId]
+    override suspend fun getChatSettings(chatId: IdChatIdentifier): AdminsCacheSettings? = settings[chatId]
 }
 
 

cache/admins/common/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsChangesListener.kt

@@ -7,7 +7,7 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onChatMe
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByChatChatMemberUpdatedMarkerFactory
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
-import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
 import dev.inmo.tgbotapi.types.chat.member.ChatMemberUpdated
 import dev.inmo.tgbotapi.types.update.abstracts.Update
@@ -35,7 +35,7 @@ suspend fun BehaviourContext.activateAdminsChangesListening(
 
 suspend fun BehaviourContext.activateAdminsChangesListening(
     repo: DefaultAdminsCacheAPIRepo,
-    allowedChats: List<ChatId>
+    allowedChats: List<IdChatIdentifier>
 ) = activateAdminsChangesListening(
     repo,
     {

cache/admins/common/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsSimpleFilter.kt

@@ -2,19 +2,19 @@ package dev.inmo.tgbotapi.libraries.cache.admins
 
 import dev.inmo.tgbotapi.abstracts.FromUser
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.UserId
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 
 fun AdminsChecker(
     adminsCacheAPI: AdminsCacheAPI
-): SimpleFilter<Pair<ChatId, UserId>> = SimpleFilter {
+): SimpleFilter<Pair<IdChatIdentifier, UserId>> = SimpleFilter {
     adminsCacheAPI.isAdmin(it.first, it.second)
 }
 
 fun <T> AdminsChecker(
     adminsCacheAPI: AdminsCacheAPI,
-    mapper: (T) -> Pair<ChatId, UserId>
+    mapper: (T) -> Pair<IdChatIdentifier, UserId>
 ): SimpleFilter<T> {
     val baseChecker = AdminsChecker(adminsCacheAPI)
 
@@ -31,7 +31,7 @@ fun MessageAdminsChecker(
 
 fun AdminsChecker(
     adminsCacheAPI: AdminsCacheAPI,
-    chatId: ChatId
+    chatId: IdChatIdentifier
 ) = SimpleFilter<FromUser> {
     adminsCacheAPI.isAdmin(chatId, it.from.id)
 }

cache/admins/common/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/DefaultAdminsCacheAPI.kt

@@ -11,9 +11,9 @@ import dev.inmo.tgbotapi.types.message.abstracts.*
 import kotlinx.serialization.Serializable
 
 interface DefaultAdminsCacheAPIRepo {
-    suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>?
+    suspend fun getChatAdmins(chatId: IdChatIdentifier): List<AdministratorChatMember>?
-    suspend fun setChatAdmins(chatId: ChatId, chatMembers: List<AdministratorChatMember>)
+    suspend fun setChatAdmins(chatId: IdChatIdentifier, chatMembers: List<AdministratorChatMember>)
-    suspend fun lastUpdate(chatId: ChatId): DateTime?
+    suspend fun lastUpdate(chatId: IdChatIdentifier): DateTime?
 }
 
 @Serializable
@@ -29,7 +29,7 @@ class DefaultAdminsCacheAPI(
         bot.getMe().also { botInfo = it }
     }
 
-    override suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>? {
+    override suspend fun getChatAdmins(chatId: IdChatIdentifier): List<AdministratorChatMember>? {
         val settings = settingsAPI.getChatSettings(chatId)
         val lastUpdate = repo.lastUpdate(chatId)
         return when {
@@ -42,7 +42,7 @@ class DefaultAdminsCacheAPI(
         }
     }
 
-    override suspend fun isAdmin(chatId: ChatId, userId: UserId): Boolean {
+    override suspend fun isAdmin(chatId: IdChatIdentifier, userId: UserId): Boolean {
         val settings = settingsAPI.getChatSettings(chatId)
         val lastUpdate = repo.lastUpdate(chatId)
         return when {

cache/admins/common/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/MessageSenderVerification.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.libraries.cache.admins
 
-import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.UserId
 import dev.inmo.tgbotapi.types.message.abstracts.*
 
@@ -13,7 +13,7 @@ suspend inline fun AdminsCacheAPI.isAdmin(message: Message) = when (message) {
 suspend inline fun AdminsCacheAPI.verifyMessageFromAdmin(message: Message) = isAdmin(message)
 
 suspend inline fun <R : Any> AdminsCacheAPI.doIfAdmin(
-    chatId: ChatId,
+    chatId: IdChatIdentifier,
     userId: UserId,
     block: () -> R
 ) = if(isAdmin(chatId, userId)) {

cache/admins/common/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/TriggerAdminsUpdate.kt

@@ -3,12 +3,12 @@ package dev.inmo.tgbotapi.libraries.cache.admins
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.chat.get.getChatAdministrators
-import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.chat.ExtendedBot
 import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
 
 internal suspend fun TelegramBot.updateAdmins(
-    chatId: ChatId,
+    chatId: IdChatIdentifier,
     repo: DefaultAdminsCacheAPIRepo,
     botInfo: ExtendedBot? = null
 ): List<AdministratorChatMember> {

cache/admins/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.tgbotapi.libraries.cache.admins"/>

cache/admins/micro_utils/build.gradle

@@ -1,10 +1,9 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJavaWithJsProjectPath"
 
 kotlin {
     sourceSets {

cache/admins/micro_utils/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/micro_utils/DefaultAdminsCacheAPI.kt

@@ -1,69 +1,91 @@
 package dev.inmo.tgbotapi.libraries.cache.admins.micro_utils
 
 import com.soywiz.klock.DateTime
-import dev.inmo.micro_utils.coroutines.actor
+import dev.inmo.micro_utils.coroutines.*
-import dev.inmo.micro_utils.coroutines.safelyWithoutExceptions
 import dev.inmo.micro_utils.repos.*
 import dev.inmo.tgbotapi.libraries.cache.admins.DefaultAdminsCacheAPIRepo
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.channels.*
 import kotlin.coroutines.*
 
 private sealed class RepoActions<T> {
-    abstract val toReturn: Continuation<T>
+    abstract val deferred: CompletableDeferred<T>
 }
 private class GetUpdateDateTimeRepoAction(
-    val chatId: ChatId,
+    val chatId: IdChatIdentifier,
-    override val toReturn: Continuation<DateTime?>
+    override val deferred: CompletableDeferred<DateTime?>
 ) : RepoActions<DateTime?>()
 private class GetChatAdminsRepoAction(
-    val chatId: ChatId,
+    val chatId: IdChatIdentifier,
-    override val toReturn: Continuation<List<AdministratorChatMember>?>
+    override val deferred: CompletableDeferred<List<AdministratorChatMember>?>
 ) : RepoActions<List<AdministratorChatMember>?>()
 private class SetChatAdminsRepoAction(
-    val chatId: ChatId,
+    val chatId: IdChatIdentifier,
     val newValue: List<AdministratorChatMember>,
-    override val toReturn: Continuation<Unit>
+    override val deferred: CompletableDeferred<Unit>
 ) : RepoActions<Unit>()
 
 class DefaultAdminsCacheAPIRepoImpl(
-    private val adminsRepo: KeyValuesRepo<ChatId, AdministratorChatMember>,
+    private val adminsRepo: KeyValuesRepo<IdChatIdentifier, AdministratorChatMember>,
-    private val updatesRepo: KeyValueRepo<ChatId, MilliSeconds>,
+    private val updatesRepo: KeyValueRepo<IdChatIdentifier, MilliSeconds>,
     private val scope: CoroutineScope
 ) : DefaultAdminsCacheAPIRepo {
-    private val actor = scope.actor<RepoActions<*>>(Channel.UNLIMITED) {
+    private val actor = scope.actorAsync<RepoActions<*>>(Channel.UNLIMITED) {
-        safelyWithoutExceptions {
+        safelyWithoutExceptions(
+            { e ->
+                it.deferred.completeExceptionally(e)
+            }
+        ) {
             when (it) {
-                is GetUpdateDateTimeRepoAction -> it.toReturn.resume(
+                is GetUpdateDateTimeRepoAction -> it.deferred.complete(
                     updatesRepo.get(it.chatId) ?.let { DateTime(it.toDouble()) }
                 )
-                is GetChatAdminsRepoAction -> it.toReturn.resume(adminsRepo.getAll(it.chatId))
+                is GetChatAdminsRepoAction -> it.deferred.complete(adminsRepo.getAll(it.chatId))
                 is SetChatAdminsRepoAction -> {
                     adminsRepo.clear(it.chatId)
                     adminsRepo.set(it.chatId, it.newValue)
                     updatesRepo.set(it.chatId, DateTime.now().unixMillisLong)
-                    it.toReturn.resume(Unit)
+                    it.deferred.complete(Unit)
                 }
             }
         }
     }
 
-    override suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>? = suspendCoroutine {
+    override suspend fun getChatAdmins(chatId: IdChatIdentifier): List<AdministratorChatMember>? {
-        actor.trySend(GetChatAdminsRepoAction(chatId, it))
+        val deferred = CompletableDeferred<List<AdministratorChatMember>?>()
+        actor.trySend(
+            GetChatAdminsRepoAction(chatId, deferred)
+        ).onFailure {
+            deferred.completeExceptionally(it ?: IllegalStateException("Something went wrong when tried to add getChatAdmins action"))
+        }
+        return deferred.await()
     }
 
-    override suspend fun setChatAdmins(chatId: ChatId, chatMembers: List<AdministratorChatMember>) = suspendCoroutine<Unit> {
+    override suspend fun setChatAdmins(chatId: IdChatIdentifier, chatMembers: List<AdministratorChatMember>) {
-        actor.trySend(SetChatAdminsRepoAction(chatId, chatMembers, it))
+        val deferred = CompletableDeferred<Unit>()
+        actor.trySend(
+            SetChatAdminsRepoAction(chatId, chatMembers, deferred)
+        ).onFailure {
+            deferred.completeExceptionally(it ?: IllegalStateException("Something went wrong when tried to add setChatAdmins action"))
+        }
+        return deferred.await()
     }
-    override suspend fun lastUpdate(chatId: ChatId): DateTime? = suspendCoroutine {
+    override suspend fun lastUpdate(chatId: IdChatIdentifier): DateTime? {
-        actor.trySend(GetUpdateDateTimeRepoAction(chatId, it))
+        val deferred = CompletableDeferred<DateTime?>()
+        actor.trySend(
+            GetUpdateDateTimeRepoAction(chatId, deferred)
+        ).onFailure {
+            deferred.completeExceptionally(it ?: IllegalStateException("Something went wrong when tried to add lastUpdate action"))
+        }
+        return deferred.await()
     }
 }
 
 fun DefaultAdminsCacheAPIRepo(
-    adminsRepo: KeyValuesRepo<ChatId, AdministratorChatMember>,
+    adminsRepo: KeyValuesRepo<IdChatIdentifier, AdministratorChatMember>,
-    updatesRepo: KeyValueRepo<ChatId, MilliSeconds>,
+    updatesRepo: KeyValueRepo<IdChatIdentifier, MilliSeconds>,
     scope: CoroutineScope
 ) = DefaultAdminsCacheAPIRepoImpl(adminsRepo, updatesRepo, scope)

cache/admins/micro_utils/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/micro_utils/DynamicAdminsCacheSettingsAPI.kt

@@ -3,22 +3,22 @@ package dev.inmo.tgbotapi.libraries.cache.admins.micro_utils
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.micro_utils.repos.*
 import dev.inmo.tgbotapi.libraries.cache.admins.*
-import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.*
 
 class DynamicAdminsCacheSettingsAPI(
-    private val repo: KeyValueRepo<ChatId, AdminsCacheSettings>,
+    private val repo: KeyValueRepo<IdChatIdentifier, AdminsCacheSettings>,
     private val scope: CoroutineScope
 ) : AdminsCacheSettingsAPI, MutableAdminsCacheSettingsAPI {
-    override val chatSettingsUpdatedFlow: SharedFlow<Pair<ChatId, AdminsCacheSettings>>
+    override val chatSettingsUpdatedFlow: SharedFlow<Pair<IdChatIdentifier, AdminsCacheSettings>>
         get() = repo.onNewValue.shareIn(scope, SharingStarted.Eagerly)
 
-    override suspend fun setChatSettings(chatId: ChatId, settings: AdminsCacheSettings) {
+    override suspend fun setChatSettings(chatId: IdChatIdentifier, settings: AdminsCacheSettings) {
         repo.set(chatId, settings)
     }
 
-    override suspend fun getChatSettings(chatId: ChatId): AdminsCacheSettings {
+    override suspend fun getChatSettings(chatId: IdChatIdentifier): AdminsCacheSettings {
         val settings = repo.get(chatId)
         return if (settings == null) {
             val newSettings = AdminsCacheSettings()

cache/admins/micro_utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsCacheAPI.kt

@@ -38,18 +38,18 @@ fun TelegramBot.createAdminsCacheAPI(
             { long("chatId") },
             { text("member") },
             "AdminsTable"
-        ).withMapper<ChatId, AdministratorChatMember, Identifier, String>(
+        ).withMapper<IdChatIdentifier, AdministratorChatMember, Identifier, String>(
             keyFromToTo = { chatId },
-            valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
+            valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(AdministratorChatMember.serializer(), this) },
             keyToToFrom = { toChatId() },
-            valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) }
+            valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(AdministratorChatMember.serializer(), this) }
         ),
         ExposedKeyValueRepo(
             database,
             { long("chatId") },
             { long("datetime") },
             "AdminsUpdatesTimesTable"
-        ).withMapper<ChatId, Long, Identifier, Long>(
+        ).withMapper<IdChatIdentifier, Long, Identifier, Long>(
             keyFromToTo = { chatId },
             valueFromToTo = { this },
             keyToToFrom = { toChatId() },
@@ -63,11 +63,11 @@ fun TelegramBot.createAdminsCacheAPI(
             { long("chatId") },
             { text("settings") },
             "DynamicAdminsCacheSettingsAPI"
-        ).withMapper<ChatId, AdminsCacheSettings, Identifier, String>(
+        ).withMapper<IdChatIdentifier, AdminsCacheSettings, Identifier, String>(
             keyFromToTo = { chatId },
-            valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
+            valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(AdminsCacheSettings.serializer() , this) },
             keyToToFrom = { toChatId() },
-            valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) }
+            valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(AdminsCacheSettings.serializer() , this) }
         ),
         scope
     )

cache/admins/micro_utils/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.tgbotapi.libraries.cache.admins.micro_utils"/>

cache/admins/plagubot/build.gradle

@@ -1,10 +1,9 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJavaWithJsProjectPath"
 
 kotlin {
     sourceSets {

cache/admins/plagubot/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsPlugin.kt

@@ -55,7 +55,7 @@ class AdminsPlugin : Plugin {
                     { long("chatId") },
                     { text("member") },
                     "AdminsTable"
-                ).withMapper<ChatId, AdministratorChatMember, Identifier, String>(
+                ).withMapper<IdChatIdentifier, AdministratorChatMember, Identifier, String>(
                     keyFromToTo = { chatId },
                     valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
                     keyToToFrom = { toChatId() },
@@ -66,7 +66,7 @@ class AdminsPlugin : Plugin {
                     { long("chatId") },
                     { long("datetime") },
                     "AdminsUpdatesTimesTable"
-                ).withMapper<ChatId, Long, Identifier, Long>(
+                ).withMapper<IdChatIdentifier, Long, Identifier, Long>(
                     keyFromToTo = { chatId },
                     valueFromToTo = { this },
                     keyToToFrom = { toChatId() },
@@ -82,7 +82,7 @@ class AdminsPlugin : Plugin {
                     { long("chatId") },
                     { text("settings") },
                     "DynamicAdminsCacheSettingsAPI"
-                ).withMapper<ChatId, AdminsCacheSettings, Identifier, String>(
+                ).withMapper<IdChatIdentifier, AdminsCacheSettings, Identifier, String>(
                     keyFromToTo = { chatId },
                     valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
                     keyToToFrom = { toChatId() },

cache/admins/plagubot/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.tgbotapi.libraries.cache.admins.plagubot"/>

cache/content/common/build.gradle

@@ -1,10 +1,9 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJavaWithJsProjectPath"
 
 kotlin {
     sourceSets {

cache/content/common/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/media/common/DefaultMessageContentCache.kt

@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.DownloadFileStream
 import dev.inmo.tgbotapi.requests.get.GetFile
 import dev.inmo.tgbotapi.requests.send.media.*
-import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.media.*
 import dev.inmo.tgbotapi.types.message.content.MediaContent
 import dev.inmo.tgbotapi.types.message.content.MessageContent
@@ -13,7 +13,7 @@ import io.ktor.utils.io.core.Input
 
 class DefaultMessageContentCache<K>(
     private val bot: TelegramBot,
-    private val filesRefreshingChatId: ChatId,
+    private val filesRefreshingChatId: IdChatIdentifier,
     private val simpleMessageContentCache: MessagesSimpleCache<K>,
     private val mediaFileActualityChecker: MediaFileActualityChecker = MediaFileActualityChecker.WithDelay(
         MediaFileActualityChecker.Default(filesRefreshingChatId)
@@ -111,7 +111,7 @@ class DefaultMessageContentCache<K>(
     companion object {
         operator fun invoke(
             bot: TelegramBot,
-            filesRefreshingChatId: ChatId,
+            filesRefreshingChatId: IdChatIdentifier,
             simpleMessageContentCache: MessagesSimpleCache<String> = InMemoryMessagesSimpleCache(),
             mediaFileActualityChecker: MediaFileActualityChecker = MediaFileActualityChecker.WithDelay(
                 MediaFileActualityChecker.Default(filesRefreshingChatId)

cache/content/common/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/media/common/MediaFileActualityChecker.kt

@@ -6,6 +6,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.DeleteMessage
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.MilliSeconds
 import dev.inmo.tgbotapi.types.message.content.MediaContent
 
@@ -14,7 +15,7 @@ fun interface MediaFileActualityChecker {
     suspend fun TelegramBot.saved(mediaContent: MediaContent) {}
 
     class Default(
-        private val checkingChatId: ChatId
+        private val checkingChatId: IdChatIdentifier
     ) : MediaFileActualityChecker {
         override suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean {
             return runCatching {

cache/content/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.tgbotapi.libraries.cache.content.common"/>

cache/content/micro_utils/build.gradle

@@ -1,10 +1,9 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJavaWithJsProjectPath"
 
 kotlin {
     sourceSets {

cache/content/micro_utils/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.tgbotapi.libraries.cache.content.micro_utils"/>

defaultAndroidSettings.gradle

@@ -1,40 +0,0 @@
-apply plugin: 'com.getkeepsafe.dexcount'
-
-android {
-    compileSdkVersion "$android_compileSdkVersion".toInteger()
-    buildToolsVersion "$android_buildToolsVersion"
-
-    defaultConfig {
-        minSdkVersion "$android_minSdkVersion".toInteger()
-        targetSdkVersion "$android_compileSdkVersion".toInteger()
-        versionCode "${android_code_version}".toInteger()
-        versionName "$version"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-        debug {
-            debuggable true
-        }
-    }
-
-    packagingOptions {
-        exclude 'META-INF/kotlinx-serialization-runtime.kotlin_module'
-        exclude 'META-INF/kotlinx-serialization-cbor.kotlin_module'
-        exclude 'META-INF/kotlinx-serialization-properties.kotlin_module'
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-}

extensions.gradle

@@ -13,11 +13,7 @@ allprojects {
             projectByName(name)
         }
 
-        mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle"
+        mppJavaWithJsProjectPath = "${rootProject.projectDir.absolutePath}/mppJavaWithJsProject.gradle"
-        mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle"
-        mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle"
-
-        defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle"
 
         publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
     }

gradle.properties

@@ -1,3 +1,4 @@
+org.gradle.jvmargs=-Xmx512m
 kotlin.code.style=official
 org.gradle.parallel=true
 kotlin.js.generate.externals=true
@@ -6,32 +7,22 @@ kotlin.incremental.js=true
 android.useAndroidX=true
 android.enableJetifier=true
 
-kotlin_version=1.7.10
+
-kotlin_serialisation_core_version=1.4.0
+kotlin_version=1.7.21
+kotlin_serialisation_core_version=1.4.1
 
 github_release_plugin_version=2.4.1
 
-tgbotapi_version=3.2.1
+tgbotapi_version=4.1.3
-micro_utils_version=0.12.11
+micro_utils_version=0.14.4
-exposed_version=0.39.2
+exposed_version=0.41.1
-plagubot_version=2.3.1
+plagubot_version=3.1.3
-
-# ANDROID
-
-android_minSdkVersion=21
-android_compileSdkVersion=32
-android_buildToolsVersion=32.0.0
-dexcount_version=3.1.0
-junit_version=4.12
-test_ext_junit_version=1.1.3
-espresso_core=3.4.0
 
 # Dokka
 
-dokka_version=1.7.10
+dokka_version=1.7.20
 
 # Project data
 
 group=dev.inmo
-version=0.5.3
+version=0.6.4
-android_code_version=30

mppAndroidProject.gradle

@@ -1,26 +0,0 @@
-project.version = "$version"
-project.group = "$group"
-
-apply from: "$publishGradlePath"
-
-kotlin {
-    android {
-        publishAllLibraryVariants()
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib')
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
-            }
-        }
-    }
-}
-
-apply from: "$defaultAndroidSettingsPresetPath"

mppJavaProject.gradle

@@ -1,39 +0,0 @@
-project.version = "$version"
-project.group = "$group"
-
-apply from: "$publishGradlePath"
-
-kotlin {
-    jvm {
-        compilations.main {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
-        }
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib')
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
-            }
-        }
-
-        jvmTest {
-            dependencies {
-                implementation kotlin('test-junit')
-            }
-        }
-    }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}

mppJavaWithJsProject.gradle

@@ -15,9 +15,6 @@ kotlin {
         browser()
         nodejs()
     }
-    android {
-        publishAllLibraryVariants()
-    }
 
     sourceSets {
         commonMain {
@@ -43,13 +40,6 @@ kotlin {
                 implementation kotlin('test-junit')
             }
         }
-        androidTest {
-            dependencies {
-                implementation kotlin('test-junit')
-                implementation "androidx.test.ext:junit:$test_ext_junit_version"
-                implementation "androidx.test.espresso:espresso-core:$espresso_core"
-            }
-        }
     }
 }
 
@@ -57,5 +47,3 @@ java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
-
-apply from: "$defaultAndroidSettingsPresetPath"

publish.gradle

@@ -42,20 +42,40 @@ publishing {
                 maven {
                     name = "GithubPackages"
                     url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries")
+            
                     credentials {
                         username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
                         password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
                     }
+            
+                }
+            }
+            if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
+                maven {
+                    name = "Gitea"
+                    url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
+            
+                    credentials(HttpHeaderCredentials) {
+                        name = "Authorization"
+                        value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
+                    }
+            
+                    authentication {
+                        header(HttpHeaderAuthentication)
+                    }
+            
                 }
             }
             if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
                 maven {
                     name = "sonatype"
                     url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+            
                     credentials {
                         username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
                         password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
                     }
+            
                 }
             }
         }

publish.kpsb

@@ -1 +1 @@
-{"licenses":[{"id":"MIT","title":"MIT License","url":"https://opensource.org/licenses/MIT"}],"mavenConfig":{"name":"${project.name}","description":"${project.name}","url":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries","vcsUrl":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
+{"licenses":[{"id":"MIT","title":"MIT License","url":"https://opensource.org/licenses/MIT"}],"mavenConfig":{"name":"${project.name}","description":"${project.name}","url":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries","vcsUrl":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries"},{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}