Merge pull request #119 from InsanusMokrassar/10.9.0

10.9.0
revert sqlite
2025-12-05 13:55:53 +00:00 · 2025-10-21 23:13:32 +06:00 · 2025-10-21 23:13:22 +06:00 · 2025-10-21 23:12:35 +06:00 · 2025-10-21 23:03:43 +06:00 · 2025-09-04 17:31:52 +06:00
9 changed files with 128 additions and 66 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,36 @@
 # Changelog

+## 10.9.0
+
+* `Versions`:
+    * `kotlin`: `2.2.20`
+    * `microutils`: `0.26.6`
+    * `tgbotapi`: `30.0.0`
+    * `koin`: `4.1.1`
+
+## 10.8.0
+
+* `Versions`:
+    * `kotlin`: `2.2.10`
+    * `microutils`: `0.26.3`
+    * `tgbotapi`: `28.0.1`
+
+## 10.7.0
+
+* `Versions`:
+  * `kotlin`: `2.2.0`
+  * `serialization`: `1.9.0`
+  * `microutils`: `0.26.2`
+  * `tgbotapi`: `27.1.1`
+  * `koin`: `4.1.0`
+
+## 10.6.0
+
+* `Versions`:
+  * `microutils`: `0.25.8`
+  * `tgbotapi`: `26.0.0`
+  * `sqlite`: `3.50.1.0`
+
 ## 10.5.0

 * `Versions`:
--- a/bot/publish.gradle
+++ b/bot/publish.gradle
@@ -1,5 +1,7 @@
+
 apply plugin: 'maven-publish'

+
 task javadocJar(type: Jar) {
    from javadoc
    archiveClassifier = 'javadoc'
@@ -48,30 +50,28 @@ publishing {
                    
                }
            }
-            repositories {
-                if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
-                    maven {
-                        name = "InmoNexus"
-                        url = uri("https://nexus.inmo.dev/repository/maven-releases/")
-                
-                        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')
-                        }
-                
-                    }
+        }
+    }
+    repositories {
+        if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
+            maven {
+                name = "InmoNexus"
+                url = uri("https://nexus.inmo.dev/repository/maven-releases/")
+        
+                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')
                }
-                if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-                    maven {
-                        name = "sonatype"
-                        url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                
-                        credentials {
-                            username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                            password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-                        }
-                
-                    }
+            }
+        }
+        if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+            maven {
+                name = "sonatype"
+                url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
+        
+                credentials {
+                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
                }
            }
        }
