Updated to latest deps

Author: riggaroo

app/build.gradle.kts

@@ -43,7 +43,6 @@ android {
             initWith(buildTypes.getByName("release"))
             matchingFallbacks += listOf("release")
             isDebuggable = false
-            baselineProfile.automaticGenerationDuringBuild = false
         }
         release {
             isShrinkResources = true
@@ -52,7 +51,6 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",
             )
-            baselineProfile.automaticGenerationDuringBuild = false
             configure<CrashlyticsExtension> {
                 mappingFileUploadEnabled = true
             }

build_presubmit_mobile.sh

@@ -24,14 +24,14 @@ set -e
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 echo DIR
 # Define the Android SDK version you want to target.
-ANDROID_SDK_VERSION="36"
-ANDROID_BUILD_TOOLS_VERSION="36.0.0"
+ANDROID_SDK_VERSION="37"
+ANDROID_BUILD_TOOLS_VERSION="37.0.0"
 
 # Switched from 'google_apis' to 'google_atd' (Google Automated Test Device).
 # This system image is designed for headless, automated testing in CI environments
 # and is more compatible with software rendering. It will be installed but may not
 # be used by the new build command.
-# 36 not available yet as per b/432143095
+# 37 not available yet as per b/432143095
 EMULATOR_IMAGE="system-images;android-35;google_atd;x86_64"
 
 # --- Environment Setup ---

build_presubmit_wear.sh

@@ -24,14 +24,14 @@ set -e
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 echo DIR
 # Define the Android SDK version you want to target.
-ANDROID_SDK_VERSION="36"
-ANDROID_BUILD_TOOLS_VERSION="36.0.0"
+ANDROID_SDK_VERSION="37"
+ANDROID_BUILD_TOOLS_VERSION="37.0.0"
 
 # Switched from 'google_apis' to 'google_atd' (Google Automated Test Device).
 # This system image is designed for headless, automated testing in CI environments
 # and is more compatible with software rendering. It will be installed but may not
 # be used by the new build command.
-# 36 not available yet as per b/432143095
+# 37 not available yet as per b/432143095
 EMULATOR_IMAGE="system-images;android-35;google_atd;x86_64"
 
 # --- Environment Setup ---

build_release_mobile.sh

@@ -23,14 +23,14 @@ set -e
 # Get the script's directory.
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # Define the Android SDK version you want to target.
-ANDROID_SDK_VERSION="36"
-ANDROID_BUILD_TOOLS_VERSION="36.0.0"
+ANDROID_SDK_VERSION="37"
+ANDROID_BUILD_TOOLS_VERSION="37.0.0"
 
 # Switched from 'google_apis' to 'google_atd' (Google Automated Test Device).
 # This system image is designed for headless, automated testing in CI environments
 # and is more compatible with software rendering. It will be installed but may not
 # be used by the new build command.
-# 36 not available yet as per b/432143095
+# 37 not available yet as per b/432143095
 EMULATOR_IMAGE="system-images;android-35;google_atd;x86_64"
 
 # --- Environment Setup ---

build_release_wear.sh

@@ -23,14 +23,14 @@ set -e
 # Get the script's directory.
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # Define the Android SDK version you want to target.
-ANDROID_SDK_VERSION="36"
-ANDROID_BUILD_TOOLS_VERSION="36.0.0"
+ANDROID_SDK_VERSION="37"
+ANDROID_BUILD_TOOLS_VERSION="37.0.0"
 
 # Switched from 'google_apis' to 'google_atd' (Google Automated Test Device).
 # This system image is designed for headless, automated testing in CI environments
 # and is more compatible with software rendering. It will be installed but may not
 # be used by the new build command.
-# 36 not available yet as per b/432143095
+# 37 not available yet as per b/432143095
 EMULATOR_IMAGE="system-images;android-35;google_atd;x86_64"
 
 # --- Environment Setup ---

core/theme/build.gradle.kts

@@ -42,6 +42,7 @@ android {
 dependencies {
     implementation(libs.androidx.ui.text.google.fonts)
     implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.compose.foundation)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
     implementation(projects.core.util)

feature/results/src/main/java/com/android/developers/androidify/customize/xr/CustomizeExportScreenSpatial.kt

@@ -35,9 +35,9 @@ import androidx.xr.compose.spatial.Orbiter
 import androidx.xr.compose.spatial.OrbiterOffsetType
 import androidx.xr.compose.subspace.SpatialBox
 import androidx.xr.compose.subspace.SpatialColumn
-import androidx.xr.compose.subspace.SpatialLayoutSpacer
 import androidx.xr.compose.subspace.SpatialPanel
 import androidx.xr.compose.subspace.SpatialRow
+import androidx.xr.compose.subspace.SpatialSpacer
 import androidx.xr.compose.subspace.layout.SubspaceModifier
 import androidx.xr.compose.subspace.layout.fillMaxHeight
 import androidx.xr.compose.subspace.layout.fillMaxWidth
@@ -109,7 +109,7 @@ fun CustomizeExportLayoutSpatial(
                             }
                         }
                     }
