From b183b824436b12cb5b4b8a4e6b3f3b0280b31c17 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 19 Sep 2021 20:36:02 +0600 Subject: [PATCH 1/3] start 0.5.28 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 040e18c5635..f1f2a55283b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.5.28 + ## 0.5.27 * `Versions`: diff --git a/gradle.properties b/gradle.properties index 0ebd31583b5..2588d16aa9f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -45,5 +45,5 @@ dokka_version=1.5.0 # Project data group=dev.inmo -version=0.5.27 -android_code_version=68 +version=0.5.28 +android_code_version=69 From 7f8db6a29d62f2af2ba28f680a82f269bfe849e6 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 19 Sep 2021 20:39:15 +0600 Subject: [PATCH 2/3] update dependencies --- CHANGELOG.md | 4 ++++ gradle.properties | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1f2a55283b..ab8f6034322 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 0.5.28 +* `Versions`: + * `Kotlin`: `1.5.30` -> `1.5.31` + * `Klock`: `2.4.1` -> `2.4.2` + ## 0.5.27 * `Versions`: diff --git a/gradle.properties b/gradle.properties index 2588d16aa9f..e5d77a2396c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,14 +7,14 @@ android.useAndroidX=true android.enableJetifier=true org.gradle.jvmargs=-Xmx2g -kotlin_version=1.5.30 +kotlin_version=1.5.31 kotlin_coroutines_version=1.5.2 kotlin_serialisation_core_version=1.2.2 kotlin_exposed_version=0.34.2 ktor_version=1.6.3 -klockVersion=2.4.1 +klockVersion=2.4.2 github_release_plugin_version=2.2.12 From 88002ec8e76053cf90acad97c71955182290fb47 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 19 Sep 2021 20:50:24 +0600 Subject: [PATCH 3/3] set java toolchain version in all projects related to Java --- mppAndroidProject.gradle | 6 ++++++ mppJavaProject.gradle | 6 ++++++ mppProjectWithSerialization.gradle | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/mppAndroidProject.gradle b/mppAndroidProject.gradle index 7896635e3e0..9afe3f7cd0e 100644 --- a/mppAndroidProject.gradle +++ b/mppAndroidProject.gradle @@ -24,3 +24,9 @@ kotlin { } apply from: "$defaultAndroidSettingsPresetPath" + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } +} diff --git a/mppJavaProject.gradle b/mppJavaProject.gradle index bbebd5257b3..d3932381466 100644 --- a/mppJavaProject.gradle +++ b/mppJavaProject.gradle @@ -26,3 +26,9 @@ kotlin { } } } + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } +} diff --git a/mppProjectWithSerialization.gradle b/mppProjectWithSerialization.gradle index 82836b6fec4..221adcab52a 100644 --- a/mppProjectWithSerialization.gradle +++ b/mppProjectWithSerialization.gradle @@ -48,3 +48,9 @@ kotlin { } apply from: "$defaultAndroidSettingsPresetPath" + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } +}