From 7b6be48ba8e21541c766fb10978cd8c4735fdd94 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 25 Sep 2024 21:11:12 +0600 Subject: [PATCH 1/3] start 18.2.1 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b84e2df8e..7ee1d63423 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # TelegramBotAPI changelog +## 18.2.1 + ## 18.2.0 **THIS UPDATE CONTAINS SUPPORT OF [BOTS API 7.10](https://core.telegram.org/bots/api-changelog#september-6-2024)** diff --git a/gradle.properties b/gradle.properties index 720d1d9878..d8aad0d6cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,4 @@ kotlin.incremental=true kotlin.incremental.js=true library_group=dev.inmo -library_version=18.2.0 +library_version=18.2.1 From c3a3e9bd44b0928fb824e679fcb8cfd13049a184 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 25 Sep 2024 21:14:02 +0600 Subject: [PATCH 2/3] update dependencies --- CHANGELOG.md | 5 +++++ gradle/libs.versions.toml | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ee1d63423..0f95e282e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## 18.2.1 +* `Version`: + * `Serialization`: `1.7.2` -> `1.7.3` + * `Coroutines`: `1.8.1` -> `1.9.0` + * `MicroUtils`: `0.22.2` -> `0.22.3` + ## 18.2.0 **THIS UPDATE CONTAINS SUPPORT OF [BOTS API 7.10](https://core.telegram.org/bots/api-changelog#september-6-2024)** diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5c5f961e01..9ec3f5b1b2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] kotlin = "2.0.20" -kotlin-serialization = "1.7.2" -kotlin-coroutines = "1.8.1" +kotlin-serialization = "1.7.3" +kotlin-coroutines = "1.9.0" javax-activation = "1.1.1" @@ -10,10 +10,10 @@ korlibs = "5.4.0" uuid = "0.8.4" ktor = "2.3.12" -ksp = "2.0.20-1.0.24" +ksp = "2.0.20-1.0.25" kotlin-poet = "1.18.1" -microutils = "0.22.2" +microutils = "0.22.3" kslog = "1.3.6" versions = "0.51.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 45181329e9..6b74f0f6b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip From ce84e3c198a0e776cce16907cd4aafa4fadc48a2 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 25 Sep 2024 21:20:53 +0600 Subject: [PATCH 3/3] build fix --- .../dev/inmo/tgbotapi/extensions/utils/FlowsAggregation.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/FlowsAggregation.kt b/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/FlowsAggregation.kt index 3da9f65694..2be8bcb42e 100644 --- a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/FlowsAggregation.kt +++ b/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/FlowsAggregation.kt @@ -2,11 +2,10 @@ package dev.inmo.tgbotapi.extensions.utils import dev.inmo.micro_utils.coroutines.safely import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.channels.BroadcastChannel import kotlinx.coroutines.flow.* /** - * Analog of [merge] function for [Flow]s. The difference is in the usage of [BroadcastChannel] in this case + * Analog of [merge] function for [Flow]s. The difference is in the usage of [MutableSharedFlow] in this case */ fun aggregateFlows( withScope: CoroutineScope,