-                    SpatialLayoutSpacer(SubspaceModifier.width(48.dp))
+                    SpatialSpacer(SubspaceModifier.width(48.dp))
                     SpatialBox(SubspaceModifier.fillMaxHeight(0.7f)) {
                         SpatialPanel(
                             modifier = SubspaceModifier.offset(z = 10.dp).fillMaxWidth(0.3f),

gradle/libs.versions.toml

@@ -3,83 +3,84 @@
 appVersionCode = "10"
 appVersionName = "1.3.0"
 appVersionWearOffset = "60000000"
-agp = "9.0.0"
-bcpkixJdk18on = "1.83"
+agp = "9.2.1"
+bcpkixJdk18on = "1.84"
 core = "1.7.0"
-extensionsXr = "1.1.0"
+extensionsXr = "1.3.0"
 leakcanaryAndroid = "2.14"
 javaVersion = "17"
 
 #dependencies
 accompanist = "0.37.3"
-activityCompose = "1.12.1"
+activityCompose = "1.13.0"
 adaptive = "1.2.0"
-apksig = "9.0.0-alpha06"
+apksig = "9.2.1"
 appcompat = "1.7.1"
-baselineprofile = "1.5.0-alpha01"
+baselineprofile = "1.5.0-alpha06"
 benchmarkMacroJunit4 = "1.4.1"
-camerax = "1.5.2"
-coilCompose = "3.3.0"
-coilGif = "3.3.0"
-composeBom = "2025.12.00"
+camerax = "1.6.1"
+coilCompose = "3.4.0"
+coilGif = "3.4.0"
+composeBom = "2026.05.01"
 concurrent = "1.3.0"
 converterGson = "2.11.0"
-coreKtx = "1.17.0"
-coreSplashscreen = "1.0.1"
-crashlytics = "3.0.6"
-datastore = "1.1.7"
+coreKtx = "1.18.0"
+coreSplashscreen = "1.2.0"
+crashlytics = "3.0.7"
+datastore = "1.2.1"
 espressoCore = "3.7.0"
-firebaseBom = "34.4.0"
-genaiPrompt = "1.0.0-alpha1"
+firebaseBom = "34.13.0"
+foundation = "1.12.0-alpha03"
+genaiPrompt = "1.0.0-beta2"
 googleServices = "4.4.4"
-googleOss = "17.3.0"
-googleOssPlugin = "0.10.10"
-guava = "33.5.0-android"
-hiltAndroid = "2.59"
+googleOss = "17.5.1"
+googleOssPlugin = "0.12.0"
+guava = "33.6.0-android"
+hiltAndroid = "2.59.2"
 hiltLifecycleViewmodel = "1.0.0-alpha03"
 hiltNavigationCompose = "1.3.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
 kotlin = "2.3.0"
 ksp = "2.3.4"
-kotlinxCoroutines = "1.10.2"
+kotlinxCoroutines = "1.11.0"
 kotlinxSerialization = "2.3.0"
-kotlinxSerializationJson = "1.9.0"
-kotlinxSerializationProtobuf = "1.9.0"
+kotlinxSerializationJson = "1.11.0"
+kotlinxSerializationProtobuf = "1.11.0"
 ktlint = "1.5.0"
 lifecycleRuntimeKtx = "2.10.0"
 lifecycleViewmodelNavigation3 = "2.10.0"
 loggingInterceptor = "5.3.2"
-material3 = "1.5.0-alpha10"
-media3 = "1.8.0"
-navigation3 = "1.0.0"
-okhttp = "4.12.0"
-playServicesWearable = "19.0.0"
+material3 = "1.5.0-alpha20"
+media3 = "1.10.1"
+navigation3 = "1.1.2"
+okhttp = "5.3.2"
+playServicesWearable = "20.0.1"
 playServicesBaseTesting = "16.2.0"
 poseDetection = "18.0.0-beta5"
 profileinstaller = "1.4.1"
 retrofit = "2.11.0"
-robolectric = "4.16"
-spotless = "8.0.0"
+robolectric = "4.16.1"
+spotless = "8.6.0"
 startup = "1.2.0"
 runner = "1.7.0"
-uiTextGoogleFonts = "1.9.3"
+uiTextGoogleFonts = "1.11.2"
 uiautomator = "2.4.0-alpha07"
-uiTooling = "1.10.0"
+uiTooling = "1.11.2"
 validatorPush = "1.0.0-alpha09"
 watchFacePush = "1.0.0-beta01"
-wear = "1.3.0"
-wearCompose = "1.6.0-alpha09"
-wearComposeTooling = "1.5.6"
-wearRemoteInteractions = "1.1.0"
-window = "1.5.0"
-lifecycleProcess = "2.9.4"
+wear = "1.4.0"
+wearCompose = "1.6.2"
+wearComposeTooling = "1.6.2"
+wearRemoteInteractions = "1.2.0"
+window = "1.5.1"
+lifecycleProcess = "2.10.0"
 mlkitCommon = "18.11.0"
 mlkitSegmentation = "16.0.0-beta1"
-playServicesBase = "18.9.0"
+playServicesBase = "18.10.0"
 timber = "5.0.1"
-workRuntimeKtx = "2.10.5"
-xr-compose = "1.0.0-alpha11"
+workRuntimeKtx = "2.11.2"
+xr-compose = "1.0.0-alpha14"
 
 [libraries]
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
@@ -94,6 +95,7 @@ androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.r
 androidx-camera-compose = { module = "androidx.camera:camera-compose", version.ref = "camerax" }
 androidx-camera-core = { module = "androidx.camera:camera-core", version.ref = "camerax" }
 androidx-camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref = "camerax" }
+androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "foundation" }
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
 androidx-concurrent-futures-ktx = { module = "androidx.concurrent:concurrent-futures-ktx", version.ref = "concurrent" }
 androidx-core = { module = "androidx.test:core", version.ref = "core" }

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle.kts

@@ -36,10 +36,10 @@ plugins {
 
 android {
     compileSdk {
-        version = release(36)
+        version = release(37)
     }
     targetSdk {
-        version = release(36)
+        version = release(37)
     }
     minSdk {
         version = release(26)