From 38d0e34fb5949e6992ee748bd66c4f2c4661fc59 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Tue, 9 Nov 2021 14:03:51 +0600
Subject: [PATCH] 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
 }