diff --git a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt
index 2457af9006..1560a74ebc 100644
--- a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt
+++ b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt
@@ -183,7 +183,7 @@ class NiaAppStateTest {
 @Composable
 private fun rememberTestNavController(): TestNavHostController {
     val context = LocalContext.current
-    val navController = remember {
+    return remember<TestNavHostController> {
         TestNavHostController(context).apply {
             navigatorProvider.addNavigator(ComposeNavigator())
             graph = createGraph(startDestination = "a") {
@@ -193,5 +193,4 @@ private fun rememberTestNavController(): TestNavHostController {
             }
         }
     }
-    return navController
 }
diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts
index a9ec7a78f0..026d777c17 100644
--- a/core/datastore/build.gradle.kts
+++ b/core/datastore/build.gradle.kts
@@ -62,3 +62,10 @@ dependencies {
     testImplementation(project(":core:datastore-test"))
     testImplementation(project(":core:testing"))
 }
+
+androidComponents.beforeVariants {
+    android.sourceSets.register(it.name) {
+        java.srcDir(buildDir.resolve("generated/source/proto/${it.name}/java"))
+        kotlin.srcDir(buildDir.resolve("generated/source/proto/${it.name}/kotlin"))
+    }
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 20afadb363..b2cda62d27 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ androidxActivity = "1.7.0"
 androidxAppCompat = "1.5.1"
 androidxBrowser = "1.4.0"
 androidxComposeBom = "2023.06.01"
-androidxComposeCompiler = "1.4.8"
+androidxComposeCompiler = "1.5.0"
 androidxComposeRuntimeTracing = "1.0.0-alpha03"
 androidxCore = "1.9.0"
 androidxCoreSplashscreen = "1.0.0"
@@ -34,15 +34,15 @@ firebasePerfPlugin = "1.4.2"
 gmsPlugin = "4.3.14"
 googleOss = "17.0.1"
 googleOssPlugin = "0.10.6"
-hilt = "2.46.1"
+hilt = "2.47"
 hiltExt = "1.0.0"
 jacoco = "0.8.7"
 junit4 = "4.13.2"
-kotlin = "1.8.22"
+kotlin = "1.9.0"
 kotlinxCoroutines = "1.6.4"
 kotlinxDatetime = "0.4.0"
 kotlinxSerializationJson = "1.5.1"
-ksp = "1.8.22-1.0.11"
+ksp = "1.9.0-1.0.11"
 lint = "30.3.1"
 okhttp = "4.10.0"
 protobuf = "3.23.0"