diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 55f42b7e..f63d0521 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -23,12 +23,12 @@ plugins {
 
 android {
     namespace = "com.example.platform"
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         applicationId = "com.example.platform"
         minSdk = 24
-        targetSdk = 36
+        targetSdk = 37
         versionCode = 1
         versionName = "1.0"
 
diff --git a/gradle.properties b/gradle.properties
index 909ce195..e97fab5a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -58,8 +58,14 @@ org.gradle.java.installations.auto-download=false
 
 # Disable build features that are enabled by default,
 # https://developer.android.com/studio/releases/gradle-plugin#buildFeatures
-android.defaults.buildfeatures.buildconfig=false
-android.defaults.buildfeatures.aidl=false
-android.defaults.buildfeatures.renderscript=false
 android.defaults.buildfeatures.resvalues=false
 android.defaults.buildfeatures.shaders=false
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+android.builtInKotlin=false
+android.newDsl=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f6e23bab..2737713f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,9 +14,9 @@
 # limitations under the License.
 #
 [versions]
-agp = "8.13.2"
+agp = "9.1.1"
 fragmentCompose = "1.8.6"
-kotlin = "2.1.10"
+kotlin = "2.2.10"
 coreKtx = "1.17.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37f853b1..37f78a6a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/samples/accessibility/build.gradle.kts b/samples/accessibility/build.gradle.kts
index b8b23074..01c8d5f4 100644
--- a/samples/accessibility/build.gradle.kts
+++ b/samples/accessibility/build.gradle.kts
@@ -28,15 +28,26 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     buildFeatures {
         viewBinding = true
     }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
+    }
 }
 
 dependencies {
diff --git a/samples/camera/camera2/build.gradle.kts b/samples/camera/camera2/build.gradle.kts
index ec776937..8a67fc72 100644
--- a/samples/camera/camera2/build.gradle.kts
+++ b/samples/camera/camera2/build.gradle.kts
@@ -26,13 +26,27 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+
+    buildFeatures {
+        viewBinding = true
     }
 
-    viewBinding.isEnabled = true
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
+    }
 }
 
 dependencies {
@@ -53,4 +67,3 @@ dependencies {
     // Link to UltraHDR Graphics Samples
     implementation(project(mapOf("path" to ":samples:graphics:ultrahdr")))
 }
-
diff --git a/samples/camera/camerax/build.gradle.kts b/samples/camera/camerax/build.gradle.kts
index ca63d028..64a9c2fd 100644
--- a/samples/camera/camerax/build.gradle.kts
+++ b/samples/camera/camerax/build.gradle.kts
@@ -28,8 +28,14 @@ android {
         minSdk = 21
         testOptions.targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
 
diff --git a/samples/connectivity/UwbRanging/build.gradle.kts b/samples/connectivity/UwbRanging/build.gradle.kts
index 828f7ca1..a643f2ae 100644
--- a/samples/connectivity/UwbRanging/build.gradle.kts
+++ b/samples/connectivity/UwbRanging/build.gradle.kts
@@ -29,22 +29,30 @@ android {
 
     defaultConfig {
         minSdk = 31
-        targetSdk = 35
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
+
     compileOptions {
-        sourceCompatibility(JavaVersion.VERSION_1_8)
-        targetCompatibility(JavaVersion.VERSION_1_8)
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = "11"
     }
+
     sourceSets {
         getByName("main") {
             java.srcDirs("src/main/java", "src/main/proto")
         }
     }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
+    }
 }
 
 protobuf {
diff --git a/samples/connectivity/audio/build.gradle.kts b/samples/connectivity/audio/build.gradle.kts
index 733a4af2..0b2df217 100644
--- a/samples/connectivity/audio/build.gradle.kts
+++ b/samples/connectivity/audio/build.gradle.kts
@@ -27,10 +27,21 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
     }
 }
 
diff --git a/samples/connectivity/bluetooth/ble/build.gradle.kts b/samples/connectivity/bluetooth/ble/build.gradle.kts
index acf0e97c..9941593e 100644
--- a/samples/connectivity/bluetooth/ble/build.gradle.kts
+++ b/samples/connectivity/bluetooth/ble/build.gradle.kts
@@ -27,10 +27,22 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
     }
 }
 
