diff --git a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt
index 587e4feba..bc48da7a7 100644
--- a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt
+++ b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt
@@ -1,7 +1,7 @@
 androidx.activity:activity-compose:1.9.3
 androidx.activity:activity-ktx:1.9.3
 androidx.activity:activity:1.9.3
-androidx.annotation:annotation-experimental:1.4.1
+androidx.annotation:annotation-experimental:1.5.1
 androidx.annotation:annotation-jvm:1.9.1
 androidx.annotation:annotation:1.9.1
 androidx.appcompat:appcompat-resources:1.6.1
@@ -9,53 +9,58 @@ androidx.arch.core:core-common:2.2.0
 androidx.arch.core:core-runtime:2.2.0
 androidx.autofill:autofill:1.0.0
 androidx.browser:browser:1.8.0
-androidx.collection:collection-jvm:1.5.0-beta03
-androidx.collection:collection-ktx:1.5.0-beta03
-androidx.collection:collection:1.5.0-beta03
-androidx.compose.animation:animation-android:1.8.0-beta02
-androidx.compose.animation:animation-core-android:1.8.0-beta02
-androidx.compose.animation:animation-core:1.8.0-beta02
-androidx.compose.animation:animation:1.8.0-beta02
-androidx.compose.foundation:foundation-android:1.8.0-beta02
-androidx.compose.foundation:foundation-layout-android:1.8.0-beta02
-androidx.compose.foundation:foundation-layout:1.8.0-beta02
-androidx.compose.foundation:foundation:1.8.0-beta02
-androidx.compose.material3.adaptive:adaptive-android:1.1.0-rc01
-androidx.compose.material3.adaptive:adaptive:1.1.0-rc01
-androidx.compose.material3:material3-adaptive-navigation-suite-android:1.4.0-alpha08
-androidx.compose.material3:material3-adaptive-navigation-suite:1.4.0-alpha08
-androidx.compose.material3:material3-android:1.4.0-alpha08
-androidx.compose.material3:material3:1.4.0-alpha08
+androidx.collection:collection-jvm:1.5.0
+androidx.collection:collection-ktx:1.5.0
+androidx.collection:collection:1.5.0
+androidx.compose.animation:animation-android:1.10.0-alpha02
+androidx.compose.animation:animation-core-android:1.10.0-alpha02
+androidx.compose.animation:animation-core:1.10.0-alpha02
+androidx.compose.animation:animation:1.10.0-alpha02
+androidx.compose.foundation:foundation-android:1.10.0-alpha02
+androidx.compose.foundation:foundation-layout-android:1.10.0-alpha02
+androidx.compose.foundation:foundation-layout:1.10.0-alpha02
+androidx.compose.foundation:foundation:1.10.0-alpha02
+androidx.compose.material3.adaptive:adaptive-android:1.2.0-beta01
+androidx.compose.material3.adaptive:adaptive:1.2.0-beta01
+androidx.compose.material3:material3-adaptive-navigation-suite-android:1.5.0-alpha03
+androidx.compose.material3:material3-adaptive-navigation-suite:1.5.0-alpha03
+androidx.compose.material3:material3-android:1.5.0-alpha03
+androidx.compose.material3:material3:1.5.0-alpha03
 androidx.compose.material:material-icons-core-android:1.7.8
 androidx.compose.material:material-icons-core:1.7.8
 androidx.compose.material:material-icons-extended-android:1.7.8
 androidx.compose.material:material-icons-extended:1.7.8
