diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2868bbd54..a8e688789 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,7 +1,6 @@
 import com.mikepenz.aboutlibraries.plugin.DuplicateMode
 import com.mikepenz.aboutlibraries.plugin.DuplicateRule
 import java.util.regex.Pattern
-import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
 
 val isRelease: Boolean
     get() = gradle.startParameter.taskNames.any { it.contains("Release") }
@@ -169,10 +168,6 @@ android {
     namespace = "com.hippo.ehviewer"
 }
 
-composeCompiler {
-    featureFlags = setOf(ComposeFeatureFlag.OptimizeNonSkippingGroups)
-}
-
 baselineProfile {
     mergeIntoMain = true
 }
@@ -284,7 +279,6 @@ kotlin {
             "splitties.preferences.DataStorePreferencesPreview",
         )
         freeCompilerArgs.addAll(
-            "-Xjvm-default=all",
             "-Xcontext-receivers",
             "-Xwhen-guards",
             "-Xsuppress-warning=CONTEXT_RECEIVERS_DEPRECATED",
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 493e237fe..f3c68bd89 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -19,11 +19,11 @@ arrow = "2.1.2"
 coil = "3.2.0"
 compose-bom = "2025.05.00"
 compose-destinations = "2.2.0"
-kotlin = "2.1.21"
+kotlin = "2.2.0-RC"
 kotlinx-coroutines = "1.10.2"
 kotlinx-datetime = "0.6.2"
 kotlinx-serialization = "1.8.1"
-ksp = "2.1.21-2.0.1"
+ksp = "2.2.0-RC-2.0.1"
 ktor = "3.1.3"
 okhttp = "5.0.0-alpha.14"
 okio = "3.11.0"