small cleanup of updates

org.jetbrains.kotlin:kotlin-stdlib 2.2.20 -> 2.2.21
com.google.devtools.ksp:symbol-processing-gradle-plugin 2.2.20-2.0.4 -> 2.2.21-2.0.4
dev.inmo:micro_utils 0.26.6 -> 0.26.8
dev.inmo:tgbotapi 30.0.0 -> 30.0.2
com.gradleup.nmcp:nmcp-aggregation 1.2.0 -> 1.3.0

CHANGELOG.md

@@ -1,5 +1,75 @@
 # Changelog
 
+## 10.10.0
+
+* `Versions`:
+    * `kotlin`: `2.2.21`
+    * `microutils`: `0.26.8`
+    * `tgbotapi`: `30.0.2`
+
+## 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`:
+  * `kotlin`: `2.1.20`
+  * `serialization`: `1.8.1`
+  * `coroutines`: `1.10.2`
+  * `microutils`: `0.25.5`
+  * `tgbotapi`: `24.0.2`
+  * `exposed`: `0.61.0`
+  * `sqlite`: `3.49.1.0`
+  * `koin`: `4.0.4`
+
+## 10.4.0
+
+* `Versions`:
+  * `microutils`: `0.24.6`
+  * `tgbotapi`: `23.2.0`
+  * `exposed`: `0.59.0`
+  * `sqlite`: `3.49.0.0`
+
+## 10.3.1
+
+* `Versions`:
+  * `kotlin`: `2.1.10`
+  * `serialization`: `1.8.0`
+  * `coroutines`: `1.10.1`
+  * `microutils`: `0.24.5`
+  * `tgbotapi`: `23.1.2`
+  * `exposed`: `0.58.0`
+  * `sqlite`: `3.48.0.0`
+  * `koin`: `4.0.2`
+
 ## 10.3.0
 
 * `Versions`:

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 {
+    repositories {
-                        name = "InmoNexus"
+        if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
-                        url = uri("https://nexus.inmo.dev/repository/maven-releases/")
+            maven {
+                name = "InmoNexus"
+                url = uri("https://nexus.inmo.dev/repository/maven-releases/")
         
-                        credentials {
+                credentials {
-                            username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
+                    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')
+                    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"
+        if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-                        url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+            maven {
+                name = "sonatype"
+                url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
         
-                        credentials {
+                credentials {
-                            username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                    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')
+                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-                        }
-                
-                    }
                 }
             }
         }

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"}

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()

github_release.gradle

@@ -11,12 +11,19 @@ private String getCurrentVersionChangelog() {
     return changelogDataOS.toString().trim()
 }
 
-if (new File(projectDir, "secret.gradle").exists()) {
+def githubTokenVariableName = "GITHUB_RELEASE_TOKEN"
-    apply from: './secret.gradle'
+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')
 

gradle.properties

@@ -5,4 +5,4 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true
 
 group=dev.inmo
-version=10.3.0
+version=10.10.0

gradle/libs.versions.toml

@@ -1,22 +1,24 @@
 [versions]
 
-kt = "2.1.0"
+kt = "2.2.21"
-kt-serialization = "1.7.3"
+kt-serialization = "1.9.0"
-kt-coroutines = "1.9.0"
+kt-coroutines = "1.10.2"
 
-microutils = "0.23.2"
+microutils = "0.26.8"
-tgbotapi = "22.0.0"
+tgbotapi = "30.0.2"
 
-ksp = "2.1.0-1.0.29"
+ksp = "2.3.2"
 
-jb-exposed = "0.57.0"
+jb-exposed = "0.61.0"
-jb-dokka = "1.9.20"
+jb-dokka = "2.1.0"
 
-sqlite = "3.47.1.0"
+sqlite = "3.50.1.0"
 
 gh-release = "2.5.2"
 
-koin = "4.0.0"
+koin = "4.1.1"
+
+nmcp = "1.3.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" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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 {
+    repositories {
-                        name = "InmoNexus"
+        if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
-                        url = uri("https://nexus.inmo.dev/repository/maven-releases/")
+            maven {
+                name = "InmoNexus"
+                url = uri("https://nexus.inmo.dev/repository/maven-releases/")
         
-                        credentials {
+                credentials {
-                            username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
+                    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')
+                    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"
+        if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-                        url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+            maven {
+                name = "sonatype"
+                url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
         
-                        credentials {
+                credentials {
-                            username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                    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')
+                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-                        }
-                
-                    }
                 }
             }
         }

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"}