diff --git a/samples/connectivity/bluetooth/companion/build.gradle.kts b/samples/connectivity/bluetooth/companion/build.gradle.kts
index a2eda689..a72b315b 100644
--- a/samples/connectivity/bluetooth/companion/build.gradle.kts
+++ b/samples/connectivity/bluetooth/companion/build.gradle.kts
@@ -27,10 +27,21 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
     }
 }
 
diff --git a/samples/connectivity/callnotification/build.gradle.kts b/samples/connectivity/callnotification/build.gradle.kts
index a9ef9a6a..a5a7a78c 100644
--- a/samples/connectivity/callnotification/build.gradle.kts
+++ b/samples/connectivity/callnotification/build.gradle.kts
@@ -28,10 +28,21 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
     }
 }
 
diff --git a/samples/connectivity/telecom/build.gradle.kts b/samples/connectivity/telecom/build.gradle.kts
index a198e264..deffa5e0 100644
--- a/samples/connectivity/telecom/build.gradle.kts
+++ b/samples/connectivity/telecom/build.gradle.kts
@@ -36,8 +36,14 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
 
diff --git a/samples/graphics/pdf/build.gradle.kts b/samples/graphics/pdf/build.gradle.kts
index 0aafd92a..de106541 100644
--- a/samples/graphics/pdf/build.gradle.kts
+++ b/samples/graphics/pdf/build.gradle.kts
@@ -28,10 +28,21 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
     }
 }
 
diff --git a/samples/graphics/ultrahdr/build.gradle.kts b/samples/graphics/ultrahdr/build.gradle.kts
index 1db48859..dc80fba1 100644
--- a/samples/graphics/ultrahdr/build.gradle.kts
+++ b/samples/graphics/ultrahdr/build.gradle.kts
@@ -27,13 +27,27 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+
+    buildFeatures {
+        viewBinding = true
     }
 
-    viewBinding.isEnabled = true
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
+    }
 }
 
 dependencies {
diff --git a/samples/location/build.gradle.kts b/samples/location/build.gradle.kts
index 563cb301..4c3bc94d 100644
--- a/samples/location/build.gradle.kts
+++ b/samples/location/build.gradle.kts
@@ -26,10 +26,21 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
     }
 }
 
diff --git a/samples/media/ultrahdr/build.gradle.kts b/samples/media/ultrahdr/build.gradle.kts
index 5f07561c..a841d202 100644
--- a/samples/media/ultrahdr/build.gradle.kts
+++ b/samples/media/ultrahdr/build.gradle.kts
@@ -27,13 +27,27 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+
+    buildFeatures {
+        viewBinding = true
     }
 
-    viewBinding.isEnabled = true
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
+    }
 }
 
 dependencies {
diff --git a/samples/media/video/build.gradle.kts b/samples/media/video/build.gradle.kts
index 2e7a8cb1..f3b3e590 100644
--- a/samples/media/video/build.gradle.kts
+++ b/samples/media/video/build.gradle.kts
@@ -27,17 +27,30 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
-    viewBinding.isEnabled = true
+    buildFeatures {
+        viewBinding = true
+    }
 
     androidResources {
         noCompress += "tflite"
     }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
+    }
 }
 
 // Import DownloadModels task for TFLite sample
@@ -76,4 +89,4 @@ dependencies {
     implementation(libs.tensorflow.lite.gpu.delegate.plugin)
     implementation(libs.tensorflow.lite.support)
     implementation(libs.tensorflow.lite.select.tf.ops)
-}
\ No newline at end of file
+}
diff --git a/samples/privacy/data/build.gradle.kts b/samples/privacy/data/build.gradle.kts
index f92a8ad7..ae7841e8 100644
--- a/samples/privacy/data/build.gradle.kts
+++ b/samples/privacy/data/build.gradle.kts
@@ -27,10 +27,22 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
     }
 }
 
diff --git a/samples/privacy/permissions/build.gradle.kts b/samples/privacy/permissions/build.gradle.kts
index 1e0e762d..a904b2ee 100644
--- a/samples/privacy/permissions/build.gradle.kts
+++ b/samples/privacy/permissions/build.gradle.kts
@@ -26,10 +26,22 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
     }
 }
 
