diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
index 0c949e17a..114462e21 100644
--- a/benchmark/build.gradle.kts
+++ b/benchmark/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 The Android Open Source Project
+ * Copyright (C) 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.test)
@@ -28,8 +29,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
-    kotlinOptions {
-        jvmTarget = "1.8"
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
+        }
     }
 
     defaultConfig {
@@ -79,4 +82,4 @@ androidComponents {
     beforeVariants(selector().all()) {
         it.enable = it.buildType == "benchmark"
     }
-}
\ No newline at end of file
+}
diff --git a/core/camera/build.gradle.kts b/core/camera/build.gradle.kts
index e87fccb92..5e4507b6b 100644
--- a/core/camera/build.gradle.kts
+++ b/core/camera/build.gradle.kts
@@ -94,10 +94,10 @@ android {
     }
     kotlin {
         jvmToolchain(17)
-    }
 
-    kotlinOptions {
-        freeCompilerArgs += "-Xcontext-receivers"
+        compilerOptions {
+            freeCompilerArgs.add("-Xcontext-receivers")
+        }
     }
 }
 
diff --git a/feature/postcapture/build.gradle.kts b/feature/postcapture/build.gradle.kts
index d61cb3c36..93df8419e 100644
--- a/feature/postcapture/build.gradle.kts
+++ b/feature/postcapture/build.gradle.kts
@@ -46,9 +46,15 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
     kotlin {
         jvmToolchain(17)
+
+        compilerOptions {
+            freeCompilerArgs.add("-Xcontext-receivers")
+        }
     }
+
     buildFeatures {
         buildConfig = true
         compose = true
@@ -74,10 +80,6 @@ android {
             }
         }
     }
-
-    kotlinOptions {
-        freeCompilerArgs += "-Xcontext-receivers"
-    }
 }
 
 dependencies {
diff --git a/feature/preview/build.gradle.kts b/feature/preview/build.gradle.kts
index 46745e749..89612dcb2 100644
--- a/feature/preview/build.gradle.kts
+++ b/feature/preview/build.gradle.kts
@@ -46,9 +46,15 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
     kotlin {
         jvmToolchain(17)
+
+        compilerOptions {
+            freeCompilerArgs.add("-Xcontext-receivers")
+        }
     }
+
     buildFeatures {
         buildConfig = true
         compose = true
diff --git a/ui/components/build.gradle.kts b/ui/components/build.gradle.kts
index 02d3b2dca..ac066963a 100644
--- a/ui/components/build.gradle.kts
+++ b/ui/components/build.gradle.kts
@@ -46,17 +46,19 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
     kotlin {
         jvmToolchain(17)
+
+        compilerOptions {
+            freeCompilerArgs.add("-Xcontext-receivers")
+        }
     }
+
     buildFeatures {
         buildConfig = true
         compose = true
     }
-
-    kotlinOptions {
-        freeCompilerArgs += "-Xcontext-receivers"
-    }
 }
 
 dependencies {
diff --git a/ui/components/capture/build.gradle.kts b/ui/components/capture/build.gradle.kts
index ba71b6947..bb2ec1c26 100644
--- a/ui/components/capture/build.gradle.kts
+++ b/ui/components/capture/build.gradle.kts
@@ -46,17 +46,19 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
     kotlin {
         jvmToolchain(17)
+
+        compilerOptions {
+            freeCompilerArgs.add("-Xcontext-receivers")
+        }
     }
+
     buildFeatures {
         buildConfig = true
         compose = true
     }
-
-    kotlinOptions {
-        freeCompilerArgs += "-Xcontext-receivers"
-    }
 }
 
 dependencies {
diff --git a/ui/uistate/build.gradle.kts b/ui/uistate/build.gradle.kts
index e06c9e4c7..67ee7aa09 100644
--- a/ui/uistate/build.gradle.kts
+++ b/ui/uistate/build.gradle.kts
@@ -46,17 +46,19 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
     kotlin {
         jvmToolchain(17)
+
+        compilerOptions {
+            freeCompilerArgs.add("-Xcontext-receivers")
+        }
     }
+
     buildFeatures {
         buildConfig = true
         compose = true
     }
-
-    kotlinOptions {
-        freeCompilerArgs += "-Xcontext-receivers"
-    }
 }
 
 dependencies {
diff --git a/ui/uistate/capture/build.gradle.kts b/ui/uistate/capture/build.gradle.kts
index d210c3acd..5afd2389e 100644
--- a/ui/uistate/capture/build.gradle.kts
+++ b/ui/uistate/capture/build.gradle.kts
@@ -46,17 +46,19 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
     kotlin {
         jvmToolchain(17)
+
+        compilerOptions {
+            freeCompilerArgs.add("-Xcontext-receivers")
+        }
     }
+
     buildFeatures {
         buildConfig = true
         compose = true
     }
-
-    kotlinOptions {
-        freeCompilerArgs += "-Xcontext-receivers"
-    }
 }
 
 dependencies {
diff --git a/ui/uistateadapter/build.gradle.kts b/ui/uistateadapter/build.gradle.kts
index 2826a1033..85f7b4ba2 100644
--- a/ui/uistateadapter/build.gradle.kts
+++ b/ui/uistateadapter/build.gradle.kts
@@ -46,17 +46,19 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
     kotlin {
         jvmToolchain(17)
+
+        compilerOptions {
+            freeCompilerArgs.add("-Xcontext-receivers")
+        }
     }
+
     buildFeatures {
         buildConfig = true
         compose = true
     }
-
-    kotlinOptions {
-        freeCompilerArgs += "-Xcontext-receivers"
-    }
 }
 
 dependencies {
diff --git a/ui/uistateadapter/capture/build.gradle.kts b/ui/uistateadapter/capture/build.gradle.kts
index 5b8875622..14868afd6 100644
--- a/ui/uistateadapter/capture/build.gradle.kts
+++ b/ui/uistateadapter/capture/build.gradle.kts
@@ -46,17 +46,19 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
     kotlin {
         jvmToolchain(17)
+
+        compilerOptions {
+            freeCompilerArgs.add("-Xcontext-receivers")
+        }
     }
+
     buildFeatures {
         buildConfig = true
         compose = true
     }
-
-    kotlinOptions {
-        freeCompilerArgs += "-Xcontext-receivers"
-    }
 }
 
 dependencies {