Update library versions and switch to using built-in Kotlin

AdaptiveJetStream/benchmark/build.gradle.kts

@@ -18,7 +18,6 @@ import com.android.build.api.dsl.ManagedVirtualDevice
 
 plugins {
     alias(libs.plugins.android.test)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.androidx.baselineprofile)
@@ -30,11 +29,11 @@ kotlin {
 
 android {
     namespace = "com.google.jetstream.benchmark"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 28
-        targetSdk = 35
+        targetSdk = 36
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments["androidx.benchmark.suppressErrors"] = "EMULATOR"
@@ -45,8 +44,8 @@ android {
         buildConfig = true
     }
 
-    testOptions.managedDevices.devices {
-        create<ManagedVirtualDevice>("tvApi34") {
+    testOptions.managedDevices.localDevices {
+        create("tvApi34") {
             device = "Television (1080p)"
             apiLevel = 34
             systemImageSource = "aosp"

AdaptiveJetStream/gradle/libs.versions.toml

@@ -1,38 +1,38 @@
 [versions]
-activity-compose = "1.11.0"
-android-gradle-plugin = "8.13.0"
-android-test-plugin = "8.13.0"
-androidx-baselineprofile = "1.4.1"
+activity-compose = "1.12.3"
+android-gradle-plugin = "9.0.0"
+android-test-plugin = "9.0.0"
+androidx-baselineprofile = "1.5.0-alpha02"
 benchmark-macro-junit4 = "1.4.1"
 coil-compose = "2.7.0"
-compose-bom = "2025.09.01"
+compose-bom = "2026.01.01"
 concurrent-futures-ktx = "1.3.0"
 tv-material = "1.0.1"
 core-ktx = "1.17.0"
-core-splashscreen = "1.0.1"
+core-splashscreen = "1.2.0"
 hilt-navigation-compose = "1.3.0"
-hilt-android = "2.57.2"
+hilt-android = "2.59"
 junit = "1.3.0"
 junit4 = "4.13.2"
-kotlin-android = "2.2.20"
+kotlin = "2.3.0"
 kotlinx-coroutines = "1.10.2"
-kotlinx-serialization = "1.9.0"
-ksp = "2.2.20-2.0.3"
-lifecycle-runtime-ktx = "2.9.4"
-material3-adaptive = "1.1.0"
+kotlinx-serialization = "1.10.0"
+ksp = "2.3.4"
+lifecycle-runtime-ktx = "2.10.0"
+material3-adaptive = "1.2.0"
 material3-adaptive-navigation = "1.4.0"
-media3 = "1.8.0"
-navigation-compose = "2.9.5"
+media3 = "1.9.1"
+navigation-compose = "2.9.7"
 profileinstaller = "1.4.1"
 uiautomator = "2.3.0"
 rules = "1.7.0"
-window = "1.5.0"
-xr = "1.0.0-alpha07"
-xr-material3 = "1.0.0-alpha11"
-screenshot = "0.0.1-alpha12"
-ui-tooling-preview = "1.10.0"
-ui-tooling = "1.10.0"
-robolectric = "4.16"
+window = "1.5.1"
+xr = "1.0.0-alpha10"
+xr-material3 = "1.0.0-alpha14"
+screenshot = "0.0.1-alpha13"
+ui-tooling-preview = "1.10.2"
+ui-tooling = "1.10.2"
+robolectric = "4.16.1"
 jacoco = "0.8.12"
 
 [libraries]
@@ -86,9 +86,9 @@ robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectr
 android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
 android-test = { id = "com.android.test", version.ref = "android-test-plugin" }
 androidx-baselineprofile = { id = "androidx.baselineprofile", version.ref = "androidx-baselineprofile" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-android" }
-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-android" }
-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin-android" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt-android" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 kotlin-parcelize = { id = "kotlin-parcelize" }

AdaptiveJetStream/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

AdaptiveJetStream/jetstream/build.gradle.kts

@@ -17,7 +17,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
  */
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.hilt)

AdaptiveJetStream/jetstream/src/main/AndroidManifest.xml

@@ -56,7 +56,7 @@ https://www.apache.org/licenses/LICENSE-2.0
         android:supportsRtl="true"
         android:theme="@style/Theme.App.Starting"
         android:usesCleartextTraffic="true"
-        tools:targetApi="35">
+        tools:targetApi="36">
 
         <!-- Enable profiling by macrobenchmark -->
         <profileable
@@ -99,4 +99,4 @@ https://www.apache.org/licenses/LICENSE-2.0
         </service>
     </application>
 
-</manifest>
+</manifest>

AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withSpatialNavigation/AppWithSpatialNavigation.kt

@@ -42,7 +42,7 @@ import androidx.xr.compose.material3.ExperimentalMaterial3XrApi
 import androidx.xr.compose.material3.NavigationRail
 import androidx.xr.compose.platform.LocalSpatialConfiguration
 import androidx.xr.compose.platform.SpatialConfiguration
-import androidx.xr.compose.spatial.ApplicationSubspace
+import androidx.xr.compose.spatial.Subspace
 import androidx.xr.compose.subspace.MovePolicy
 import androidx.xr.compose.subspace.ResizePolicy
 import androidx.xr.compose.subspace.SpatialPanel
@@ -89,7 +89,7 @@ fun AppWithSpatialNavigation(
         }
     }
 
-    ApplicationSubspace {
+    Subspace {
         SpatialPanel(
             resizePolicy = resizePolicy,
             dragPolicy = dragPolicy,