Update Kotlin (#882)

* Update Kotlin * Downgrade Kotlin to be compose-supported and upgrade compose compiler * Fix build by explicitly specifying Java target --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Maxr1998 <[email protected]>
jellyfin · Jun 10, 2023 · 187290f · 187290f
1 parent f5b9562
commit 187290f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,6 +1,7 @@
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 import com.github.benmanes.gradle.versions.updates.gradle.GradleReleaseChannel
 import io.gitlab.arturbosch.detekt.Detekt
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.android.app)
@@ -94,6 +95,8 @@ android {
         kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
     compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
         isCoreLibraryDesugaringEnabled = true
     }
     lint {
@@ -182,8 +185,14 @@ dependencies {
 }
 
 tasks {
+    withType<KotlinCompile> {
+        kotlinOptions {
+            jvmTarget = JavaVersion.VERSION_11.toString()
+        }
+    }
+
     withType<Detekt> {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_11.toString()
 
         reports {
             html.required.set(true)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
 # Plugins
 android-plugin = "8.0.2"
-kotlin = "1.7.20"
-kotlin-ksp = "1.7.20-1.0.8"
+kotlin = "1.8.21"
+kotlin-ksp = "1.8.21-1.0.11"
 detekt = "1.22.0"
 android-junit5 = "1.9.3.0"
 dependencyupdates = "0.46.0"
 
 # KotlinX
-coroutines = "1.6.4"
+coroutines = "1.7.1"
 
 # Core
 koin = "3.4.2"
@@ -33,7 +33,7 @@ modernandroidpreferences = "2.3.2"
 compose = "1.4.3"
 compose-foundation = "1.4.3"
 compose-material = "1.4.3"
-compose-compiler = "1.3.2"
+compose-compiler = "1.4.7"
 
 # Network
 jellyfin-sdk = "1.4.2"