File tree Expand file tree Collapse file tree 7 files changed +7
-7
lines changed
bot/src/main/kotlin/dev/inmo/plagubot
plugin/src/main/kotlin/dev/inmo/plagubot Expand file tree Collapse file tree 7 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -2,6 +2,7 @@ package dev.inmo.plagubot
22
33import dev.inmo.kslog.common.*
44import dev.inmo.micro_utils.common.Warning
5+ import dev.inmo.micro_utils.coroutines.runCatchingLogging
56import dev.inmo.micro_utils.coroutines.runCatchingSafely
67import dev.inmo.micro_utils.fsm.common.State
78import dev.inmo.micro_utils.fsm.common.StatesManager
@@ -107,7 +108,7 @@ object PlaguBot : Plugin {
107108 */
108109 override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin (koin : Koin ) {
109110 koin.plugins.filter { it != = this @PlaguBot }.forEach { plugin ->
110- runCatchingSafely {
111+ runCatchingLogging(logger = logger) {
111112 logger.i(" Start loading of $plugin " )
112113 with (plugin) {
113114 setupBotPlugin(koin)
Original file line number Diff line number Diff line change @@ -5,8 +5,8 @@ import dev.inmo.kslog.common.logger
55import kotlinx.coroutines.delay
66import kotlinx.serialization.Serializable
77import kotlinx.serialization.Transient
8- import org.jetbrains.exposed.sql .Database
9- import org.jetbrains.exposed.sql .transactions.transactionManager
8+ import org.jetbrains.exposed.v1.jdbc .Database
9+ import org.jetbrains.exposed.v1.jdbc .transactions.transactionManager
1010import org.koin.core.scope.Scope
1111import org.sqlite.JDBC
1212import java.lang.Exception
Original file line number Diff line number Diff line change @@ -34,8 +34,8 @@ allprojects {
3434 repositories {
3535 mavenCentral()
3636 mavenLocal()
37- maven { url ' https://jitpack.io' }
3837 maven { url " https://nexus.inmo.dev/repository/maven-releases/" }
38+ maven { url ' https://jitpack.io' }
3939 }
4040}
4141
Original file line number Diff line number Diff line change 11package dev.inmo.plagubot
22
3- import org.jetbrains.exposed.sql .Database
3+ import org.jetbrains.exposed.v1.jdbc .Database
44import org.koin.core.Koin
55import org.koin.core.scope.Scope
66
Original file line number Diff line number Diff line change @@ -5,7 +5,6 @@ import kotlinx.serialization.KSerializer
55import kotlinx.serialization.json.Json
66import kotlinx.serialization.json.JsonObject
77import kotlinx.serialization.serializer
8- import org.jetbrains.exposed.sql.Database
98import org.koin.core.Koin
109import org.koin.core.module.Module
1110import org.koin.core.scope.Scope
Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ interface Plugin : StartPlugin {
2828 * @param scope The scope of [org.koin.core.module.Module.single] of bot definition
2929 * @param params Params (in fact, the whole bot config)
3030 */
31+ @Suppress(" DEPRECATION" )
3132 fun KtorRequestsExecutorBuilder.setupBotClient (scope : Scope , params : JsonObject ) = setupBotClient()
3233
3334 /* *
Original file line number Diff line number Diff line change @@ -7,7 +7,6 @@ import kotlinx.serialization.descriptors.SerialDescriptor
77import kotlinx.serialization.encoding.Decoder
88import kotlinx.serialization.encoding.Encoder
99
10- @Serializer(Plugin ::class )
1110class PluginSerializer : KSerializer <Plugin > {
1211 override val descriptor: SerialDescriptor
1312 get() = String .serializer().descriptor
You can’t perform that action at this time.
0 commit comments