-androidx.compose.material:material-ripple-android:1.8.0-beta02
-androidx.compose.material:material-ripple:1.8.0-beta02
-androidx.compose.runtime:runtime-android:1.8.0-beta02
-androidx.compose.runtime:runtime-saveable-android:1.8.0-beta02
-androidx.compose.runtime:runtime-saveable:1.8.0-beta02
-androidx.compose.runtime:runtime:1.8.0-beta02
-androidx.compose.ui:ui-android:1.8.0-beta02
-androidx.compose.ui:ui-geometry-android:1.8.0-beta02
-androidx.compose.ui:ui-geometry:1.8.0-beta02
-androidx.compose.ui:ui-graphics-android:1.8.0-beta02
-androidx.compose.ui:ui-graphics:1.8.0-beta02
-androidx.compose.ui:ui-text-android:1.8.0-beta02
-androidx.compose.ui:ui-text:1.8.0-beta02
-androidx.compose.ui:ui-tooling-preview-android:1.8.0-beta02
-androidx.compose.ui:ui-tooling-preview:1.8.0-beta02
-androidx.compose.ui:ui-unit-android:1.8.0-beta02
-androidx.compose.ui:ui-unit:1.8.0-beta02
-androidx.compose.ui:ui-util-android:1.8.0-beta02
-androidx.compose.ui:ui-util:1.8.0-beta02
-androidx.compose.ui:ui:1.8.0-beta02
-androidx.compose:compose-bom-alpha:2025.02.00
+androidx.compose.material:material-ripple-android:1.10.0-alpha02
+androidx.compose.material:material-ripple:1.10.0-alpha02
+androidx.compose.runtime:runtime-android:1.10.0-alpha02
+androidx.compose.runtime:runtime-annotation-android:1.10.0-alpha02
+androidx.compose.runtime:runtime-annotation:1.10.0-alpha02
+androidx.compose.runtime:runtime-saveable-android:1.10.0-alpha02
+androidx.compose.runtime:runtime-saveable:1.10.0-alpha02
+androidx.compose.runtime:runtime:1.10.0-alpha02
+androidx.compose.ui:ui-android:1.10.0-alpha02
+androidx.compose.ui:ui-geometry-android:1.10.0-alpha02
+androidx.compose.ui:ui-geometry:1.10.0-alpha02
+androidx.compose.ui:ui-graphics-android:1.10.0-alpha02
+androidx.compose.ui:ui-graphics:1.10.0-alpha02
+androidx.compose.ui:ui-text-android:1.10.0-alpha02
+androidx.compose.ui:ui-text:1.10.0-alpha02
+androidx.compose.ui:ui-tooling-preview-android:1.10.0-alpha02
+androidx.compose.ui:ui-tooling-preview:1.10.0-alpha02
+androidx.compose.ui:ui-unit-android:1.10.0-alpha02
+androidx.compose.ui:ui-unit:1.10.0-alpha02
+androidx.compose.ui:ui-util-android:1.10.0-alpha02
+androidx.compose.ui:ui-util:1.10.0-alpha02
+androidx.compose.ui:ui:1.10.0-alpha02
+androidx.compose:compose-bom-alpha:2025.08.01
 androidx.concurrent:concurrent-futures:1.1.0
-androidx.core:core-ktx:1.13.1
-androidx.core:core:1.13.1
+androidx.core:core-ktx:1.16.0
+androidx.core:core-viewtree:1.0.0
+androidx.core:core:1.16.0
 androidx.customview:customview-poolingcontainer:1.0.0
 androidx.customview:customview:1.0.0
+androidx.documentfile:documentfile:1.0.0
+androidx.dynamicanimation:dynamicanimation:1.0.0
 androidx.emoji2:emoji2:1.4.0
 androidx.exifinterface:exifinterface:1.3.7
 androidx.fragment:fragment:1.5.1
@@ -63,39 +68,46 @@ androidx.graphics:graphics-path:1.0.1
 androidx.graphics:graphics-shapes-android:1.0.1
 androidx.graphics:graphics-shapes:1.0.1
 androidx.interpolator:interpolator:1.0.0
