update dependencies

start 8.0.0
Merge pull request #92 from InsanusMokrassar/7.4.2
2025-12-05 13:55:53 +00:00 · 2024-01-12 20:12:58 +06:00 · 2024-01-12 20:11:29 +06:00 · 2023-12-24 23:25:42 +06:00 · 2023-12-24 23:24:04 +06:00 · 2023-12-24 23:17:29 +06:00
12 changed files with 71 additions and 39 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Changelog

+## 8.0.0
+
+* `Versions`:
+  * `tgbotapi`: `1.0.0`
+  * `MicroUtils`: `0.20.26`
+  * `Exposed`: `0.46.0`
+
+## 7.4.2
+
+* `Versions`:
+  * `Kotlin`: `1.9.22`
+  * `tgbotapi`: `9.4.3`
+  * `MicroUtils`: `0.20.23`
+  * `Koin`: `3.5.7`
+
+## 7.4.1
+
+* `Versions`:
+  * `Serialization`: `1.6.2`
+  * `tgbotapi`: `9.4.2`
+  * `Exposed`: `0.45.0`
+  * `SQLite`: `3.44.1.0`
+  * `MicroUtils`: `0.20.19`
+  * `uuid`: `0.8.2`
+  * `ktor`: `2.3.7`
+
 ## 7.3.0

 * `Versions`:
--- a/bot/publish.gradle
+++ b/bot/publish.gradle
@@ -49,18 +49,14 @@ publishing {
                }
            }
            repositories {
-                if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
+                if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
                    maven {
-                        name = "Gitea"
-                        url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
+                        name = "InmoNexus"
+                        url = uri("https://nexus.inmo.dev/repository/maven-releases/")
                
-                        credentials(HttpHeaderCredentials) {
-                            name = "Authorization"
-                            value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
-                        }
-                
-                        authentication {
-                            header(HttpHeaderAuthentication)
+                        credentials {
+                            username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
+                            password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
                        }
                
                    }
--- a/bot/publish.kpsb
+++ b/bot/publish.kpsb
@@ -1 +1 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Bot","description":"Base PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"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"}},"type":"JVM"}
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Bot","description":"Base PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
--- a/bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt
+++ b/bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt
@@ -8,6 +8,7 @@ import dev.inmo.micro_utils.fsm.common.StatesManager
 import dev.inmo.micro_utils.fsm.common.managers.*
 import dev.inmo.micro_utils.koin.getAllDistinct
 import dev.inmo.plagubot.config.*
