From 25285b2e8adbe16b8eba2b034f634dedf20650ec Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 25 Nov 2020 23:01:19 +0600 Subject: [PATCH 1/5] start 0.30.9 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c502be6719..85838b7d51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # TelegramBotAPI changelog +## 0.30.9 + ## 0.30.8 * `Common`: diff --git a/gradle.properties b/gradle.properties index 3bd3c4ec36..97e1d4241c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,6 +17,6 @@ micro_utils_version=0.4.3 javax_activation_version=1.1.1 library_group=dev.inmo -library_version=0.30.8 +library_version=0.30.9 github_release_plugin_version=2.2.12 From 9a8175d1c8e90597db0666537fd9f4d749e7764b Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 25 Nov 2020 23:02:54 +0600 Subject: [PATCH 2/5] update dependencies --- CHANGELOG.md | 5 +++++ gradle.properties | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85838b7d51..efc63bec33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## 0.30.9 +* `Common`: + * `Version`: + * `UUID`: `0.2.2` -> `0.2.3` + * `MicroUtils`: `0.4.3` -> `0.4.5` + ## 0.30.8 * `Common`: diff --git a/gradle.properties b/gradle.properties index 97e1d4241c..b3ef153e51 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,10 +9,10 @@ kotlin_version=1.4.20 kotlin_coroutines_version=1.4.1 kotlin_serialisation_runtime_version=1.0.1 klock_version=2.0.0 -uuid_version=0.2.2 +uuid_version=0.2.3 ktor_version=1.4.2 -micro_utils_version=0.4.3 +micro_utils_version=0.4.5 javax_activation_version=1.1.1 From 2cc66ef13c7b14410f6e991a308319b678f18293 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 25 Nov 2020 23:09:49 +0600 Subject: [PATCH 3/5] BowlingDiceAnimationType --- CHANGELOG.md | 2 ++ .../kotlin/dev/inmo/tgbotapi/types/Common.kt | 5 ++++- .../dev/inmo/tgbotapi/types/dice/DiceAnimationType.kt | 11 +++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index efc63bec33..06404e2600 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ * `Version`: * `UUID`: `0.2.2` -> `0.2.3` * `MicroUtils`: `0.4.3` -> `0.4.5` +* `Core`: + * Add `BowlingDiceAnimationType` ## 0.30.8 diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt index 7ca41d5a20..1afd6ec0af 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt @@ -65,7 +65,10 @@ val dartsAndCubeDiceResultLimit = 1 .. 6 @Deprecated("Renamed", ReplaceWith("dartsAndCubeDiceResultLimit", "dev.inmo.tgbotapi.types.dartsAndCubeDiceResultLimit")) val diceResultLimit get() = dartsAndCubeDiceResultLimit -val basketballAndFootballDiceResultLimit = 1 .. 5 +val basketballBowlingAndFootballDiceResultLimit = 1 .. 5 +@Deprecated("Renamed", ReplaceWith("basketballBowlingAndFootballDiceResultLimit", "dev.inmo.tgbotapi.types.basketballBowlingAndFootballDiceResultLimit")) +val basketballAndFootballDiceResultLimit + get() = basketballBowlingAndFootballDiceResultLimit val slotMachineDiceResultLimit = 1 .. 64 val botCommandLengthLimit = 1 .. 32 diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/dice/DiceAnimationType.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/dice/DiceAnimationType.kt index 7a79ba36dd..d611868937 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/dice/DiceAnimationType.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/dice/DiceAnimationType.kt @@ -27,13 +27,19 @@ object DartsDiceAnimationType : DiceAnimationType() { object BasketballDiceAnimationType : DiceAnimationType() { override val emoji: String = "\uD83C\uDFC0" override val valueLimits: IntRange - get() = basketballAndFootballDiceResultLimit + get() = basketballBowlingAndFootballDiceResultLimit } @Serializable(DiceAnimationTypeSerializer::class) object FootballDiceAnimationType : DiceAnimationType() { override val emoji: String = "⚽" override val valueLimits: IntRange - get() = basketballAndFootballDiceResultLimit + get() = basketballBowlingAndFootballDiceResultLimit +} +@Serializable(DiceAnimationTypeSerializer::class) +object BowlingDiceAnimationType : DiceAnimationType() { + override val emoji: String = "\uD83C\uDFB3" + override val valueLimits: IntRange + get() = basketballBowlingAndFootballDiceResultLimit } @Serializable(DiceAnimationTypeSerializer::class) object SlotMachineDiceAnimationType : DiceAnimationType() { @@ -59,6 +65,7 @@ internal object DiceAnimationTypeSerializer : KSerializer { BasketballDiceAnimationType.emoji -> BasketballDiceAnimationType SlotMachineDiceAnimationType.emoji -> SlotMachineDiceAnimationType FootballDiceAnimationType.emoji -> FootballDiceAnimationType + BowlingDiceAnimationType.emoji -> BowlingDiceAnimationType else -> CustomDiceAnimationType(type) } } From bd4eb29fc1e46cba4b51e9ec4920dc336c6a9169 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 26 Nov 2020 19:37:35 +0600 Subject: [PATCH 4/5] update limits of dices --- .../kotlin/dev/inmo/tgbotapi/types/Common.kt | 14 +++++++------- .../inmo/tgbotapi/types/dice/DiceAnimationType.kt | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt index 1afd6ec0af..34538eedf0 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt @@ -61,14 +61,14 @@ val inlineQueryAnswerResultsLimit = 0 .. 50 val customTitleLength = 0 .. 16 -val dartsAndCubeDiceResultLimit = 1 .. 6 -@Deprecated("Renamed", ReplaceWith("dartsAndCubeDiceResultLimit", "dev.inmo.tgbotapi.types.dartsAndCubeDiceResultLimit")) +val dartsCubeAndBowlingDiceResultLimit = 1 .. 6 +@Deprecated("Renamed", ReplaceWith("dartsCubeAndBowlingDiceResultLimit", "dev.inmo.tgbotapi.types.dartsCubeAndBowlingDiceResultLimit")) +val dartsAndCubeDiceResultLimit + get() = dartsCubeAndBowlingDiceResultLimit +@Deprecated("Renamed", ReplaceWith("dartsCubeAndBowlingDiceResultLimit", "dev.inmo.tgbotapi.types.dartsCubeAndBowlingDiceResultLimit")) val diceResultLimit - get() = dartsAndCubeDiceResultLimit -val basketballBowlingAndFootballDiceResultLimit = 1 .. 5 -@Deprecated("Renamed", ReplaceWith("basketballBowlingAndFootballDiceResultLimit", "dev.inmo.tgbotapi.types.basketballBowlingAndFootballDiceResultLimit")) -val basketballAndFootballDiceResultLimit - get() = basketballBowlingAndFootballDiceResultLimit + get() = dartsCubeAndBowlingDiceResultLimit +val basketballAndFootballDiceResultLimit = 1 .. 5 val slotMachineDiceResultLimit = 1 .. 64 val botCommandLengthLimit = 1 .. 32 diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/dice/DiceAnimationType.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/dice/DiceAnimationType.kt index d611868937..badb22cb29 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/dice/DiceAnimationType.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/dice/DiceAnimationType.kt @@ -15,31 +15,31 @@ sealed class DiceAnimationType { object CubeDiceAnimationType : DiceAnimationType() { override val emoji: String = "\uD83C\uDFB2" override val valueLimits: IntRange - get() = dartsAndCubeDiceResultLimit + get() = dartsCubeAndBowlingDiceResultLimit } @Serializable(DiceAnimationTypeSerializer::class) object DartsDiceAnimationType : DiceAnimationType() { override val emoji: String = "\uD83C\uDFAF" override val valueLimits: IntRange - get() = dartsAndCubeDiceResultLimit + get() = dartsCubeAndBowlingDiceResultLimit } @Serializable(DiceAnimationTypeSerializer::class) object BasketballDiceAnimationType : DiceAnimationType() { override val emoji: String = "\uD83C\uDFC0" override val valueLimits: IntRange - get() = basketballBowlingAndFootballDiceResultLimit + get() = basketballAndFootballDiceResultLimit } @Serializable(DiceAnimationTypeSerializer::class) object FootballDiceAnimationType : DiceAnimationType() { override val emoji: String = "⚽" override val valueLimits: IntRange - get() = basketballBowlingAndFootballDiceResultLimit + get() = basketballAndFootballDiceResultLimit } @Serializable(DiceAnimationTypeSerializer::class) object BowlingDiceAnimationType : DiceAnimationType() { override val emoji: String = "\uD83C\uDFB3" override val valueLimits: IntRange - get() = basketballBowlingAndFootballDiceResultLimit + get() = dartsCubeAndBowlingDiceResultLimit } @Serializable(DiceAnimationTypeSerializer::class) object SlotMachineDiceAnimationType : DiceAnimationType() { From 6dd1825b98e3c473937e1a87fc27015a60d9fdba Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 27 Nov 2020 00:44:29 +0600 Subject: [PATCH 5/5] update dependencies --- CHANGELOG.md | 3 ++- gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06404e2600..a915a9742f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,8 @@ * `Common`: * `Version`: * `UUID`: `0.2.2` -> `0.2.3` - * `MicroUtils`: `0.4.3` -> `0.4.5` + * `Coroutines`: `1.4.1` -> `1.4.2` + * `MicroUtils`: `0.4.3` -> `0.4.6` * `Core`: * Add `BowlingDiceAnimationType` diff --git a/gradle.properties b/gradle.properties index b3ef153e51..5f8c040fbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,13 +6,13 @@ kotlin.incremental=true kotlin.incremental.js=true kotlin_version=1.4.20 -kotlin_coroutines_version=1.4.1 +kotlin_coroutines_version=1.4.2 kotlin_serialisation_runtime_version=1.0.1 klock_version=2.0.0 uuid_version=0.2.3 ktor_version=1.4.2 -micro_utils_version=0.4.5 +micro_utils_version=0.4.6 javax_activation_version=1.1.1