Update gradle.properties

2025-12-05 13:55:53 +00:00 · 2023-11-26 18:48:57 +06:00
13 changed files with 40 additions and 75 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,34 +1,7 @@
 # Changelog

-## 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`:
-  * `Kotlin`: `1.9.21`
-  * `Serialization`: `1.6.1`
-  * `tgbotapi`: `9.4.1`
-  * `ktor`: `2.3.6`
-  * `KSLog`: Removed explicit dependency, now it is declared in tgbotapi
-  * `MicroUtils`: `0.20.15`
-
 ## 7.2.3

 * `Versions`:
--- a/bot/build.gradle
+++ b/bot/build.gradle
@@ -20,6 +20,7 @@ dependencies {
    api libs.tgbotapi.behaviourBuilder.fsm
    api libs.microutils.repos.exposed
    api libs.microutils.koin
+    api libs.kslog

    api libs.sqlite

--- a/bot/publish.gradle
+++ b/bot/publish.gradle
@@ -49,14 +49,18 @@ publishing {
                }
            }
            repositories {
-                if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
+                if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
                    maven {
-                        name = "InmoNexus"
-                        url = uri("https://nexus.inmo.dev/repository/maven-releases/")
+                        name = "Gitea"
+                        url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
                
-                        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')
+                        credentials(HttpHeaderCredentials) {
+                            name = "Authorization"
+                            value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
+                        }
+                
+                        authentication {
+                            header(HttpHeaderAuthentication)
                        }
                
                    }
--- 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":"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"}
+{"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"}
--- a/bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt
+++ b/bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt
@@ -8,7 +8,6 @@ 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.*
@@ -38,20 +37,7 @@ data class PlaguBot(
    private val config: Config
 ) : Plugin {
    @Transient
-    private val bot = telegramBot(
-        token = config.botToken,
-        apiUrl = config.botApiServer
-    ) {
-        setupBotClient()
-    }
-
-    override fun KtorRequestsExecutorBuilder.setupBotClient() {
-        config.plugins.forEach {
-            with(it) {
-                setupBotClient()
-            }
-        }
-    }
+    private val bot = telegramBot(config.botToken)

    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,7 +2,6 @@ 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

@@ -13,5 +12,4 @@ 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://nexus.inmo.dev/repository/maven-releases/" }
+        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
    }
 }

--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
-org.gradle.jvmargs=-Xmx2048m
+qorg.gradle.jvmargs=-Xmx2048m
 kotlin.code.style=official
 org.gradle.parallel=true
 kotlin.js.generate.externals=true
 kotlin.incremental=true

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

-kt = "1.9.22"
-kt-serialization = "1.6.2"
+kt = "1.9.20"
+kt-serialization = "1.6.0"
 kt-coroutines = "1.7.3"

-microutils = "0.20.23"
-tgbotapi = "9.4.3"
+microutils = "0.20.12"
+tgbotapi = "9.3.0"
+kslog = "1.2.3"

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

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

-sqlite = "3.44.1.0"
+sqlite = "3.43.0.0"

 klock = "4.0.10"
-uuid = "0.8.2"
+uuid = "0.8.1"

-ktor = "2.3.7"
+ktor = "2.3.5"

 gh-release = "2.4.1"

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

 [libraries]

@@ -35,6 +36,7 @@ tgbotapi-behaviourBuilder-fsm = { module = "dev.inmo:tgbotapi.behaviour_builder.
 microutils-repos-exposed = { module = "dev.inmo:micro_utils.repos.exposed", version.ref = "microutils" }
 microutils-koin = { module = "dev.inmo:micro_utils.koin", version.ref = "microutils" }
 microutils-koin-generator = { module = "dev.inmo:micro_utils.koin.generator", version.ref = "microutils" }
+kslog = { module = "dev.inmo:kslog", version.ref = "kslog" }

 koin = { module = "io.insert-koin:koin-core", version.ref = "koin" }

--- 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.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/plugin/publish.gradle
+++ b/plugin/publish.gradle
@@ -49,14 +49,18 @@ publishing {
                }
            }
            repositories {
-                if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
+                if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
                    maven {
-                        name = "InmoNexus"
-                        url = uri("https://nexus.inmo.dev/repository/maven-releases/")
+                        name = "Gitea"
+                        url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
                
-                        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')
+                        credentials(HttpHeaderCredentials) {
+                            name = "Authorization"
+                            value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
+                        }
+                
+                        authentication {
+                            header(HttpHeaderAuthentication)
                        }
                
                    }
--- 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":"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"}
+{"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"}
--- a/plugin/src/main/kotlin/dev/inmo/plagubot/Plugin.kt
+++ b/plugin/src/main/kotlin/dev/inmo/plagubot/Plugin.kt
@@ -1,7 +1,6 @@
 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
@@ -19,8 +18,6 @@ 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
     */