diff --git a/.github/workflows/packages_publishing.yml b/.github/workflows/packages_publishing.yml index d37efbf290..29f6469685 100644 --- a/.github/workflows/packages_publishing.yml +++ b/.github/workflows/packages_publishing.yml @@ -22,9 +22,10 @@ jobs: run: ./gradlew build - name: Publish to Gitea continue-on-error: true - run: ./gradlew publishAllPublicationsToGiteaRepository + run: ./gradlew publishAllPublicationsToInmoNexusRepository env: - GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} + INMONEXUS_USER: ${{ secrets.INMONEXUS_USER }} + INMONEXUS_PASSWORD: ${{ secrets.INMONEXUS_PASSWORD }} - name: Publish to GithubPackages continue-on-error: true run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel diff --git a/CHANGELOG.md b/CHANGELOG.md index ec139c5ccb..829b650f97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # TelegramBotAPI changelog +## 9.4.2 + +* `Version`: + * `Serialization`: `1.6.1` -> `1.6.2` + * `Ktor`: `2.3.6` -> `2.3.7` + * `MicroUtils`: `0.20.15` -> `0.20.19` + * `UUID`: `0.8.1` -> `0.8.2` + ## 9.4.1 * Replace warning about two bots from `LongPolling` to `DefaultKtorRequestsExecutor` diff --git a/build.gradle b/build.gradle index 20b3a8a096..da42ecdfaf 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ allprojects { mavenLocal() mavenCentral() google() - maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" } + maven { url "https://nexus.inmo.dev/repository/maven-releases/" } } if (it != rootProject.findProject("docs")) { tasks.whenTaskAdded { task -> diff --git a/gradle.properties b/gradle.properties index 99c4d6ad57..b24b1124f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,4 @@ kotlin.incremental=true kotlin.incremental.js=true library_group=dev.inmo -library_version=9.4.1 +library_version=9.4.2 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4a0944291d..88d8d3ab95 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,19 +1,19 @@ [versions] kotlin = "1.9.21" -kotlin-serialization = "1.6.1" +kotlin-serialization = "1.6.2" kotlin-coroutines = "1.7.3" javax-activation = "1.1.1" korlibs = "4.0.10" -uuid = "0.8.1" -ktor = "2.3.6" +uuid = "0.8.2" +ktor = "2.3.7" -ksp = "1.9.20-1.0.14" -kotlin-poet = "1.15.1" +ksp = "1.9.21-1.0.15" +kotlin-poet = "1.15.3" -microutils = "0.20.15" +microutils = "0.20.19" kslog = "1.3.1" versions = "0.50.0" diff --git a/publish.gradle b/publish.gradle index 87124750ed..01ac2ba18a 100644 --- a/publish.gradle +++ b/publish.gradle @@ -50,18 +50,14 @@ publishing { } } - 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/publish.kpsb b/publish.kpsb index e53df0364c..f1efd97f79 100644 --- a/publish.kpsb +++ b/publish.kpsb @@ -1 +1 @@ -{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"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"}}} \ No newline at end of file +{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"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"}}} \ No newline at end of file