Bladeren bron

Revert "Set jvmTarget for android target"

This reverts commit f9d52c72adb89ce3ced39e623bf3037cca8c07b6.
Nikita Lipsky 3 jaren geleden
bovenliggende
commit
eadff9b59f
2 gewijzigde bestanden met toevoegingen van 6 en 18 verwijderingen
  1. 3 9
      androidApp/build.gradle.kts
  2. 3 9
      shared/build.gradle.kts

+ 3 - 9
androidApp/build.gradle.kts

@@ -5,13 +5,7 @@ plugins {
 }
 
 kotlin {
-    android {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
-        }
-    }
+    android()
     sourceSets {
         val androidMain by getting {
             dependencies {
@@ -35,7 +29,7 @@ android {
         versionName = "1.0"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 }

+ 3 - 9
shared/build.gradle.kts

@@ -6,13 +6,7 @@ plugins {
 }
 
 kotlin {
-    android {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
-        }
-    }
+    android()
 
     jvm("desktop")
 
@@ -80,7 +74,7 @@ android {
         targetSdk = (findProperty("android.targetSdk") as String).toInt()
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 }