From cad8743cedbaa767d49f7e768becac0f836d6551 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 10 Dec 2023 14:46:13 +0600 Subject: [PATCH] update dependencies and fill changelog --- CHANGELOG.md | 9 +++++++++ bot/publish.gradle | 16 ++++++---------- bot/publish.kpsb | 2 +- build.gradle | 2 +- gradle/libs.versions.toml | 16 ++++++++-------- plugin/publish.gradle | 16 ++++++---------- plugin/publish.kpsb | 2 +- 7 files changed, 32 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90b7415..3df5699 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ ## 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`: diff --git a/bot/publish.gradle b/bot/publish.gradle index 906858b..9c4f0a4 100644 --- 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') } } diff --git a/bot/publish.kpsb b/bot/publish.kpsb index 30616b2..7519c3f 100644 --- 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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/build.gradle b/build.gradle index c5dd810..7f087dd 100644 --- 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/" } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6732161..827708d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,23 +1,23 @@ [versions] kt = "1.9.21" -kt-serialization = "1.6.1" +kt-serialization = "1.6.2" kt-coroutines = "1.7.3" -microutils = "0.20.15" -tgbotapi = "9.4.1" +microutils = "0.20.19" +tgbotapi = "9.4.2" -ksp = "1.9.20-1.0.14" +ksp = "1.9.21-1.0.15" -jb-exposed = "0.44.1" +jb-exposed = "0.45.0" jb-dokka = "1.9.10" -sqlite = "3.43.0.0" +sqlite = "3.44.1.0" klock = "4.0.10" -uuid = "0.8.1" +uuid = "0.8.2" -ktor = "2.3.6" +ktor = "2.3.7" gh-release = "2.4.1" diff --git a/plugin/publish.gradle b/plugin/publish.gradle index a03d771..5a56850 100644 --- 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') } } diff --git a/plugin/publish.kpsb b/plugin/publish.kpsb index 58d6397..debecc8 100644 --- 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"} \ No newline at end of file +{"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"} \ No newline at end of file