-androidx.lifecycle:lifecycle-common-java8:2.8.7
-androidx.lifecycle:lifecycle-common-jvm:2.8.7
-androidx.lifecycle:lifecycle-common:2.8.7
-androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.7
-androidx.lifecycle:lifecycle-livedata-core:2.8.7
-androidx.lifecycle:lifecycle-livedata:2.8.7
-androidx.lifecycle:lifecycle-process:2.8.7
-androidx.lifecycle:lifecycle-runtime-android:2.8.7
-androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7
-androidx.lifecycle:lifecycle-runtime-compose:2.8.7
-androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7
-androidx.lifecycle:lifecycle-runtime-ktx:2.8.7
-androidx.lifecycle:lifecycle-runtime:2.8.7
-androidx.lifecycle:lifecycle-viewmodel-android:2.8.7
-androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7
-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7
-androidx.lifecycle:lifecycle-viewmodel:2.8.7
+androidx.legacy:legacy-support-core-utils:1.0.0
+androidx.lifecycle:lifecycle-common-java8:2.10.0-alpha03
+androidx.lifecycle:lifecycle-common-jvm:2.10.0-alpha03
+androidx.lifecycle:lifecycle-common:2.10.0-alpha03
+androidx.lifecycle:lifecycle-livedata-core-ktx:2.10.0-alpha03
+androidx.lifecycle:lifecycle-livedata-core:2.10.0-alpha03
+androidx.lifecycle:lifecycle-livedata:2.10.0-alpha03
+androidx.lifecycle:lifecycle-process:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime-android:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime-compose-android:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime-compose:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime-ktx-android:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime-ktx:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel-android:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel-savedstate-android:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel:2.10.0-alpha03
 androidx.loader:loader:1.0.0
+androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
 androidx.metrics:metrics-performance:1.0.0-beta01
+androidx.print:print:1.0.0
 androidx.profileinstaller:profileinstaller:1.4.0
-androidx.savedstate:savedstate-ktx:1.2.1
-androidx.savedstate:savedstate:1.2.1
+androidx.savedstate:savedstate-android:1.4.0-alpha03
+androidx.savedstate:savedstate-compose-android:1.4.0-alpha03
+androidx.savedstate:savedstate-compose:1.4.0-alpha03
+androidx.savedstate:savedstate-ktx:1.4.0-alpha03
+androidx.savedstate:savedstate:1.4.0-alpha03
 androidx.startup:startup-runtime:1.1.1
 androidx.tracing:tracing-ktx:1.3.0-alpha02
 androidx.tracing:tracing:1.3.0-alpha02
+androidx.transition:transition:1.6.0
 androidx.vectordrawable:vectordrawable-animated:1.1.0
 androidx.vectordrawable:vectordrawable:1.1.0
 androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager:viewpager:1.0.0
-androidx.window.extensions.core:core:1.0.0
-androidx.window:window-core-android:1.3.0
-androidx.window:window-core:1.3.0
-androidx.window:window:1.3.0
+androidx.window:window-core-android:1.4.0
+androidx.window:window-core:1.4.0
+androidx.window:window:1.4.0
 com.google.accompanist:accompanist-drawablepainter:0.32.0
 com.google.code.findbugs:jsr305:3.0.2
 com.google.dagger:dagger-lint-aar:2.56
@@ -122,5 +134,8 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1
 org.jetbrains.kotlinx:kotlinx-datetime:0.6.1
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3
 org.jetbrains:annotations:23.0.0
 org.jspecify:jspecify:1.0.0
diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt
index 8457feb9f..7c112c7fe 100644
--- a/app/dependencies/prodReleaseRuntimeClasspath.txt
+++ b/app/dependencies/prodReleaseRuntimeClasspath.txt
@@ -1,7 +1,7 @@
-androidx.activity:activity-compose:1.9.3
-androidx.activity:activity-ktx:1.9.3
-androidx.activity:activity:1.9.3
-androidx.annotation:annotation-experimental:1.4.1
+androidx.activity:activity-compose:1.10.1
+androidx.activity:activity-ktx:1.10.1
+androidx.activity:activity:1.10.1
+androidx.annotation:annotation-experimental:1.5.1
 androidx.annotation:annotation-jvm:1.9.1
 androidx.annotation:annotation:1.9.1
 androidx.appcompat:appcompat-resources:1.7.0
@@ -10,60 +10,63 @@ androidx.arch.core:core-common:2.2.0
 androidx.arch.core:core-runtime:2.2.0
 androidx.autofill:autofill:1.0.0
 androidx.browser:browser:1.8.0
