Skip to content

Commit a9c4f78

Browse files
fix of build
1 parent 728270c commit a9c4f78

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package dev.inmo.plagubot
22

33
import dev.inmo.kslog.common.*
44
import dev.inmo.micro_utils.common.Warning
5+
import dev.inmo.micro_utils.coroutines.runCatchingLogging
56
import dev.inmo.micro_utils.coroutines.runCatchingSafely
67
import dev.inmo.micro_utils.fsm.common.State
78
import 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)

bot/src/main/kotlin/dev/inmo/plagubot/config/DatabaseConfig.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import dev.inmo.kslog.common.logger
55
import kotlinx.coroutines.delay
66
import kotlinx.serialization.Serializable
77
import 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
1010
import org.koin.core.scope.Scope
1111
import org.sqlite.JDBC
1212
import java.lang.Exception

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

plugin/src/main/kotlin/dev/inmo/plagubot/KoinDatabaseExtensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.inmo.plagubot
22

3-
import org.jetbrains.exposed.sql.Database
3+
import org.jetbrains.exposed.v1.jdbc.Database
44
import org.koin.core.Koin
55
import org.koin.core.scope.Scope
66

plugin/src/main/kotlin/dev/inmo/plagubot/KoinExtensions.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import kotlinx.serialization.KSerializer
55
import kotlinx.serialization.json.Json
66
import kotlinx.serialization.json.JsonObject
77
import kotlinx.serialization.serializer
8-
import org.jetbrains.exposed.sql.Database
98
import org.koin.core.Koin
109
import org.koin.core.module.Module
1110
import org.koin.core.scope.Scope

plugin/src/main/kotlin/dev/inmo/plagubot/Plugin.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff 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
/**

plugin/src/main/kotlin/dev/inmo/plagubot/PluginSerializer.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import kotlinx.serialization.descriptors.SerialDescriptor
77
import kotlinx.serialization.encoding.Decoder
88
import kotlinx.serialization.encoding.Encoder
99

10-
@Serializer(Plugin::class)
1110
class PluginSerializer : KSerializer<Plugin> {
1211
override val descriptor: SerialDescriptor
1312
get() = String.serializer().descriptor

0 commit comments

Comments
 (0)