diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a8e688789..c1dc430a1 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,6 +1,7 @@
 import com.mikepenz.aboutlibraries.plugin.DuplicateMode
 import com.mikepenz.aboutlibraries.plugin.DuplicateRule
 import java.util.regex.Pattern
+import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
 
 val isRelease: Boolean
     get() = gradle.startParameter.taskNames.any { it.contains("Release") }
@@ -257,6 +258,7 @@ kotlin {
 
     // https://kotlinlang.org/docs/gradle-compiler-options.html#all-compiler-options
     compilerOptions {
+        jvmDefault = JvmDefaultMode.NO_COMPATIBILITY
         progressiveMode = true
         optIn.addAll(
             "coil3.annotation.ExperimentalCoilApi",
@@ -280,7 +282,6 @@ kotlin {
         )
         freeCompilerArgs.addAll(
             "-Xcontext-receivers",
-            "-Xwhen-guards",
             "-Xsuppress-warning=CONTEXT_RECEIVERS_DEPRECATED",
             "-Xannotation-default-target=param-property",
         )
diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
index f569bf684..4871be908 100644
--- a/benchmark/build.gradle.kts
+++ b/benchmark/build.gradle.kts
@@ -7,15 +7,6 @@ plugins {
 android {
     namespace = "com.ehviewer.baselineprofile"
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
     defaultConfig {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -37,6 +28,10 @@ android {
     }
 }
 
+kotlin {
+    jvmToolchain(21)
+}
+
 baselineProfile {
     managedDevices += "pixel6Api35"
     useConnectedDevices = false