Fix kotlin compat version issue x2

mars885 · Aug 8, 2024 · 978039e · 978039e
1 parent 6ff9a51
commit 978039e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -88,7 +88,7 @@ subprojects {
 
     plugins.withId(PLUGIN_KOTLIN) {
         extensions.findByType<KotlinProjectExtension>()?.run {
-            jvmToolchain(appConfig.kotlinCompatibilityVersion)
+            jvmToolchain(appConfig.jvmToolchainVersion)
         }
     }
 

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -16,6 +16,8 @@
 
 @file:Suppress("ClassName")
 
+import org.gradle.api.JavaVersion
+
 object appConfig {
 
     const val compileSdkVersion = 34
@@ -25,7 +27,10 @@ object appConfig {
     const val versionCode = 1
     const val versionName = "1.0.0"
 
-    const val kotlinCompatibilityVersion = 8
+    const val jvmToolchainVersion = 17
+
+    val javaCompatibilityVersion = JavaVersion.VERSION_17
+    val kotlinCompatibilityVersion = JavaVersion.VERSION_17
 }
 
 object versions {

diff --git a/buildSrc/src/main/java/com/paulrybitskyi/gamedge/android/GamedgeAndroidPlugin.kt b/buildSrc/src/main/java/com/paulrybitskyi/gamedge/android/GamedgeAndroidPlugin.kt
@@ -23,6 +23,7 @@ import PLUGIN_ANDROID_APPLICATION
 import PLUGIN_KOTLIN_ANDROID
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import org.gradle.kotlin.dsl.findByType
+import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 import java.util.Properties
 
 class GamedgeAndroidPlugin : Plugin<Project> {
@@ -92,6 +93,11 @@ class GamedgeAndroidPlugin : Plugin<Project> {
                 }
             }
 
+            compileOptions {
+                sourceCompatibility = appConfig.javaCompatibilityVersion
+                targetCompatibility = appConfig.javaCompatibilityVersion
+            }
+
             // Without the below block, a build failure was happening when running ./gradlew connectedAndroidTest
             // See: https://github.com/Kotlin/kotlinx.coroutines/tree/master/kotlinx-coroutines-debug#debug-agent-and-android
             packagingOptions {