@@ -80,13 +80,13 @@ publishing {

 if (project.hasProperty("signing.gnupg.keyName")) {
    apply plugin: 'signing'
-    
+
    signing {
        useGpgCmd()
-    
+
        sign publishing.publications
    }
-    
+
    task signAll {
        tasks.withType(Sign).forEach {
            dependsOn(it)
--- 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":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,24 @@ buildscript {
    }
 }

+plugins {
+    alias(libs.plugins.nmcp.aggregation)
+}
+
+
+if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+    nmcpAggregation {
+        centralPortal {
+            username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+            password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+            validationTimeout = Duration.ofHours(4)
+            publishingType = System.getenv('PUBLISHING_TYPE') != "" ? System.getenv('PUBLISHING_TYPE') : "USER_MANAGED"
+        }
+
+        publishAllProjectsProbablyBreakingProjectIsolation()
+    }
+}
+
 allprojects {
    repositories {
        mavenCentral()
--- a/github_release.gradle
+++ b/github_release.gradle
@@ -11,12 +11,19 @@ private String getCurrentVersionChangelog() {
    return changelogDataOS.toString().trim()
 }

-if (new File(projectDir, "secret.gradle").exists()) {
-    apply from: './secret.gradle'
+def githubTokenVariableName = "GITHUB_RELEASE_TOKEN"
+def githubTokenVariableFromEnv = System.getenv(githubTokenVariableName)
+
+def secretFile = new File(projectDir, "secret.gradle")
+if (secretFile.exists() || project.hasProperty(githubTokenVariableName) || (githubTokenVariableFromEnv != "" && githubTokenVariableFromEnv != null)) {
+    if (secretFile.exists()) {
+        apply from: './secret.gradle'
+    }
    apply plugin: "com.github.breadmoirai.github-release"
+    def githubReleaseToken = project.hasProperty(githubTokenVariableName) ? project.property(githubTokenVariableName).toString() : githubTokenVariableFromEnv

    githubRelease {
-        token "${project.property('GITHUB_RELEASE_TOKEN')}"
+        token githubReleaseToken

        releaseAssets.from('bot/build/distributions')

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

 group=dev.inmo
-version=10.5.0
+version=10.9.0
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,22 +1,24 @@
 [versions]

-kt = "2.1.20"
-kt-serialization = "1.8.1"
+kt = "2.2.20"
+kt-serialization = "1.9.0"
 kt-coroutines = "1.10.2"

-microutils = "0.25.5"
-tgbotapi = "24.0.2"
+microutils = "0.26.6"
+tgbotapi = "30.0.0"

-ksp = "2.1.20-1.0.31"
+ksp = "2.2.20-2.0.4"

 jb-exposed = "0.61.0"
-jb-dokka = "2.0.0"
+jb-dokka = "2.1.0"

-sqlite = "3.49.1.0"
+sqlite = "3.50.1.0"

 gh-release = "2.5.2"

-koin = "4.0.4"
+koin = "4.1.1"
+
+nmcp = "1.2.0"

 [libraries]

@@ -48,3 +50,7 @@ buildscript-kt-serialization = { module = "org.jetbrains.kotlin:kotlin-serializa
 buildscript-jb-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "jb-dokka" }
 buildscript-gh-release = { module = "com.github.breadmoirai:github-release", version.ref = "gh-release" }
 buildscript-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
+
+[plugins]
+
+nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" }
--- a/plugin/publish.gradle
+++ b/plugin/publish.gradle
@@ -1,5 +1,7 @@
+
 apply plugin: 'maven-publish'

+
 task javadocJar(type: Jar) {
    from javadoc
    archiveClassifier = 'javadoc'
@@ -48,30 +50,28 @@ publishing {
                    
                }
            }
-            repositories {
-                if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
-                    maven {
-                        name = "InmoNexus"
-                        url = uri("https://nexus.inmo.dev/repository/maven-releases/")
-                
-                        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')
-                        }
-                
-                    }
+        }
+    }
+    repositories {
+        if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
+            maven {
+                name = "InmoNexus"
+                url = uri("https://nexus.inmo.dev/repository/maven-releases/")
+        
+                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')
                }
-                if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-                    maven {
-                        name = "sonatype"
-                        url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                
-                        credentials {
-                            username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                            password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-                        }
-                
-                    }
+            }
+        }
+        if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+            maven {
+                name = "sonatype"
+                url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
+        
+                credentials {
+                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
                }
            }
        }
@@ -80,13 +80,13 @@ publishing {

 if (project.hasProperty("signing.gnupg.keyName")) {
    apply plugin: 'signing'
-    
+
    signing {
        useGpgCmd()
-    
+
        sign publishing.publications
    }
-    
+
    task signAll {
        tasks.withType(Sign).forEach {
            dependsOn(it)
--- 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":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
Author	SHA1	Message	Date
InsanusMokrassar	fdff6c7178	Merge pull request #119 from InsanusMokrassar/10.9.0 10.9.0	2025-10-21 23:13:32 +06:00
InsanusMokrassar	636614e4e3	revert sqlite	2025-10-21 23:13:22 +06:00
InsanusMokrassar	9747bcd79d	update dependencies	2025-10-21 23:12:35 +06:00
InsanusMokrassar	f8b7e261f4	start 10.9.0	2025-10-21 23:03:43 +06:00
InsanusMokrassar	0a5272b1c8	Merge pull request #118 from InsanusMokrassar/10.8.0 10.8.0	2025-09-04 17:31:52 +06:00
InsanusMokrassar	214403ee88	update dependencies	2025-09-04 17:30:46 +06:00
InsanusMokrassar	c19a4bbcf9	start 10.8.0	2025-09-04 17:22:51 +06:00
InsanusMokrassar	58ba7c1e32	update dependencies	2025-08-04 13:33:02 +06:00
InsanusMokrassar	431b1bf1f2	start 10.7.0	2025-08-04 13:19:26 +06:00
InsanusMokrassar	ad23cc9202	Update github_release.gradle	2025-06-27 10:03:30 +06:00
InsanusMokrassar	e9bf2dfc64	Update github_release.gradle	2025-06-27 09:57:22 +06:00
InsanusMokrassar	61ea5e93b3	Merge pull request #115 from InsanusMokrassar/10.6.0 10.6.0	2025-06-27 09:36:26 +06:00
InsanusMokrassar	ff0d819bd2	update nmcp config	2025-06-27 09:35:43 +06:00
InsanusMokrassar	1919d8840a	update dependencies	2025-06-27 09:31:27 +06:00
InsanusMokrassar	98c539b198	update publication way	2025-06-16 17:18:37 +06:00
InsanusMokrassar	7e02bb3583	start 10.6.0	2025-06-16 17:14:09 +06:00
InsanusMokrassar	d6e10d1dd1	Merge pull request #114 from InsanusMokrassar/10.5.0 10.5.0	2025-04-30 13:29:34 +06:00