diff --git a/CHANGELOG.md b/CHANGELOG.md index da212d218db..e223d0ed530 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.8.1 + +* `Versions`: + * `Exposed`: `0.36.1` -> `0.36.2` + * `Core KTX`: `1.6.0` -> `1.7.0` + ## 0.8.0 * `Versions`: diff --git a/gradle.properties b/gradle.properties index 0e9d13f86a8..ee3c1da5694 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 @@ -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 @@ -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 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 }