+import dev.inmo.tgbotapi.bot.ktor.KtorRequestsExecutorBuilder
 import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.api.webhook.deleteWebhook
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
@@ -37,7 +38,20 @@ data class PlaguBot(
    private val config: Config
 ) : Plugin {
    @Transient
-    private val bot = telegramBot(config.botToken)
+    private val bot = telegramBot(
+        token = config.botToken,
+        apiUrl = config.botApiServer
+    ) {
+        setupBotClient()
+    }
+
+    override fun KtorRequestsExecutorBuilder.setupBotClient() {
+        config.plugins.forEach {
+            with(it) {
+                setupBotClient()
+            }
+        }
+    }

    override fun Module.setupDI(database: Database, params: JsonObject) {
        single { config }
--- a/bot/src/main/kotlin/dev/inmo/plagubot/config/Config.kt
+++ b/bot/src/main/kotlin/dev/inmo/plagubot/config/Config.kt
@@ -2,6 +2,7 @@ package dev.inmo.plagubot.config

 import dev.inmo.micro_utils.common.Warning
 import dev.inmo.plagubot.Plugin
+import dev.inmo.tgbotapi.utils.telegramBotAPIDefaultUrl
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

@@ -12,4 +13,5 @@ data class Config(
    val plugins: List<Plugin>,
    @SerialName("database")
    val databaseConfig: DatabaseConfig = DatabaseConfig(),
+    val botApiServer: String = telegramBotAPIDefaultUrl
 )
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ allprojects {
        mavenCentral()
        mavenLocal()
        maven { url 'https://jitpack.io' }
-        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
+        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
    }
 }

--- a/gradle.properties
+++ b/gradle.properties
@@ -5,4 +5,4 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true

 group=dev.inmo
-version=7.4.0
+version=8.0.0
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,27 +1,22 @@
 [versions]

-kt = "1.9.21"
-kt-serialization = "1.6.1"
+kt = "1.9.22"
+kt-serialization = "1.6.2"
 kt-coroutines = "1.7.3"

-microutils = "0.20.15"
-tgbotapi = "9.4.1"
+microutils = "0.20.26"
+tgbotapi = "10.0.0"

-ksp = "1.9.20-1.0.14"
+ksp = "1.9.22-1.0.16"

-jb-exposed = "0.44.1"
+jb-exposed = "0.46.0"
 jb-dokka = "1.9.10"

-sqlite = "3.43.0.0"
-
-klock = "4.0.10"
-uuid = "0.8.1"
-
-ktor = "2.3.6"
+sqlite = "3.44.1.0"

 gh-release = "2.4.1"

-koin = "3.5.0"
+koin = "3.5.3"

 [libraries]

--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/plugin/publish.gradle
+++ b/plugin/publish.gradle
@@ -49,18 +49,14 @@ publishing {
                }
            }
            repositories {
-                if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
+                if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
                    maven {
-                        name = "Gitea"
-                        url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
+                        name = "InmoNexus"
+                        url = uri("https://nexus.inmo.dev/repository/maven-releases/")
                
-                        credentials(HttpHeaderCredentials) {
-                            name = "Authorization"
-                            value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
-                        }
-                
-                        authentication {
-                            header(HttpHeaderAuthentication)
+                        credentials {
+                            username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
+                            password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
                        }
                
                    }
--- a/plugin/publish.kpsb
+++ b/plugin/publish.kpsb
@@ -1 +1 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Plugin","description":"Base dependency for whole PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"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"}},"type":"JVM"}
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Plugin","description":"Base dependency for whole PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
--- a/plugin/src/main/kotlin/dev/inmo/plagubot/Plugin.kt
+++ b/plugin/src/main/kotlin/dev/inmo/plagubot/Plugin.kt
@@ -1,6 +1,7 @@
 package dev.inmo.plagubot

 import dev.inmo.micro_utils.fsm.common.State
+import dev.inmo.tgbotapi.bot.ktor.KtorRequestsExecutorBuilder
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextWithFSM
 import kotlinx.serialization.Serializable
@@ -18,6 +19,8 @@ import org.koin.core.module.Module
 */
@Serializable(PluginSerializer::class)
 interface Plugin {
+    fun KtorRequestsExecutorBuilder.setupBotClient() {}
+
    /**
     * This method will be called when this plugin should configure di module based on the incoming params
     */
Author	SHA1	Message	Date
InsanusMokrassar	0d27a4f6f7	update dependencies	2024-01-12 20:12:58 +06:00
InsanusMokrassar	f9d131866f	start 8.0.0	2024-01-12 20:11:29 +06:00
InsanusMokrassar	451b2bbc39	Merge pull request #92 from InsanusMokrassar/7.4.2 7.4.2	2023-12-24 23:25:42 +06:00
InsanusMokrassar	d51e2d8e7c	fix of #90 and #91	2023-12-24 23:24:04 +06:00
InsanusMokrassar	6c45a8c848	update dependencies	2023-12-24 23:17:29 +06:00
InsanusMokrassar	8a7e05580d	start 7.4.2	2023-12-24 23:14:24 +06:00
InsanusMokrassar	8b78f2901f	Merge pull request #89 from InsanusMokrassar/7.4.1 7.4.1	2023-12-10 14:47:39 +06:00
InsanusMokrassar	cad8743ced	update dependencies and fill changelog	2023-12-10 14:46:13 +06:00
InsanusMokrassar	8f827e9f79	start 7.4.1	2023-12-10 14:34:52 +06:00
InsanusMokrassar	28039df992	Merge pull request #88 from InsanusMokrassar/7.4.0 7.4.0	2023-11-26 20:56:04 +06:00