Update dependencies

bluetoothle/build.gradle.kts

@@ -2,6 +2,11 @@
 plugins {
     alias(libs.plugins.android.application)
 }
+
+kotlin {
+    jvmToolchain(17)
+}
+
 android {
     compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "com.sample.android.bluetoothle"
@@ -18,9 +23,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        jvmToolchain(17)
-    }
     buildTypes {
         getByName("debug") {
             signingConfig = signingConfigs.getByName("debug")

camerax/build.gradle.kts

@@ -21,6 +21,12 @@ plugins {
     alias(libs.plugins.compose.compiler)
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.fromTarget("17")
+    }
+}
+
 android {
     namespace = "com.example.camerax.snippets"
     compileSdk = 36
@@ -48,11 +54,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.fromTarget("17")
-        }
-    }
     buildFeatures {
         compose = true
     }

compose/snippets/build.gradle.kts

@@ -23,6 +23,10 @@ plugins {
     alias(libs.plugins.kotlin.serialization)
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 android {
     compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "com.example.compose.snippets"
@@ -43,6 +47,7 @@ android {
 
         getByName("release") {
             isMinifyEnabled = true
+            isShrinkResources = true
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro")
         }
@@ -53,10 +58,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlin {
-        jvmToolchain(17)
-    }
-
     buildFeatures {
         compose = true
         // Disable unused AGP features

compose/snippets/src/androidTest/java/com/example/compose/snippets/accessibility/AccessibilitySnippets.kt

@@ -33,7 +33,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.test.SemanticsMatcher
 import androidx.compose.ui.test.assert
 import androidx.compose.ui.test.junit4.accessibility.enableAccessibilityChecks
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule
 import androidx.compose.ui.test.onRoot
 import androidx.compose.ui.test.tryPerformAccessibilityChecks
 import androidx.compose.ui.unit.dp

compose/snippets/src/androidTest/java/com/example/compose/snippets/animation/AnimationTestingSnippets.kt

@@ -30,7 +30,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.test.captureToImage
-import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.junit4.v2.createComposeRule
 import androidx.compose.ui.test.onRoot
 import androidx.compose.ui.unit.dp
 import org.junit.Rule

compose/snippets/src/androidTest/java/com/example/compose/snippets/deviceconfigurationoverride/DeviceConfigurationOverrideSnippets.kt

@@ -21,7 +21,7 @@ import androidx.compose.ui.test.DeviceConfigurationOverride
 import androidx.compose.ui.test.FontScale
 import androidx.compose.ui.test.FontWeightAdjustment
 import androidx.compose.ui.test.ForcedSize
-import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.junit4.v2.createComposeRule
 import androidx.compose.ui.test.then
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp

compose/snippets/src/androidTest/java/com/example/compose/snippets/interop/AddingComposeToYourAppSnippets.kt

@@ -17,7 +17,7 @@
 package com.example.compose.snippets.interop
 
 import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.test.platform.app.InstrumentationRegistry
 import com.example.compose.snippets.MyActivity

compose/snippets/src/androidTest/java/com/example/compose/snippets/semantics/SemanticsSnippets.kt

@@ -22,7 +22,7 @@ import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.SemanticsProperties
 import androidx.compose.ui.test.SemanticsMatcher
 import androidx.compose.ui.test.assertIsOff
-import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.junit4.v2.createComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.onRoot
 import androidx.compose.ui.test.performClick

compose/snippets/src/androidTest/java/com/example/compose/snippets/touchinput/pointerinput/UnderstandGesturesSnippets.kt

@@ -19,7 +19,7 @@ package com.example.compose.snippets.touchinput.pointerinput
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.test.click
-import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.junit4.v2.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performTouchInput
 import androidx.compose.ui.test.swipeDown

compose/snippets/src/main/java/com/example/compose/snippets/components/DatePickers.kt

@@ -61,6 +61,7 @@ import com.example.compose.snippets.ui.theme.SnippetsTheme
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
+import androidx.compose.ui.platform.LocalLocale
 
 @Preview
 @Composable
@@ -105,7 +106,7 @@ fun DatePickerExamples() {
 // [END_EXCLUDE]
         if (selectedDate != null) {
             val date = Date(selectedDate!!)
-            val formattedDate = SimpleDateFormat("MMM dd, yyyy", Locale.getDefault()).format(date)
+            val formattedDate = SimpleDateFormat("MMM dd, yyyy", LocalLocale.current.platformLocale).format(date)
             Text("Selected date: $formattedDate")
         } else {
             Text("No date selected")
@@ -121,8 +122,8 @@ fun DatePickerExamples() {
         if (selectedDateRange.first != null && selectedDateRange.second != null) {
             val startDate = Date(selectedDateRange.first!!)
             val endDate = Date(selectedDateRange.second!!)
-            val formattedStartDate = SimpleDateFormat("MMM dd, yyyy", Locale.getDefault()).format(startDate)
-            val formattedEndDate = SimpleDateFormat("MMM dd, yyyy", Locale.getDefault()).format(endDate)
+            val formattedStartDate = SimpleDateFormat("MMM dd, yyyy", LocalLocale.current.platformLocale).format(startDate)
+            val formattedEndDate = SimpleDateFormat("MMM dd, yyyy", LocalLocale.current.platformLocale).format(endDate)
             Text("Selected date range: $formattedStartDate - $formattedEndDate")
         } else {
             Text("No date range selected")

datastore/build.gradle.kts

@@ -12,6 +12,12 @@ plugins {
     // [END android_datastore_serialization_plugin]
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.fromTarget("11")
+    }
+}
+
 android {
     namespace = "com.example.datastore.snippets"
     compileSdk = 36
@@ -39,11 +45,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.fromTarget("11")
-        }
-    }
     buildFeatures {
         compose = true
     }

datastore/src/androidTest/java/com/example/datastore/snippets/DataStoreSnippetsTest.kt

@@ -16,7 +16,7 @@
 
 package com.example.datastore.snippets
 
-import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.junit4.v2.createComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.example.datastore.snippets.json.JsonDataStoreScreen

gradle.properties

@@ -24,7 +24,6 @@ kotlin.code.style=official
 # Enable R8 full mode.
 android.enableR8.fullMode=true
 
-android.newDsl=false
 # Use an AndroidX snapshot build.
 # https://androidx.dev/snapshots/builds
-# snapshotVersion=14793336
+# snapshotVersion=14793336

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ androidx-appcompat = "1.7.1"
 androidx-appfunctions = "1.0.0-alpha08"
 androidx-cameraX = "1.6.0"
 androidx-car = "1.7.0"
-androidx-compose-bom = "2026.03.00"
+androidx-compose-bom = "2026.04.01"
 androidx-compose-ui-test = "1.7.0-alpha08"
 androidx-compose-ui-test-junit4-accessibility = "1.11.0-beta01"
 androidx-constraintlayout = "2.2.1"
@@ -24,7 +24,7 @@ androidx-glance-appwidget = "1.1.1"
 androidx-lifecycle-compose = "2.10.0"
 androidx-lifecycle-runtime-compose = "2.10.0"
 androidx-lifecycle-viewmodel-navigation3 = "2.10.0-beta01"
-androidx-navigation = "2.9.7"
+androidx-navigation = "2.9.8"
 androidx-navigation3 = "1.1.0"
 androidx-paging = "3.4.2"
 androidx-startup-runtime = "1.2.0"
@@ -35,7 +35,7 @@ androidx-test-junit = "1.3.0"
 androidx-window = "1.5.1"
 androidx-window-core = "1.5.1"
 androidx-window-java = "1.5.1"
-androidx-work-runtime = "2.11.1"
+androidx-work-runtime = "2.11.2"
 androidx-xr-arcore = "1.0.0-alpha12"
 androidx-xr-arcore-play-services = "1.0.0-alpha12"
 androidx-xr-compose = "1.0.0-alpha12"
@@ -57,64 +57,64 @@ datastoreCore = "1.2.1"
 datastorePreferencesRxjava2 = "1.2.1"
 datastorePreferencesRxjava3 = "1.2.1"
 firebase-bom = "34.10.0"
-glide = "1.0.0-beta08"
+glide = "1.0.0-beta09"
 google-ar-core = "1.53.0"
 google-maps = "20.0.0"
-gradle-versions = "0.53.0"
-guava = "33.5.0-jre"
-guava-android = "33.5.0-jre"
+gradle-versions = "0.54.0"
+guava = "33.6.0-jre"
+guava-android = "33.6.0-jre"
 health-connect = "1.1.0-alpha11"
 hilt = "2.59.2"
 horologist = "0.8.3-alpha"
 junit = "4.13.2"
-kotlin = "2.3.10"
+kotlin = "2.3.21"
 kotlinCoroutinesOkhttp = "1.0"
 kotlinxCoroutinesGuava = "1.10.2"
-kotlinxSerialization = "1.10.0"
-ksp = "2.3.6"
+kotlinxSerialization = "1.11.0"
+ksp = "2.3.7"
 ktlint = "1.5.0"
 lifecycleService = "2.10.0"
 maps-compose = "8.2.1"
-material = "1.14.0-alpha10"
+material = "1.14.0-beta01"
 material3-adaptive = "1.2.0"
 material3-adaptive-navigation-suite = "1.4.0"
 material3-adaptive-navigation3 = "1.3.0-alpha09"
-media3 = "1.9.2"
-media3Ui = "1.9.2"
+media3 = "1.10.0"
+media3Ui = "1.10.0"
 mockitoKotlin = "5.3.1"
 # @keep
 minSdk = "36"
 okHttp = "5.3.2"
 playServicesWearable = "19.0.0"
 playbilling = "8.3.0"
-protobuf = "4.34.0"
-protoc = "0.9.6"
-protolayout = "1.3.0"
+protobuf = "4.34.1"
+protoc = "0.10.0"
+protolayout = "1.4.0"
 reactive-streams = "1.0.4"
 recyclerview = "1.4.0"
 registryDigitalCredentials = "1.0.0-alpha04"
 robolectric = "4.16.1"
 roborazzi = "1.59.0"
-spotless = "8.3.0"
+spotless = "8.4.0"
 targetSdk = "37"
-tiles = "1.5.0"
+tiles = "1.6.0"
 tracing = "1.3.0"
-truth = "1.4.4"
+truth = "1.4.5"
 tvComposeMaterial3 = "1.1.0-beta01"
 validatorPush = "1.0.0-alpha09"
 version-catalog-update = "1.1.0"
 watchfaceComplicationsDataSourceKtx = "1.3.0"
 wear = "1.4.0"
-wearComposeFoundation = "1.6.0-rc01"
-wearComposeMaterial = "1.6.0-rc01"
-wearComposeMaterial3 = "1.6.0-rc01"
+wearComposeFoundation = "1.6.1"
+wearComposeMaterial = "1.6.1"
+wearComposeMaterial3 = "1.6.1"
 wearInput = "1.2.0"
 wearOngoing = "1.1.0"
 wearPhoneInteractions = "1.1.0"
 wearRemoteInteractions = "1.2.0"
 wearToolingPreview = "1.0.0"
 webkit = "1.15.0"
-wfp = "1.0.0-rc01"
+wfp = "1.0.0"
 androidx-core-telecom = "1.1.0-alpha04"
 
 [libraries]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

identity/credentialmanager/build.gradle.kts

@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.compose.compiler)
@@ -34,13 +33,6 @@ android {
     buildFeatures {
         compose = true
     }
-    sourceSets {
-        named("main") {
-            java {
-                srcDir("src/main/java")
-            }
-        }
-    }
 }
 
 dependencies {

kmp/shared/build.gradle.kts

@@ -8,7 +8,7 @@ kotlin {
     // Target declarations - add or remove as needed below. These define
     // which platforms this KMP module supports.
     // See: https://kotlinlang.org/docs/multiplatform-discover-project.html#targets
-    androidLibrary {
+    android {
         namespace = "com.example.kmp.snippets.shared"
         compileSdk = libs.versions.compileSdk.get().toInt()
         minSdk = libs.versions.minSdk.get().toInt()

kotlin/build.gradle.kts

@@ -2,6 +2,10 @@ plugins {
     alias(libs.plugins.android.application)
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 android {
     compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "com.example.android.kotlin"
@@ -15,10 +19,6 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    kotlin {
-        jvmToolchain(17)
-    }
-
     buildTypes {
         getByName("debug") {
             signingConfig = signingConfigs.getByName("debug")
@@ -40,7 +40,6 @@ android {
         // Disable unused AGP features
         buildConfig = false
         aidl = false
-        renderScript = false
         resValues = false
         shaders = false
     }

watchfacepush/validator/build.gradle.kts

@@ -37,15 +37,6 @@ application {
 
 }
 
-sourceSets {
-    named("main") {
-        java {
-            srcDir("src/main/java")
-        }
-    }
-
-}
-
 dependencies {
     implementation(libs.validator.push)
 }