From 36b0eeef5a0561a665c4cca9d3c205427bbff074 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Sun, 7 Jun 2026 22:22:21 +0800
Subject: [PATCH] Kotlin 2.4

---
 app/src/main/kotlin/com/hippo/ehviewer/EhApplication.kt       | 1 +
 build-logic/convention/src/main/kotlin/com/ehviewer/Kotlin.kt | 3 +--
 gradle/libs.versions.toml                                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/EhApplication.kt b/app/src/main/kotlin/com/hippo/ehviewer/EhApplication.kt
index 1324184d7..68cde4318 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/EhApplication.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/EhApplication.kt
@@ -122,6 +122,7 @@ class EhApplication : Application(), SingletonImageLoader.Factory {
         }
         launchIO {
             EhTagDatabase.launchUpdate()
+            @Suppress("UNUSED_EXPRESSION")
             launch { EhDB }
             launch { dataStateFlow.value }
             launch { OSUtils.totalMemory }
diff --git a/build-logic/convention/src/main/kotlin/com/ehviewer/Kotlin.kt b/build-logic/convention/src/main/kotlin/com/ehviewer/Kotlin.kt
index cbc2e8b8b..9b2a0bbe0 100644
--- a/build-logic/convention/src/main/kotlin/com/ehviewer/Kotlin.kt
+++ b/build-logic/convention/src/main/kotlin/com/ehviewer/Kotlin.kt
@@ -21,9 +21,8 @@ internal fun KotlinCommonCompilerOptions.configureKotlin(includeKotlinX: Boolean
         )
     }
     freeCompilerArgs.addAll(
-        "-Xcontext-parameters",
+        "-Xcollection-literals",
         "-Xwhen-expressions=indy",
-        "-Xannotation-default-target=param-property",
     )
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f497f32fb..1e9f96aa4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ compose-multiplatform = "1.11.0"
 compose-destinations = "2.3.0"
 compose-preference = "2.2.0"
 java = "25"
-kotlin = "2.3.21"
+kotlin = "2.4.0"
 kotlinx-coroutines = "1.11.0"
 kotlinx-datetime = "0.8.0"
 kotlinx-io = "0.9.0"