-androidx.collection:collection-jvm:1.5.0-beta03
-androidx.collection:collection-ktx:1.5.0-beta03
-androidx.collection:collection:1.5.0-beta03
-androidx.compose.animation:animation-android:1.8.0-beta02
-androidx.compose.animation:animation-core-android:1.8.0-beta02
-androidx.compose.animation:animation-core:1.8.0-beta02
-androidx.compose.animation:animation:1.8.0-beta02
-androidx.compose.foundation:foundation-android:1.8.0-beta02
-androidx.compose.foundation:foundation-layout-android:1.8.0-beta02
-androidx.compose.foundation:foundation-layout:1.8.0-beta02
-androidx.compose.foundation:foundation:1.8.0-beta02
-androidx.compose.material3.adaptive:adaptive-android:1.1.0-rc01
-androidx.compose.material3.adaptive:adaptive-layout-android:1.1.0-rc01
-androidx.compose.material3.adaptive:adaptive-layout:1.1.0-rc01
-androidx.compose.material3.adaptive:adaptive-navigation-android:1.1.0-rc01
-androidx.compose.material3.adaptive:adaptive-navigation:1.1.0-rc01
-androidx.compose.material3.adaptive:adaptive:1.1.0-rc01
-androidx.compose.material3:material3-adaptive-navigation-suite-android:1.4.0-alpha08
-androidx.compose.material3:material3-adaptive-navigation-suite:1.4.0-alpha08
-androidx.compose.material3:material3-android:1.4.0-alpha08
-androidx.compose.material3:material3-window-size-class-android:1.4.0-alpha08
-androidx.compose.material3:material3-window-size-class:1.4.0-alpha08
-androidx.compose.material3:material3:1.4.0-alpha08
+androidx.collection:collection-jvm:1.5.0
+androidx.collection:collection-ktx:1.5.0
+androidx.collection:collection:1.5.0
+androidx.compose.animation:animation-android:1.10.0-alpha02
+androidx.compose.animation:animation-core-android:1.10.0-alpha02
+androidx.compose.animation:animation-core:1.10.0-alpha02
+androidx.compose.animation:animation:1.10.0-alpha02
+androidx.compose.foundation:foundation-android:1.10.0-alpha02
+androidx.compose.foundation:foundation-layout-android:1.10.0-alpha02
+androidx.compose.foundation:foundation-layout:1.10.0-alpha02
+androidx.compose.foundation:foundation:1.10.0-alpha02
+androidx.compose.material3.adaptive:adaptive-android:1.2.0-beta01
+androidx.compose.material3.adaptive:adaptive-layout-android:1.2.0-beta01
+androidx.compose.material3.adaptive:adaptive-layout:1.2.0-beta01
+androidx.compose.material3.adaptive:adaptive-navigation-android:1.2.0-beta01
+androidx.compose.material3.adaptive:adaptive-navigation:1.2.0-beta01
+androidx.compose.material3.adaptive:adaptive:1.2.0-beta01
+androidx.compose.material3:material3-adaptive-navigation-suite-android:1.5.0-alpha03
+androidx.compose.material3:material3-adaptive-navigation-suite:1.5.0-alpha03
+androidx.compose.material3:material3-android:1.5.0-alpha03
+androidx.compose.material3:material3-window-size-class-android:1.5.0-alpha03
+androidx.compose.material3:material3-window-size-class:1.5.0-alpha03
+androidx.compose.material3:material3:1.5.0-alpha03
 androidx.compose.material:material-icons-core-android:1.7.8
 androidx.compose.material:material-icons-core:1.7.8
 androidx.compose.material:material-icons-extended-android:1.7.8
 androidx.compose.material:material-icons-extended:1.7.8
