diff --git a/bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt b/bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt index f0cafad..e1af67b 100644 --- a/bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt +++ b/bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt @@ -2,6 +2,7 @@ package dev.inmo.plagubot import dev.inmo.kslog.common.* import dev.inmo.micro_utils.common.Warning +import dev.inmo.micro_utils.coroutines.runCatchingLogging import dev.inmo.micro_utils.coroutines.runCatchingSafely import dev.inmo.micro_utils.fsm.common.State import dev.inmo.micro_utils.fsm.common.StatesManager @@ -107,7 +108,7 @@ object PlaguBot : Plugin { */ override suspend fun BehaviourContextWithFSM.setupBotPlugin(koin: Koin) { koin.plugins.filter { it !== this@PlaguBot }.forEach { plugin -> - runCatchingSafely { + runCatchingLogging(logger = logger) { logger.i("Start loading of $plugin") with(plugin) { setupBotPlugin(koin) diff --git a/bot/src/main/kotlin/dev/inmo/plagubot/config/DatabaseConfig.kt b/bot/src/main/kotlin/dev/inmo/plagubot/config/DatabaseConfig.kt index 5a8cd0e..7e0cb4b 100644 --- a/bot/src/main/kotlin/dev/inmo/plagubot/config/DatabaseConfig.kt +++ b/bot/src/main/kotlin/dev/inmo/plagubot/config/DatabaseConfig.kt @@ -5,8 +5,8 @@ import dev.inmo.kslog.common.logger import kotlinx.coroutines.delay import kotlinx.serialization.Serializable import kotlinx.serialization.Transient -import org.jetbrains.exposed.sql.Database -import org.jetbrains.exposed.sql.transactions.transactionManager +import org.jetbrains.exposed.v1.jdbc.Database +import org.jetbrains.exposed.v1.jdbc.transactions.transactionManager import org.koin.core.scope.Scope import org.sqlite.JDBC import java.lang.Exception diff --git a/build.gradle b/build.gradle index 683279b..b42291e 100644 --- a/build.gradle +++ b/build.gradle @@ -34,8 +34,8 @@ allprojects { repositories { mavenCentral() mavenLocal() - maven { url 'https://jitpack.io' } maven { url "https://nexus.inmo.dev/repository/maven-releases/" } + maven { url 'https://jitpack.io' } } } diff --git a/plugin/src/main/kotlin/dev/inmo/plagubot/KoinDatabaseExtensions.kt b/plugin/src/main/kotlin/dev/inmo/plagubot/KoinDatabaseExtensions.kt index d3ed49d..ee0578d 100644 --- a/plugin/src/main/kotlin/dev/inmo/plagubot/KoinDatabaseExtensions.kt +++ b/plugin/src/main/kotlin/dev/inmo/plagubot/KoinDatabaseExtensions.kt @@ -1,6 +1,6 @@ package dev.inmo.plagubot -import org.jetbrains.exposed.sql.Database +import org.jetbrains.exposed.v1.jdbc.Database import org.koin.core.Koin import org.koin.core.scope.Scope diff --git a/plugin/src/main/kotlin/dev/inmo/plagubot/KoinExtensions.kt b/plugin/src/main/kotlin/dev/inmo/plagubot/KoinExtensions.kt index 18585df..df334d9 100644 --- a/plugin/src/main/kotlin/dev/inmo/plagubot/KoinExtensions.kt +++ b/plugin/src/main/kotlin/dev/inmo/plagubot/KoinExtensions.kt @@ -5,7 +5,6 @@ import kotlinx.serialization.KSerializer import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonObject import kotlinx.serialization.serializer -import org.jetbrains.exposed.sql.Database import org.koin.core.Koin import org.koin.core.module.Module import org.koin.core.scope.Scope diff --git a/plugin/src/main/kotlin/dev/inmo/plagubot/Plugin.kt b/plugin/src/main/kotlin/dev/inmo/plagubot/Plugin.kt index 769f184..4c77132 100644 --- a/plugin/src/main/kotlin/dev/inmo/plagubot/Plugin.kt +++ b/plugin/src/main/kotlin/dev/inmo/plagubot/Plugin.kt @@ -28,6 +28,7 @@ interface Plugin : StartPlugin { * @param scope The scope of [org.koin.core.module.Module.single] of bot definition * @param params Params (in fact, the whole bot config) */ + @Suppress("DEPRECATION") fun KtorRequestsExecutorBuilder.setupBotClient(scope: Scope, params: JsonObject) = setupBotClient() /** diff --git a/plugin/src/main/kotlin/dev/inmo/plagubot/PluginSerializer.kt b/plugin/src/main/kotlin/dev/inmo/plagubot/PluginSerializer.kt index d3d89a4..9067412 100644 --- a/plugin/src/main/kotlin/dev/inmo/plagubot/PluginSerializer.kt +++ b/plugin/src/main/kotlin/dev/inmo/plagubot/PluginSerializer.kt @@ -7,7 +7,6 @@ import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder -@Serializer(Plugin::class) class PluginSerializer : KSerializer { override val descriptor: SerialDescriptor get() = String.serializer().descriptor