From e8219d6cf4ece87d4c47ea9a869767715ecc0cc4 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 9 Nov 2021 10:21:23 +0600 Subject: [PATCH 1/3] start 0.8.1 --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0e9d13f86a8..6acc930643c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx2g kotlin_version=1.5.31 kotlin_coroutines_version=1.5.2 kotlin_serialisation_core_version=1.3.0 -kotlin_exposed_version=0.36.1 +kotlin_exposed_version=0.36.2 ktor_version=1.6.5 @@ -45,5 +45,5 @@ dokka_version=1.5.31 # Project data group=dev.inmo -version=0.8.0 -android_code_version=80 +version=0.8.1 +android_code_version=81 From 8fbc6b90414e6033085a44d26253f2ea936ca457 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 9 Nov 2021 13:43:46 +0600 Subject: [PATCH 2/3] update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da212d218db..7aaefde6cc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 0.8.1 + +* `Versions`: + * `Exposed`: `0.36.1` -> `0.36.2` + ## 0.8.0 * `Versions`: From 38d0e34fb5949e6992ee748bd66c4f2c4661fc59 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 9 Nov 2021 14:03:51 +0600 Subject: [PATCH 3/3] updates in scripts and update core ktx --- CHANGELOG.md | 1 + gradle.properties | 2 +- language_codes/generator/build.gradle | 5 +++++ mppAndroidProject.gradle | 5 ++--- mppJavaProject.gradle | 13 +++++++++---- mppProjectWithSerialization.gradle | 13 +++++++++---- 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aaefde6cc8..e223d0ed530 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * `Versions`: * `Exposed`: `0.36.1` -> `0.36.2` + * `Core KTX`: `1.6.0` -> `1.7.0` ## 0.8.0 diff --git a/gradle.properties b/gradle.properties index 6acc930643c..ee3c1da5694 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ uuidVersion=0.3.1 # ANDROID -core_ktx_version=1.6.0 +core_ktx_version=1.7.0 androidx_recycler_version=1.2.1 appcompat_version=1.3.1 diff --git a/language_codes/generator/build.gradle b/language_codes/generator/build.gradle index b09ff4f987f..385e6f1c4e0 100644 --- a/language_codes/generator/build.gradle +++ b/language_codes/generator/build.gradle @@ -24,3 +24,8 @@ dependencies { } mainClassName="MainKt" + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} diff --git a/mppAndroidProject.gradle b/mppAndroidProject.gradle index 9afe3f7cd0e..1817e67049d 100644 --- a/mppAndroidProject.gradle +++ b/mppAndroidProject.gradle @@ -26,7 +26,6 @@ kotlin { apply from: "$defaultAndroidSettingsPresetPath" java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/mppJavaProject.gradle b/mppJavaProject.gradle index d3932381466..5f6d62de0cb 100644 --- a/mppJavaProject.gradle +++ b/mppJavaProject.gradle @@ -4,7 +4,13 @@ project.group = "$group" apply from: "$publishGradlePath" kotlin { - jvm() + jvm { + compilations.main { + kotlinOptions { + jvmTarget = "1.8" + } + } + } sourceSets { commonMain { @@ -28,7 +34,6 @@ kotlin { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/mppProjectWithSerialization.gradle b/mppProjectWithSerialization.gradle index 221adcab52a..073b502c5b1 100644 --- a/mppProjectWithSerialization.gradle +++ b/mppProjectWithSerialization.gradle @@ -4,7 +4,13 @@ project.group = "$group" apply from: "$publishGradlePath" kotlin { - jvm() + jvm { + compilations.main { + kotlinOptions { + jvmTarget = "1.8" + } + } + } js (IR) { browser() nodejs() @@ -50,7 +56,6 @@ kotlin { apply from: "$defaultAndroidSettingsPresetPath" java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 }