-androidx.compose.material:material-ripple-android:1.8.0-beta02
-androidx.compose.material:material-ripple:1.8.0-beta02
-androidx.compose.runtime:runtime-android:1.8.0-beta02
-androidx.compose.runtime:runtime-saveable-android:1.8.0-beta02
-androidx.compose.runtime:runtime-saveable:1.8.0-beta02
-androidx.compose.runtime:runtime-tracing:1.8.0-beta02
-androidx.compose.runtime:runtime:1.8.0-beta02
-androidx.compose.ui:ui-android:1.8.0-beta02
-androidx.compose.ui:ui-geometry-android:1.8.0-beta02
-androidx.compose.ui:ui-geometry:1.8.0-beta02
-androidx.compose.ui:ui-graphics-android:1.8.0-beta02
-androidx.compose.ui:ui-graphics:1.8.0-beta02
-androidx.compose.ui:ui-text-android:1.8.0-beta02
-androidx.compose.ui:ui-text:1.8.0-beta02
-androidx.compose.ui:ui-tooling-preview-android:1.8.0-beta02
-androidx.compose.ui:ui-tooling-preview:1.8.0-beta02
-androidx.compose.ui:ui-unit-android:1.8.0-beta02
-androidx.compose.ui:ui-unit:1.8.0-beta02
-androidx.compose.ui:ui-util-android:1.8.0-beta02
-androidx.compose.ui:ui-util:1.8.0-beta02
-androidx.compose.ui:ui:1.8.0-beta02
-androidx.compose:compose-bom-alpha:2025.02.00
+androidx.compose.material:material-ripple-android:1.10.0-alpha02
+androidx.compose.material:material-ripple:1.10.0-alpha02
+androidx.compose.runtime:runtime-android:1.10.0-alpha02
+androidx.compose.runtime:runtime-annotation-android:1.10.0-alpha02
+androidx.compose.runtime:runtime-annotation:1.10.0-alpha02
+androidx.compose.runtime:runtime-saveable-android:1.10.0-alpha02
+androidx.compose.runtime:runtime-saveable:1.10.0-alpha02
+androidx.compose.runtime:runtime-tracing:1.10.0-alpha02
+androidx.compose.runtime:runtime:1.10.0-alpha02
+androidx.compose.ui:ui-android:1.10.0-alpha02
+androidx.compose.ui:ui-geometry-android:1.10.0-alpha02
+androidx.compose.ui:ui-geometry:1.10.0-alpha02
+androidx.compose.ui:ui-graphics-android:1.10.0-alpha02
+androidx.compose.ui:ui-graphics:1.10.0-alpha02
+androidx.compose.ui:ui-text-android:1.10.0-alpha02
+androidx.compose.ui:ui-text:1.10.0-alpha02
+androidx.compose.ui:ui-tooling-preview-android:1.10.0-alpha02
+androidx.compose.ui:ui-tooling-preview:1.10.0-alpha02
+androidx.compose.ui:ui-unit-android:1.10.0-alpha02
+androidx.compose.ui:ui-unit:1.10.0-alpha02
+androidx.compose.ui:ui-util-android:1.10.0-alpha02
+androidx.compose.ui:ui-util:1.10.0-alpha02
+androidx.compose.ui:ui:1.10.0-alpha02
+androidx.compose:compose-bom-alpha:2025.08.01
 androidx.concurrent:concurrent-futures-ktx:1.1.0
 androidx.concurrent:concurrent-futures:1.1.0
-androidx.core:core-ktx:1.15.0
+androidx.core:core-ktx:1.16.0
 androidx.core:core-splashscreen:1.0.1
-androidx.core:core:1.15.0
+androidx.core:core-viewtree:1.0.0
+androidx.core:core:1.16.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview-poolingcontainer:1.0.0
 androidx.customview:customview:1.0.0
@@ -79,6 +82,7 @@ androidx.datastore:datastore-preferences:1.1.1
 androidx.datastore:datastore:1.1.1
 androidx.documentfile:documentfile:1.0.0
 androidx.drawerlayout:drawerlayout:1.0.0
+androidx.dynamicanimation:dynamicanimation:1.0.0
 androidx.emoji2:emoji2-views-helper:1.4.0
 androidx.emoji2:emoji2:1.4.0
 androidx.exifinterface:exifinterface:1.3.7