diff --git a/samples/privacy/transparency/build.gradle.kts b/samples/privacy/transparency/build.gradle.kts
index 77a47d8f..ba94f828 100644
--- a/samples/privacy/transparency/build.gradle.kts
+++ b/samples/privacy/transparency/build.gradle.kts
@@ -26,10 +26,19 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
     }
 }
 
diff --git a/samples/storage/build.gradle.kts b/samples/storage/build.gradle.kts
index 679f95b2..4bff4b92 100644
--- a/samples/storage/build.gradle.kts
+++ b/samples/storage/build.gradle.kts
@@ -28,10 +28,21 @@ android {
 
     defaultConfig {
         minSdk = 34
-        targetSdk = 35
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
     }
 }
 
diff --git a/samples/user-interface/appwidgets/build.gradle.kts b/samples/user-interface/appwidgets/build.gradle.kts
index a2ed6562..8be71454 100644
--- a/samples/user-interface/appwidgets/build.gradle.kts
+++ b/samples/user-interface/appwidgets/build.gradle.kts
@@ -27,15 +27,26 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     buildFeatures {
         viewBinding = true
     }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
+    }
 }
 
 dependencies {
diff --git a/samples/user-interface/constraintlayout/build.gradle.kts b/samples/user-interface/constraintlayout/build.gradle.kts
index ddfe7ace..93deafd6 100644
--- a/samples/user-interface/constraintlayout/build.gradle.kts
+++ b/samples/user-interface/constraintlayout/build.gradle.kts
@@ -25,15 +25,26 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     buildFeatures {
         viewBinding = true
     }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
+    }
 }
 
 dependencies {
diff --git a/samples/user-interface/draganddrop/build.gradle.kts b/samples/user-interface/draganddrop/build.gradle.kts
index 419a2f9b..3829dc12 100644
--- a/samples/user-interface/draganddrop/build.gradle.kts
+++ b/samples/user-interface/draganddrop/build.gradle.kts
@@ -25,15 +25,26 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     buildFeatures {
         viewBinding = true
     }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
+    }
 }
 
 dependencies {
diff --git a/samples/user-interface/haptics/build.gradle.kts b/samples/user-interface/haptics/build.gradle.kts
index 96c592e1..cd5173af 100644
--- a/samples/user-interface/haptics/build.gradle.kts
+++ b/samples/user-interface/haptics/build.gradle.kts
@@ -26,10 +26,21 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
     }
 }
 
