From 2fa1a064eca6a4a53c5880f1e1587cdac47098d5 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 14 Nov 2021 19:14:06 +0600 Subject: [PATCH 1/3] start 0.37.1 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72679751ec..adfe1ce945 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # TelegramBotAPI changelog +## 0.37.1 + ## 0.37.0 Telegram Bot API 5.4 **ALL DEPRECATIONS WERE REMOVED** diff --git a/gradle.properties b/gradle.properties index 0ebf2720ed..472d92157a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,6 +17,6 @@ micro_utils_version=0.8.1 javax_activation_version=1.1.1 library_group=dev.inmo -library_version=0.37.0 +library_version=0.37.1 github_release_plugin_version=2.2.12 From b8cc2421b6b7140d606815f64ff0a929eecbca99 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 14 Nov 2021 19:15:09 +0600 Subject: [PATCH 2/3] update dependencies --- CHANGELOG.md | 6 ++++++ gradle.properties | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index adfe1ce945..8e9201fc30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## 0.37.1 +* `Common`: + * `Version`: + * `Serialization`: `1.3.0` -> `1.3.1` + * `Klock`: `2.4.7` -> `2.4.8` + * `MicroUtils`: `0.8.1` -> `0.8.2` + ## 0.37.0 Telegram Bot API 5.4 **ALL DEPRECATIONS WERE REMOVED** diff --git a/gradle.properties b/gradle.properties index 472d92157a..c3db7650a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,12 +7,12 @@ kotlin.incremental.js=true kotlin_version=1.5.31 kotlin_coroutines_version=1.5.2 -kotlin_serialisation_runtime_version=1.3.0 -klock_version=2.4.7 +kotlin_serialisation_runtime_version=1.3.1 +klock_version=2.4.8 uuid_version=0.3.1 ktor_version=1.6.5 -micro_utils_version=0.8.1 +micro_utils_version=0.8.2 javax_activation_version=1.1.1 From 249efeee7ebb15327067335dd97474d25f626810 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 14 Nov 2021 19:42:03 +0600 Subject: [PATCH 3/3] update scripts --- docs/build.gradle | 13 ++++++++++++- tgbotapi.api/build.gradle | 13 +++++++++---- tgbotapi.behaviour_builder.fsm/build.gradle | 13 +++++++++---- tgbotapi.behaviour_builder/build.gradle | 13 +++++++++---- tgbotapi.core/build.gradle | 13 +++++++++---- tgbotapi.extensions.api/build.gradle | 13 +++++++++---- .../build.gradle | 5 ++--- tgbotapi.extensions.behaviour_builder/build.gradle | 13 +++++++++---- tgbotapi.extensions.utils/build.gradle | 13 +++++++++---- tgbotapi.utils/build.gradle | 13 +++++++++---- tgbotapi/build.gradle | 14 +++++++++----- 11 files changed, 95 insertions(+), 41 deletions(-) diff --git a/docs/build.gradle b/docs/build.gradle index 0f06812393..bb40a510c1 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -23,7 +23,13 @@ repositories { } kotlin { - jvm() + jvm { + compilations.main { + kotlinOptions { + jvmTarget = "1.8" + } + } + } js(IR) { browser() nodejs() @@ -91,3 +97,8 @@ Object callback = { tasks.dokkaGfm(callback) tasks.dokkaHtml(callback) + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} diff --git a/tgbotapi.api/build.gradle b/tgbotapi.api/build.gradle index 54888411ac..32ab4c3861 100644 --- a/tgbotapi.api/build.gradle +++ b/tgbotapi.api/build.gradle @@ -26,7 +26,13 @@ repositories { } kotlin { - jvm() + jvm { + compilations.main { + kotlinOptions { + jvmTarget = "1.8" + } + } + } js(IR) { browser() nodejs() @@ -43,8 +49,7 @@ kotlin { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/tgbotapi.behaviour_builder.fsm/build.gradle b/tgbotapi.behaviour_builder.fsm/build.gradle index 285b417626..f2c13d81aa 100644 --- a/tgbotapi.behaviour_builder.fsm/build.gradle +++ b/tgbotapi.behaviour_builder.fsm/build.gradle @@ -26,7 +26,13 @@ repositories { } kotlin { - jvm() + jvm { + compilations.main { + kotlinOptions { + jvmTarget = "1.8" + } + } + } js(IR) { browser() nodejs() @@ -44,7 +50,6 @@ kotlin { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/tgbotapi.behaviour_builder/build.gradle b/tgbotapi.behaviour_builder/build.gradle index 7a3d80e9da..488052502a 100644 --- a/tgbotapi.behaviour_builder/build.gradle +++ b/tgbotapi.behaviour_builder/build.gradle @@ -26,7 +26,13 @@ repositories { } kotlin { - jvm() + jvm { + compilations.main { + kotlinOptions { + jvmTarget = "1.8" + } + } + } js(IR) { browser() nodejs() @@ -43,7 +49,6 @@ kotlin { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/tgbotapi.core/build.gradle b/tgbotapi.core/build.gradle index 01ba2f9b9d..20105eb576 100644 --- a/tgbotapi.core/build.gradle +++ b/tgbotapi.core/build.gradle @@ -26,7 +26,13 @@ repositories { } kotlin { - jvm() + jvm { + compilations.main { + kotlinOptions { + jvmTarget = "1.8" + } + } + } js(IR) { browser() nodejs() @@ -94,7 +100,6 @@ kotlin { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/tgbotapi.extensions.api/build.gradle b/tgbotapi.extensions.api/build.gradle index 2e59abfe91..ad5ab19c66 100644 --- a/tgbotapi.extensions.api/build.gradle +++ b/tgbotapi.extensions.api/build.gradle @@ -26,7 +26,13 @@ repositories { } kotlin { - jvm() + jvm { + compilations.main { + kotlinOptions { + jvmTarget = "1.8" + } + } + } js(IR) { browser() nodejs() @@ -43,8 +49,7 @@ kotlin { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/tgbotapi.extensions.behaviour_builder.fsm/build.gradle b/tgbotapi.extensions.behaviour_builder.fsm/build.gradle index 70bda66a94..aa2d82b664 100644 --- a/tgbotapi.extensions.behaviour_builder.fsm/build.gradle +++ b/tgbotapi.extensions.behaviour_builder.fsm/build.gradle @@ -43,8 +43,7 @@ kotlin { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/tgbotapi.extensions.behaviour_builder/build.gradle b/tgbotapi.extensions.behaviour_builder/build.gradle index 4536301cf5..0167fa3ae8 100644 --- a/tgbotapi.extensions.behaviour_builder/build.gradle +++ b/tgbotapi.extensions.behaviour_builder/build.gradle @@ -26,7 +26,13 @@ repositories { } kotlin { - jvm() + jvm { + compilations.main { + kotlinOptions { + jvmTarget = "1.8" + } + } + } js(IR) { browser() nodejs() @@ -43,8 +49,7 @@ kotlin { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/tgbotapi.extensions.utils/build.gradle b/tgbotapi.extensions.utils/build.gradle index ad0a0d7910..a6a9ad771e 100644 --- a/tgbotapi.extensions.utils/build.gradle +++ b/tgbotapi.extensions.utils/build.gradle @@ -26,7 +26,13 @@ repositories { } kotlin { - jvm() + jvm { + compilations.main { + kotlinOptions { + jvmTarget = "1.8" + } + } + } js(IR) { browser() nodejs() @@ -43,8 +49,7 @@ kotlin { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/tgbotapi.utils/build.gradle b/tgbotapi.utils/build.gradle index eca97cef94..f5f75bdb2c 100644 --- a/tgbotapi.utils/build.gradle +++ b/tgbotapi.utils/build.gradle @@ -26,7 +26,13 @@ repositories { } kotlin { - jvm() + jvm { + compilations.main { + kotlinOptions { + jvmTarget = "1.8" + } + } + } js(IR) { browser() nodejs() @@ -61,7 +67,6 @@ kotlin { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/tgbotapi/build.gradle b/tgbotapi/build.gradle index 5cd816bf7b..561e2722c6 100644 --- a/tgbotapi/build.gradle +++ b/tgbotapi/build.gradle @@ -26,7 +26,13 @@ repositories { } kotlin { - jvm() + jvm { + compilations.main { + kotlinOptions { + jvmTarget = "1.8" + } + } + } js(IR) { browser() nodejs() @@ -46,10 +52,8 @@ kotlin { } } - java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 }