@@ -92,26 +96,27 @@ androidx.hilt:hilt-navigation:1.2.0
 androidx.hilt:hilt-work:1.2.0
 androidx.interpolator:interpolator:1.0.0
 androidx.legacy:legacy-support-core-utils:1.0.0
-androidx.lifecycle:lifecycle-common-java8:2.8.7
-androidx.lifecycle:lifecycle-common-jvm:2.8.7
-androidx.lifecycle:lifecycle-common:2.8.7
-androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.7
-androidx.lifecycle:lifecycle-livedata-core:2.8.7
-androidx.lifecycle:lifecycle-livedata:2.8.7
-androidx.lifecycle:lifecycle-process:2.8.7
-androidx.lifecycle:lifecycle-runtime-android:2.8.7
-androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7
-androidx.lifecycle:lifecycle-runtime-compose:2.8.7
-androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7
-androidx.lifecycle:lifecycle-runtime-ktx:2.8.7
-androidx.lifecycle:lifecycle-runtime:2.8.7
-androidx.lifecycle:lifecycle-service:2.8.7
-androidx.lifecycle:lifecycle-viewmodel-android:2.8.7
-androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.7
-androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7
-androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7
-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7
-androidx.lifecycle:lifecycle-viewmodel:2.8.7
+androidx.lifecycle:lifecycle-common-java8:2.10.0-alpha03
+androidx.lifecycle:lifecycle-common-jvm:2.10.0-alpha03
+androidx.lifecycle:lifecycle-common:2.10.0-alpha03
+androidx.lifecycle:lifecycle-livedata-core-ktx:2.10.0-alpha03
+androidx.lifecycle:lifecycle-livedata-core:2.10.0-alpha03
+androidx.lifecycle:lifecycle-livedata:2.10.0-alpha03
+androidx.lifecycle:lifecycle-process:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime-android:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime-compose-android:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime-compose:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime-ktx-android:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime-ktx:2.10.0-alpha03
+androidx.lifecycle:lifecycle-runtime:2.10.0-alpha03
+androidx.lifecycle:lifecycle-service:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel-android:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel-compose-android:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel-savedstate-android:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0-alpha03
+androidx.lifecycle:lifecycle-viewmodel:2.10.0-alpha03
 androidx.loader:loader:1.0.0
 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
 androidx.metrics:metrics-performance:1.0.0-beta01
@@ -130,8 +135,11 @@ androidx.room:room-common:2.7.2
 androidx.room:room-ktx:2.7.2
 androidx.room:room-runtime-android:2.7.2
 androidx.room:room-runtime:2.7.2
-androidx.savedstate:savedstate-ktx:1.2.1
-androidx.savedstate:savedstate:1.2.1
+androidx.savedstate:savedstate-android:1.4.0-alpha03
+androidx.savedstate:savedstate-compose-android:1.4.0-alpha03
+androidx.savedstate:savedstate-compose:1.4.0-alpha03
+androidx.savedstate:savedstate-ktx:1.4.0-alpha03
+androidx.savedstate:savedstate:1.4.0-alpha03
 androidx.sqlite:sqlite-android:2.5.1
 androidx.sqlite:sqlite-framework-android:2.5.1
 androidx.sqlite:sqlite-framework:2.5.1
@@ -140,14 +148,14 @@ androidx.startup:startup-runtime:1.1.1
 androidx.tracing:tracing-ktx:1.3.0-alpha02
 androidx.tracing:tracing-perfetto:1.0.0
 androidx.tracing:tracing:1.3.0-alpha02
+androidx.transition:transition:1.6.0
 androidx.vectordrawable:vectordrawable-animated:1.1.0
 androidx.vectordrawable:vectordrawable:1.1.0
 androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager:viewpager:1.0.0
-androidx.window.extensions.core:core:1.0.0
-androidx.window:window-core-android:1.3.0
-androidx.window:window-core:1.3.0
-androidx.window:window:1.3.0
+androidx.window:window-core-android:1.4.0
+androidx.window:window-core:1.4.0
+androidx.window:window:1.4.0
 androidx.work:work-runtime-ktx:2.10.0
 androidx.work:work-runtime:2.10.0
 com.caverock:androidsvg-aar:1.4
