Use Java 11 by default on JVM and Android (#1902)

korlibs · Oct 2, 2023 · 7e5576f · 7e5576f
1 parent 1670b98
commit 7e5576f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/buildSrc/src/main/kotlin/korlibs/korge/gradle/KorgeExtension.kt b/buildSrc/src/main/kotlin/korlibs/korge/gradle/KorgeExtension.kt
@@ -302,8 +302,7 @@ open class KorgeExtension(
     //@JvmOverloads
     //fun bundle(uri: String, baseName: String? = null) = bundles.bundle(uri, baseName)
 
-    val DEFAULT_JVM_TARGET = "1.8"
-    //val DEFAULT_JVM_TARGET = "1.6"
+    val DEFAULT_JVM_TARGET = GRADLE_JAVA_VERSION_STR
 	var jvmTarget: String = project.findProject("jvm.target")?.toString() ?: DEFAULT_JVM_TARGET
 	var androidLibrary: Boolean = project.findProperty("android.library") == "true"
     var overwriteAndroidFiles: Boolean = project.findProperty("overwrite.android.files") == "false"

diff --git a/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/android/Android.kt b/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/android/Android.kt
@@ -230,9 +230,7 @@ const val ANDROID_DEFAULT_MIN_SDK = 21 // Android 5.0
 const val ANDROID_DEFAULT_COMPILE_SDK = 33
 const val ANDROID_DEFAULT_TARGET_SDK = 33
 
-val ANDROID_JAVA_VERSION = JavaVersion.VERSION_1_8
-//val ANDROID_JAVA_VERSION = JavaVersion.VERSION_11
-//val ANDROID_JAVA_VERSION_STR = "1.8"
+val ANDROID_JAVA_VERSION = JavaVersion.VERSION_11
 val ANDROID_JAVA_VERSION_STR = ANDROID_JAVA_VERSION.toString()
 
 val GRADLE_JAVA_VERSION_STR = "11"

diff --git a/e2e/e2e-test/build.gradle.kts b/e2e/e2e-test/build.gradle.kts
@@ -26,12 +26,6 @@ buildscript {
 
 apply<KorgeGradlePlugin>()
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
 korge {
     id = "com.sample.demo"