diff --git a/samples/user-interface/live-updates/build.gradle.kts b/samples/user-interface/live-updates/build.gradle.kts
index b03e52b1..94095b83 100644
--- a/samples/user-interface/live-updates/build.gradle.kts
+++ b/samples/user-interface/live-updates/build.gradle.kts
@@ -6,19 +6,30 @@ plugins {
 
 android {
     namespace = "com.example.platform.ui.live_updates"
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 36
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     buildFeatures {
         viewBinding = true
     }
+    lint {
+        targetSdk = 37
+    }
+    testOptions {
+        targetSdk = 37
+    }
 }
 
 dependencies {
diff --git a/samples/user-interface/live-updates/src/main/java/com/example/platform/ui/live_updates/SnackbarNotificationManager.kt b/samples/user-interface/live-updates/src/main/java/com/example/platform/ui/live_updates/SnackbarNotificationManager.kt
index 56c45217..c79c5bc6 100644
--- a/samples/user-interface/live-updates/src/main/java/com/example/platform/ui/live_updates/SnackbarNotificationManager.kt
+++ b/samples/user-interface/live-updates/src/main/java/com/example/platform/ui/live_updates/SnackbarNotificationManager.kt
@@ -16,6 +16,7 @@
 
 package com.example.platform.ui.live_updates
 
+import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.NotificationManager.IMPORTANCE_DEFAULT
@@ -25,6 +26,7 @@ import android.graphics.Color
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
+import android.text.SpannableStringBuilder
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.core.graphics.drawable.IconCompat
@@ -51,9 +53,20 @@ object SnackbarNotificationManager {
         INITIALIZING(5000) {
             @RequiresApi(Build.VERSION_CODES.BAKLAVA)
             override fun buildNotification(): NotificationCompat.Builder {
+                val orderText = "Your order is being placed"
                 return buildBaseNotification(appContext, INITIALIZING)
                     .setSmallIcon(R.drawable.ic_launcher_foreground)
-                    .setContentTitle("You order is being placed")
+                    .setContentTitle(
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CINNAMON_BUN) {
+                            SpannableStringBuilder().append(
+                                orderText,
+                                Notification.createSemanticStyleAnnotation(Notification.SEMANTIC_STYLE_INFO),
+                                0,
+                            )
+                        } else {
+                            orderText
+                        },
+                    )
                     .setContentText("Confirming with bakery...")
                     .setShortCriticalText("Placing")
                     .setStyle(buildBaseProgressStyle(INITIALIZING).setProgressIndeterminate(true))
@@ -263,4 +276,4 @@ object SnackbarNotificationManager {
     fun isPostPromotionsEnabled(): Boolean {
         return notificationManager.canPostPromotedNotifications()
     }
-}
+}
\ No newline at end of file
diff --git a/samples/user-interface/picture-in-picture/build.gradle.kts b/samples/user-interface/picture-in-picture/build.gradle.kts
index 18a5ccf8..06d8915d 100644
--- a/samples/user-interface/picture-in-picture/build.gradle.kts
+++ b/samples/user-interface/picture-in-picture/build.gradle.kts
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2023 The Android Open Source Project
  *
@@ -28,15 +27,29 @@ android {
 
     defaultConfig {
         minSdk = 23
-        targetSdk = 35
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
-    viewBinding.isEnabled = true
+    buildFeatures {
+        viewBinding = true
+    }
+
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
+    }
 }
 
 dependencies {
diff --git a/samples/user-interface/predictiveback/build.gradle.kts b/samples/user-interface/predictiveback/build.gradle.kts
index 77c48038..f8bf8a6f 100644
--- a/samples/user-interface/predictiveback/build.gradle.kts
+++ b/samples/user-interface/predictiveback/build.gradle.kts
@@ -27,15 +27,26 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     buildFeatures {
         viewBinding = true
     }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
+    }
 }
 
 dependencies {
diff --git a/samples/user-interface/quicksettings/build.gradle.kts b/samples/user-interface/quicksettings/build.gradle.kts
index 1f970f6d..6f6f2b7e 100644
--- a/samples/user-interface/quicksettings/build.gradle.kts
+++ b/samples/user-interface/quicksettings/build.gradle.kts
@@ -26,10 +26,22 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 36
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+
+    lint {
+        targetSdk = 36
+    }
+    testOptions {
+        targetSdk = 36
     }
 }
 
diff --git a/samples/user-interface/share/build.gradle.kts b/samples/user-interface/share/build.gradle.kts
index baea8fd0..0f6392a1 100644
--- a/samples/user-interface/share/build.gradle.kts
+++ b/samples/user-interface/share/build.gradle.kts
@@ -26,10 +26,22 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
     }
 }
 
diff --git a/samples/user-interface/text/build.gradle.kts b/samples/user-interface/text/build.gradle.kts
index c470f201..08b70487 100644
--- a/samples/user-interface/text/build.gradle.kts
+++ b/samples/user-interface/text/build.gradle.kts
@@ -26,15 +26,26 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     buildFeatures {
         viewBinding = true
     }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
+    }
 }
 
 dependencies {
diff --git a/samples/user-interface/window-insets/build.gradle.kts b/samples/user-interface/window-insets/build.gradle.kts
index bdc65cb6..31ac93ea 100644
--- a/samples/user-interface/window-insets/build.gradle.kts
+++ b/samples/user-interface/window-insets/build.gradle.kts
@@ -26,15 +26,26 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     buildFeatures {
         viewBinding = true
     }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
+    }
 }
 
 dependencies {
diff --git a/samples/user-interface/windowmanager/build.gradle.kts b/samples/user-interface/windowmanager/build.gradle.kts
index 5a88c796..b1fe5e43 100644
--- a/samples/user-interface/windowmanager/build.gradle.kts
+++ b/samples/user-interface/windowmanager/build.gradle.kts
@@ -27,8 +27,14 @@ android {
         minSdk = 24
         testOptions.targetSdk = 36
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     buildFeatures {