diff --git a/app/prodRelease-badging.txt b/app/prodRelease-badging.txt
index ca03c1088..640949857 100644
--- a/app/prodRelease-badging.txt
+++ b/app/prodRelease-badging.txt
@@ -1,5 +1,5 @@
 package: name='com.google.samples.apps.nowinandroid' versionCode='8' versionName='0.1.2' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
-minSdkVersion:'21'
+minSdkVersion:'23'
 targetSdkVersion:'35'
 uses-permission: name='android.permission.INTERNET'
 uses-permission: name='android.permission.ACCESS_NETWORK_STATE'
@@ -105,9 +105,9 @@ application-icon-640:'res/mipmap-anydpi-v26/ic_launcher.xml'
 application-icon-65534:'res/mipmap-anydpi-v26/ic_launcher.xml'
 application: label='Now in Android' icon='res/mipmap-anydpi-v26/ic_launcher.xml'
 launchable-activity: name='com.google.samples.apps.nowinandroid.MainActivity'  label='' icon=''
-uses-library-not-required:'android.ext.adservices'
 uses-library-not-required:'androidx.window.extensions'
 uses-library-not-required:'androidx.window.sidecar'
+uses-library-not-required:'android.ext.adservices'
 feature-group: label=''
   uses-feature: name='android.hardware.faketouch'
   uses-implied-feature: name='android.hardware.faketouch' reason='default feature for all apps'
diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
index 5d396d2a4..2ac96e556 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
@@ -38,7 +38,7 @@ internal fun Project.configureKotlinAndroid(
         compileSdk = 35
 
         defaultConfig {
-            minSdk = 21
+            minSdk = 23
         }
 
         compileOptions {
diff --git a/core/designsystem/src/test/screenshots/Navigation/Navigation_fontScale2.png b/core/designsystem/src/test/screenshots/Navigation/Navigation_fontScale2.png
index b2dff990a..16df296d5 100644
Binary files a/core/designsystem/src/test/screenshots/Navigation/Navigation_fontScale2.png and b/core/designsystem/src/test/screenshots/Navigation/Navigation_fontScale2.png differ
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
index 1a902d5d6..edc28ea23 100644
--- a/core/network/build.gradle.kts
+++ b/core/network/build.gradle.kts
@@ -53,15 +53,12 @@ val backendUrl = providers.fileContents(
 ).asText.map { text ->
     val properties = Properties()
     properties.load(StringReader(text))
-    if (properties.containsKey("BACKEND_URL"))
-        (properties["BACKEND_URL"] as String)
-    else "http://example.com"
-    // Move to returning `properties["BACKEND_URL"] as String?` after upgrading to Gradle 9.0.0
+    properties["BACKEND_URL"]
 }.orElse("http://example.com")
 
 androidComponents {
     onVariants {
-        it.buildConfigFields.put("BACKEND_URL", backendUrl.map { value ->
+        it.buildConfigFields!!.put("BACKEND_URL", backendUrl.map { value ->
             BuildConfigField(type = "String", value = """"$value"""", comment = null)
         })
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 81f12c480..f8b3a682a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,12 +2,12 @@
 accompanist = "0.37.0"
 androidDesugarJdkLibs = "2.1.4"
 # AGP and tools should be updated together
-androidGradlePlugin = "8.9.0"
-androidTools = "31.9.0"
+androidGradlePlugin = "8.12.2"
+androidTools = "31.12.2"
 androidxActivity = "1.9.3"
 androidxAppCompat = "1.7.0"
 androidxBrowser = "1.8.0"
-androidxComposeBom = "2025.02.00"
+androidxComposeBom = "2025.08.01"
 androidxComposeFoundation = "1.8.0-alpha07"
 androidxComposeMaterial3Adaptive = "1.1.0-rc01"
 androidxComposeRuntimeTracing = "1.7.6"