fixes and updates

InsanusMokrassar · Dec 10, 2023 · 9a2264f · 9a2264f
1 parent dd15416
commit 9a2264f
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 21 deletions.
diff --git a/common/src/jvmMain/kotlin/Plugin.kt b/common/src/jvmMain/kotlin/Plugin.kt
@@ -10,8 +10,10 @@ import dev.inmo.micro_utils.koin.annotations.GenerateKoinDefinition
 import dev.inmo.micro_utils.koin.getAllDistinct
 import dev.inmo.micro_utils.language_codes.IetfLanguageCode
 import dev.inmo.micro_utils.repos.KeyValueRepo
+import dev.inmo.micro_utils.repos.MapKeyValueRepo
 import dev.inmo.micro_utils.repos.cache.cache.FullKVCache
 import dev.inmo.micro_utils.repos.cache.cached
+import dev.inmo.micro_utils.repos.cache.full.fullyCached
 import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo
 import dev.inmo.micro_utils.repos.mappers.withMapper
 import dev.inmo.plagubot.Plugin
@@ -71,7 +73,7 @@ object Plugin : Plugin {
                 { code },
                 { json.decodeFromString(FullChatIdentifierSerializer, this) as IdChatIdentifier },
                 { IetfLanguageCode(this) }
-            ).cached(FullKVCache(), get())
+            ).fullyCached(MapKeyValueRepo(), get())
         }
     }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,23 +1,23 @@
 [versions]
 
-kotlin = "1.8.22"
-kotlin-serialization = "1.5.1"
+kotlin = "1.9.21"
+kotlin-serialization = "1.6.2"
 
-plagubot = "6.0.1"
-plagubot-plugins = "0.12.0"
-tgbotapi-libraries = "0.12.1"
+plagubot = "7.4.1"
+plagubot-plugins = "0.17.1"
+tgbotapi-libraries = "0.17.1"
 
 moko-resources = "0.23.0"
 
-tgbotapi = "8.0.1"
+tgbotapi = "9.4.2"
 
 psql = "42.6.0"
 
-microutils = "0.19.2"
+microutils = "0.20.19"
 
-ksp = "1.8.22-1.0.11"
+ksp = "1.9.21-1.0.15"
 
-dokka = "1.8.20"
+dokka = "1.9.10"
 
 [libraries]
 

diff --git a/mppJavaProject.gradle b/mppJavaProject.gradle
@@ -6,7 +6,7 @@ kotlin {
     jvm {
         compilations.main {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "17"
             }
         }
     }
@@ -33,6 +33,6 @@ kotlin {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
diff --git a/mppProjectWithSerialization.gradle b/mppProjectWithSerialization.gradle
@@ -6,7 +6,7 @@ kotlin {
     jvm {
         compilations.main {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "17"
             }
         }
     }
@@ -43,6 +43,6 @@ kotlin {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
diff --git a/registrar/build.gradle b/registrar/build.gradle
@@ -15,6 +15,9 @@ kotlin {
                 api libs.moko.resources
             }
         }
+        jvmMain {
+            dependsOn(commonMain)
+        }
     }
 }
 

diff --git a/reviews/build.gradle b/reviews/build.gradle
@@ -14,6 +14,9 @@ kotlin {
                 api project(":plagubot.suggestionsbot.suggestions")
             }
         }
+        jvmMain {
+            dependsOn(commonMain)
+        }
     }
 }
 

diff --git a/reviews/src/jvmMain/kotlin/Plugin.kt b/reviews/src/jvmMain/kotlin/Plugin.kt
@@ -11,8 +11,6 @@ import dev.inmo.micro_utils.repos.set
 import dev.inmo.micro_utils.repos.unset
 import dev.inmo.plagubot.Plugin
 import dev.inmo.plagubot.suggestionsbot.common.ChatsConfig
-import dev.inmo.plagubot.suggestionsbot.common.locale
-import dev.inmo.plagubot.suggestionsbot.reviews.ReviewsResources
 import dev.inmo.plagubot.suggestionsbot.reviews.repo.ExposedReviewMessagesInfo
 import dev.inmo.plagubot.suggestionsbot.suggestions.exposed.SuggestionsMessageMetaInfosExposedRepo
 import dev.inmo.plagubot.suggestionsbot.suggestions.models.RegisteredSuggestion
@@ -28,8 +26,6 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onMessag
 import dev.inmo.tgbotapi.extensions.utils.privateChatOrNull
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.dataButton
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.flatInlineKeyboard
-import dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard
-import dev.inmo.tgbotapi.extensions.utils.userOrNull
 import dev.inmo.tgbotapi.libraries.resender.MessageMetaInfo
 import dev.inmo.tgbotapi.libraries.resender.MessagesResender
 import dev.inmo.tgbotapi.libraries.resender.invoke
@@ -39,7 +35,6 @@ import dev.inmo.tgbotapi.types.message.textsources.mention
 import dev.inmo.tgbotapi.utils.buildEntities
 import dev.inmo.tgbotapi.types.queries.callback.MessageCallbackQuery
 import dev.inmo.tgbotapi.types.userLink
-import dev.inmo.tgbotapi.utils.bold
 import dev.inmo.tgbotapi.utils.underline
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json

diff --git a/suggestions/build.gradle b/suggestions/build.gradle
@@ -21,6 +21,7 @@ kotlin {
                 api libs.microutils.repos.exposed
                 api libs.plagubot.plugin
             }
+            dependsOn(commonMain)
         }
     }
 }