Merge remote-tracking branch 'origin/main' into in-memory-datastore

2 months ago · 8ca16d85a7
parent 45b0c2ab54 c4ebde1fc2
commit 8ca16d85a7
62 changed files with 807 additions and 14935 deletions
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@ -25,6 +25,13 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v4

+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+          ls /dev/kvm
+
      - name: Copy CI gradle.properties
        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

@ -35,10 +42,13 @@ jobs:
          java-version: 17

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          validate-wrappers: true
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Accept licenses
+        run: yes | sdkmanager --licenses || true

      - name: Check build-logic
        run: ./gradlew check -p build-logic
@ -101,19 +111,22 @@ jobs:
          commit_message: "🤖 Updates screenshots"

      # Run local tests after screenshot tests to avoid wrong UP-TO-DATE. TODO: Ignore screenshots.
-      - name: Run local tests and create report
-        if: always()
+      - name: Run local tests
        run: ./gradlew testDemoDebug :lint:test
-      # Replace task exclusions with `-Pandroidx.baselineprofile.skipgeneration` when
-      # https://android-review.googlesource.com/c/platform/frameworks/support/+/2602790 landed in a
-      # release build
+
+      - name: Setup GMD
+        run: ./gradlew :benchmarks:pixel6Api33Setup
+          --info
+          -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
+          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"

      - name: Build all build type and flavor permutations
-        run: ./gradlew :app:assemble :benchmarks:assemble
-          -x pixel6Api33ProdNonMinifiedReleaseAndroidTest
-          -x pixel6Api33DemoNonMinifiedReleaseAndroidTest
-          -x collectDemoNonMinifiedReleaseBaselineProfile
-          -x collectProdNonMinifiedReleaseBaselineProfile
+        run: ./gradlew :app:assemble :benchmarks:assemble -Pandroidx.baselineprofile.skipgeneration
+          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
+          -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
+          -Pandroid.experimental.androidTest.numManagedDeviceShards=1
+          -Pandroid.experimental.testOptions.managedDevices.maxConcurrentDevices=1
+          -Pandroid.experimental.testOptions.managedDevices.setupTimeoutMinutes=5

      - name: Upload build outputs (APKs)
        uses: actions/upload-artifact@v4
@ -187,7 +200,7 @@ jobs:
          java-version: 17

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
        with:
          validate-wrappers: true
          gradle-home-cache-cleanup: true
@ -222,7 +235,7 @@ jobs:
      - name: Display local test coverage (only API 30)
        if: matrix.api-level == 30
        id: jacoco
-        uses: madrapps/jacoco-report@v1.6.1
+        uses: madrapps/jacoco-report@v1.7.0
        with:
          title: Combined test coverage report
          min-coverage-overall: 40
--- a/.github/workflows/NightlyBaselineProfiles.yaml
+++ b/.github/workflows/NightlyBaselineProfiles.yaml
@ -0,0 +1,59 @@
+name: NightlyBaselineProfiles
+
+on:
+  schedule:
+    - cron:  '42 4 * * *'
+
+jobs:
+  baseline_profiles:
+    name: "Generate Baseline Profiles"
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
+    timeout-minutes: 60
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+          ls /dev/kvm
+
+      - name: Copy CI gradle.properties
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Accept licenses
+        run: yes | sdkmanager --licenses || true
+
+      - name: Check build-logic
+        run: ./gradlew check -p build-logic
+
+      - name: Setup GMD
+        run: ./gradlew :benchmarks:pixel6Api33Setup
+          --info
+          -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
+          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
+
+      - name: Build all build type and flavor permutations including baseline profiles
+        run: ./gradlew :app:assemble
+             -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=baselineprofile
+             -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
+             -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
--- a/.github/workflows/Release.yml
+++ b/.github/workflows/Release.yml
@ -32,16 +32,19 @@ jobs:
          java-version: 17

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          validate-wrappers: true
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3

-      - name: Install GMD image for baseline profile generation
-        run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager "system-images;android-33;aosp_atd;x86_64"
+      - name: Accept licenses
+        run: yes | sdkmanager --licenses || true

-      - name: Accept Android licenses
-        run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
+      - name: Setup GMD
+        run: ./gradlew :benchmarks:pixel6Api33Setup
+          --info
+          -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
+          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"

      - name: Build release variant including baseline profile generation
        run: ./gradlew :app:assembleDemoRelease
--- a/.gitignore
+++ b/.gitignore
@ -13,6 +13,7 @@ bin/
 gen/
 out/
 build/
+generated/

 # Local configuration file (sdk path, etc)
 local.properties
--- a/.google/BUILDME
+++ b/.google/BUILDME
@ -1,2 +1,2 @@
 # This file can be used to trigger an internal build by changing the number below
-3
+2
--- a/README.md
+++ b/README.md
@ -111,7 +111,8 @@ Examples:

 To run the tests execute the following gradle tasks: 

- `testDemoDebug` run all local tests against the `demoDebug` variant.
+- `testDemoDebug` run all local tests against the `demoDebug` variant. Screenshot tests will fail
+(see below for explanation). To avoid this, run `recordRoborazziDemoDebug` prior to running unit tests.
 - `connectedDemoDebugAndroidTest` run all instrumented tests against the `demoDebug` variant. 

 **Note:** You should not run `./gradlew test` or `./gradlew connectedAndroidTest` as this will execute 
@ -137,7 +138,7 @@ stored in `modulename/src/test/screenshots`.
 - `compareRoborazziDemoDebug` create comparison images between failed tests and the known correct
 images. These can also be found in `modulename/src/test/screenshots`. 

-**Note:** The known correct screenshots stored in this repository are recorded on CI using Linux. Other
+**Note on failing screenshot tests:** The known correct screenshots stored in this repository are recorded on CI using Linux. Other
 platforms may (and probably will) generate slightly different images, making the screenshot tests fail. 
 When working on a non-Linux platform, a workaround to this is to run `recordRoborazziDemoDebug` on the
 `main` branch before starting work. After making changes, `verifyRoborazziDemoDebug` will identify only
--- a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt
+++ b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt
@ -1,6 +1,6 @@
-androidx.activity:activity-compose:1.8.2
-androidx.activity:activity-ktx:1.8.2
-androidx.activity:activity:1.8.2
+androidx.activity:activity-compose:1.9.2
+androidx.activity:activity-ktx:1.9.2
+androidx.activity:activity:1.9.2
 androidx.annotation:annotation-experimental:1.4.0
 androidx.annotation:annotation-jvm:1.8.0
 androidx.annotation:annotation:1.8.0
@ -12,45 +12,45 @@ androidx.browser:browser:1.8.0
 androidx.collection:collection-jvm:1.4.0
 androidx.collection:collection-ktx:1.4.0
 androidx.collection:collection:1.4.0
-androidx.compose.animation:animation-android:1.7.0-beta01
-androidx.compose.animation:animation-core-android:1.7.0-beta01
-androidx.compose.animation:animation-core:1.7.0-beta01
-androidx.compose.animation:animation:1.7.0-beta01
-androidx.compose.foundation:foundation-android:1.7.0-beta01
-androidx.compose.foundation:foundation-layout-android:1.7.0-beta01
-androidx.compose.foundation:foundation-layout:1.7.0-beta01
-androidx.compose.foundation:foundation:1.7.0-beta01
-androidx.compose.material3.adaptive:adaptive-android:1.0.0-beta01
-androidx.compose.material3.adaptive:adaptive:1.0.0-beta01
-androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.0-beta01
-androidx.compose.material3:material3-adaptive-navigation-suite:1.3.0-beta01
-androidx.compose.material3:material3-android:1.3.0-beta01
-androidx.compose.material3:material3:1.3.0-beta01
-androidx.compose.material:material-icons-core-android:1.6.3
-androidx.compose.material:material-icons-core:1.6.3
-androidx.compose.material:material-icons-extended-android:1.6.3
-androidx.compose.material:material-icons-extended:1.6.3
-androidx.compose.material:material-ripple-android:1.7.0-beta01
-androidx.compose.material:material-ripple:1.7.0-beta01
-androidx.compose.runtime:runtime-android:1.7.0-beta01
-androidx.compose.runtime:runtime-saveable-android:1.7.0-beta01
-androidx.compose.runtime:runtime-saveable:1.7.0-beta01
-androidx.compose.runtime:runtime:1.7.0-beta01
-androidx.compose.ui:ui-android:1.7.0-beta01
-androidx.compose.ui:ui-geometry-android:1.7.0-beta01
-androidx.compose.ui:ui-geometry:1.7.0-beta01
-androidx.compose.ui:ui-graphics-android:1.7.0-beta01
-androidx.compose.ui:ui-graphics:1.7.0-beta01
-androidx.compose.ui:ui-text-android:1.7.0-beta01
-androidx.compose.ui:ui-text:1.7.0-beta01
-androidx.compose.ui:ui-tooling-preview-android:1.7.0-beta01
-androidx.compose.ui:ui-tooling-preview:1.7.0-beta01
-androidx.compose.ui:ui-unit-android:1.7.0-beta01
-androidx.compose.ui:ui-unit:1.7.0-beta01
-androidx.compose.ui:ui-util-android:1.7.0-beta01
-androidx.compose.ui:ui-util:1.7.0-beta01
-androidx.compose.ui:ui:1.7.0-beta01
-androidx.compose:compose-bom:2024.02.02
+androidx.compose.animation:animation-android:1.7.0
+androidx.compose.animation:animation-core-android:1.7.0
+androidx.compose.animation:animation-core:1.7.0
+androidx.compose.animation:animation:1.7.0
+androidx.compose.foundation:foundation-android:1.7.0
+androidx.compose.foundation:foundation-layout-android:1.7.0
+androidx.compose.foundation:foundation-layout:1.7.0
+androidx.compose.foundation:foundation:1.7.0
+androidx.compose.material3.adaptive:adaptive-android:1.0.0
+androidx.compose.material3.adaptive:adaptive:1.0.0
+androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.0
+androidx.compose.material3:material3-adaptive-navigation-suite:1.3.0
+androidx.compose.material3:material3-android:1.3.0
+androidx.compose.material3:material3:1.3.0
+androidx.compose.material:material-icons-core-android:1.7.0
+androidx.compose.material:material-icons-core:1.7.0
+androidx.compose.material:material-icons-extended-android:1.7.0
+androidx.compose.material:material-icons-extended:1.7.0
+androidx.compose.material:material-ripple-android:1.7.0
+androidx.compose.material:material-ripple:1.7.0
+androidx.compose.runtime:runtime-android:1.7.0
+androidx.compose.runtime:runtime-saveable-android:1.7.0
+androidx.compose.runtime:runtime-saveable:1.7.0
+androidx.compose.runtime:runtime:1.7.0
+androidx.compose.ui:ui-android:1.7.0
+androidx.compose.ui:ui-geometry-android:1.7.0
+androidx.compose.ui:ui-geometry:1.7.0
+androidx.compose.ui:ui-graphics-android:1.7.0
+androidx.compose.ui:ui-graphics:1.7.0
+androidx.compose.ui:ui-text-android:1.7.0
+androidx.compose.ui:ui-text:1.7.0
+androidx.compose.ui:ui-tooling-preview-android:1.7.0
+androidx.compose.ui:ui-tooling-preview:1.7.0
+androidx.compose.ui:ui-unit-android:1.7.0
+androidx.compose.ui:ui-unit:1.7.0
+androidx.compose.ui:ui-util-android:1.7.0
+androidx.compose.ui:ui-util:1.7.0
+androidx.compose.ui:ui:1.7.0
+androidx.compose:compose-bom:2024.09.00
 androidx.concurrent:concurrent-futures:1.1.0
 androidx.core:core-ktx:1.13.1
 androidx.core:core:1.13.1
@ -61,25 +61,25 @@ androidx.exifinterface:exifinterface:1.3.7
 androidx.fragment:fragment:1.5.1
 androidx.graphics:graphics-path:1.0.1
 androidx.interpolator:interpolator:1.0.0
-androidx.lifecycle:lifecycle-common-java8:2.8.0
-androidx.lifecycle:lifecycle-common-jvm:2.8.0
-androidx.lifecycle:lifecycle-common:2.8.0
-androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.0
-androidx.lifecycle:lifecycle-livedata-core:2.8.0
-androidx.lifecycle:lifecycle-livedata:2.8.0
-androidx.lifecycle:lifecycle-process:2.8.0
-androidx.lifecycle:lifecycle-runtime-android:2.8.0
-androidx.lifecycle:lifecycle-runtime-compose-android:2.8.0
-androidx.lifecycle:lifecycle-runtime-compose:2.8.0
-androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.0
-androidx.lifecycle:lifecycle-runtime-ktx:2.8.0
-androidx.lifecycle:lifecycle-runtime:2.8.0
-androidx.lifecycle:lifecycle-viewmodel-android:2.8.0
-androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0
-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.0
-androidx.lifecycle:lifecycle-viewmodel:2.8.0
+androidx.lifecycle:lifecycle-common-java8:2.8.3
+androidx.lifecycle:lifecycle-common-jvm:2.8.3
+androidx.lifecycle:lifecycle-common:2.8.3
+androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.3
+androidx.lifecycle:lifecycle-livedata-core:2.8.3
+androidx.lifecycle:lifecycle-livedata:2.8.3
+androidx.lifecycle:lifecycle-process:2.8.3
+androidx.lifecycle:lifecycle-runtime-android:2.8.3
+androidx.lifecycle:lifecycle-runtime-compose-android:2.8.3
+androidx.lifecycle:lifecycle-runtime-compose:2.8.3
+androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.3
+androidx.lifecycle:lifecycle-runtime-ktx:2.8.3
+androidx.lifecycle:lifecycle-runtime:2.8.3
+androidx.lifecycle:lifecycle-viewmodel-android:2.8.3
+androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.3
+androidx.lifecycle:lifecycle-viewmodel:2.8.3
 androidx.loader:loader:1.0.0
-androidx.metrics:metrics-performance:1.0.0-alpha04
+androidx.metrics:metrics-performance:1.0.0-beta01
 androidx.profileinstaller:profileinstaller:1.3.1
 androidx.savedstate:savedstate-ktx:1.2.1
 androidx.savedstate:savedstate:1.2.1
@ -91,32 +91,33 @@ 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-beta02
-androidx.window:window-core:1.3.0-beta02
-androidx.window:window:1.3.0-beta02
+androidx.window:window-core-android:1.3.0
+androidx.window:window-core:1.3.0
+androidx.window:window:1.3.0
 com.google.accompanist:accompanist-drawablepainter:0.32.0
 com.google.code.findbugs:jsr305:3.0.2
-com.google.dagger:dagger-lint-aar:2.51.1
-com.google.dagger:dagger:2.51.1
-com.google.dagger:hilt-android:2.51.1
-com.google.dagger:hilt-core:2.51.1
+com.google.dagger:dagger-lint-aar:2.52
+com.google.dagger:dagger:2.52
+com.google.dagger:hilt-android:2.52
+com.google.dagger:hilt-core:2.52
 com.google.guava:listenablefuture:1.0
 com.squareup.okhttp3:okhttp:4.12.0
-com.squareup.okio:okio-jvm:3.8.0
-com.squareup.okio:okio:3.8.0
-io.coil-kt:coil-base:2.6.0
-io.coil-kt:coil-compose-base:2.6.0
-io.coil-kt:coil-compose:2.6.0
-io.coil-kt:coil:2.6.0
+com.squareup.okio:okio-jvm:3.9.0
+com.squareup.okio:okio:3.9.0
+io.coil-kt:coil-base:2.7.0
+io.coil-kt:coil-compose-base:2.7.0
+io.coil-kt:coil-compose:2.7.0
+io.coil-kt:coil:2.7.0
+jakarta.inject:jakarta.inject-api:2.0.1
 javax.inject:javax.inject:1
-org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0
+org.jetbrains.kotlin:kotlin-stdlib-common:2.0.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
-org.jetbrains.kotlin:kotlin-stdlib:2.0.0
-org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
-org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
-org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.5.0
-org.jetbrains.kotlinx:kotlinx-datetime:0.5.0
+org.jetbrains.kotlin:kotlin-stdlib:2.0.20
+org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1
+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:annotations:23.0.0
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -25,6 +25,7 @@ plugins {
    id("com.google.android.gms.oss-licenses-plugin")
    alias(libs.plugins.baselineprofile)
    alias(libs.plugins.roborazzi)
+    alias(libs.plugins.kotlin.serialization)
 }

 android {
@ -47,7 +48,7 @@ android {
        release {
            isMinifyEnabled = true
            applicationIdSuffix = NiaBuildType.RELEASE.applicationIdSuffix
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))

            // To publish on the Play store a private signing key is required, but to allow anyone
            // who clones the code to sign and run the release variant, use the debug signing key.
@ -103,6 +104,7 @@ dependencies {
    implementation(libs.androidx.window.core)
    implementation(libs.kotlinx.coroutines.guava)
    implementation(libs.coil.kt)
+    implementation(libs.kotlinx.serialization.json)

    ksp(libs.hilt.compiler)

@ -115,6 +117,7 @@ dependencies {
    testImplementation(projects.core.datastoreTest)
    testImplementation(libs.hilt.android.testing)
    testImplementation(projects.sync.syncTest)
+    testImplementation(libs.kotlin.test)

    testDemoImplementation(libs.robolectric)
    testDemoImplementation(libs.roborazzi)
@ -136,6 +139,9 @@ baselineProfile {
    // Don't build on every iteration of a full assemble.
    // Instead enable generation directly for the release build variant.
    automaticGenerationDuringBuild = false
+
+    // Make use of Dex Layout Optimizations via Startup Profiles
+    dexLayoutOptimization = true
 }

 dependencyGuard {
--- a/app/dependencies/prodReleaseRuntimeClasspath.txt
+++ b/app/dependencies/prodReleaseRuntimeClasspath.txt
@ -1,64 +1,64 @@
-androidx.activity:activity-compose:1.8.2
-androidx.activity:activity-ktx:1.8.2
-androidx.activity:activity:1.8.2
-androidx.annotation:annotation-experimental:1.4.0
-androidx.annotation:annotation-jvm:1.8.0
-androidx.annotation:annotation:1.8.0
+androidx.activity:activity-compose:1.9.2
+androidx.activity:activity-ktx:1.9.2
+androidx.activity:activity:1.9.2
+androidx.annotation:annotation-experimental:1.4.1
+androidx.annotation:annotation-jvm:1.8.1
+androidx.annotation:annotation:1.8.1
 androidx.appcompat:appcompat-resources:1.7.0
 androidx.appcompat:appcompat:1.7.0
 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.4.0
-androidx.collection:collection-ktx:1.4.0
-androidx.collection:collection:1.4.0
-androidx.compose.animation:animation-android:1.7.0-beta01
-androidx.compose.animation:animation-core-android:1.7.0-beta01
-androidx.compose.animation:animation-core:1.7.0-beta01
-androidx.compose.animation:animation:1.7.0-beta01
-androidx.compose.foundation:foundation-android:1.7.0-beta01
-androidx.compose.foundation:foundation-layout-android:1.7.0-beta01
-androidx.compose.foundation:foundation-layout:1.7.0-beta01
-androidx.compose.foundation:foundation:1.7.0-beta01
-androidx.compose.material3.adaptive:adaptive-android:1.0.0-beta01
-androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0-beta01
-androidx.compose.material3.adaptive:adaptive-layout:1.0.0-beta01
-androidx.compose.material3.adaptive:adaptive-navigation-android:1.0.0-beta01
-androidx.compose.material3.adaptive:adaptive-navigation:1.0.0-beta01
-androidx.compose.material3.adaptive:adaptive:1.0.0-beta01
-androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.0-beta01
-androidx.compose.material3:material3-adaptive-navigation-suite:1.3.0-beta01
-androidx.compose.material3:material3-android:1.3.0-beta01
-androidx.compose.material3:material3-window-size-class-android:1.3.0-beta01
-androidx.compose.material3:material3-window-size-class:1.3.0-beta01
-androidx.compose.material3:material3:1.3.0-beta01
-androidx.compose.material:material-icons-core-android:1.6.3
-androidx.compose.material:material-icons-core:1.6.3
-androidx.compose.material:material-icons-extended-android:1.6.3
-androidx.compose.material:material-icons-extended:1.6.3
-androidx.compose.material:material-ripple-android:1.7.0-beta01
-androidx.compose.material:material-ripple:1.7.0-beta01
-androidx.compose.runtime:runtime-android:1.7.0-beta01
-androidx.compose.runtime:runtime-saveable-android:1.7.0-beta01
-androidx.compose.runtime:runtime-saveable:1.7.0-beta01
+androidx.collection:collection-jvm:1.4.2
+androidx.collection:collection-ktx:1.4.2
+androidx.collection:collection:1.4.2
+androidx.compose.animation:animation-android:1.7.0
+androidx.compose.animation:animation-core-android:1.7.0
+androidx.compose.animation:animation-core:1.7.0
+androidx.compose.animation:animation:1.7.0
+androidx.compose.foundation:foundation-android:1.7.0
+androidx.compose.foundation:foundation-layout-android:1.7.0
+androidx.compose.foundation:foundation-layout:1.7.0
+androidx.compose.foundation:foundation:1.7.0
+androidx.compose.material3.adaptive:adaptive-android:1.0.0
+androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0
+androidx.compose.material3.adaptive:adaptive-layout:1.0.0
+androidx.compose.material3.adaptive:adaptive-navigation-android:1.0.0
+androidx.compose.material3.adaptive:adaptive-navigation:1.0.0
+androidx.compose.material3.adaptive:adaptive:1.0.0
+androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.0
+androidx.compose.material3:material3-adaptive-navigation-suite:1.3.0
+androidx.compose.material3:material3-android:1.3.0
+androidx.compose.material3:material3-window-size-class-android:1.3.0
+androidx.compose.material3:material3-window-size-class:1.3.0
+androidx.compose.material3:material3:1.3.0
+androidx.compose.material:material-icons-core-android:1.7.0
+androidx.compose.material:material-icons-core:1.7.0
+androidx.compose.material:material-icons-extended-android:1.7.0
+androidx.compose.material:material-icons-extended:1.7.0
+androidx.compose.material:material-ripple-android:1.7.0
+androidx.compose.material:material-ripple:1.7.0
+androidx.compose.runtime:runtime-android:1.7.1
+androidx.compose.runtime:runtime-saveable-android:1.7.1
+androidx.compose.runtime:runtime-saveable:1.7.1
 androidx.compose.runtime:runtime-tracing:1.0.0-beta01
-androidx.compose.runtime:runtime:1.7.0-beta01
-androidx.compose.ui:ui-android:1.7.0-beta01
-androidx.compose.ui:ui-geometry-android:1.7.0-beta01
-androidx.compose.ui:ui-geometry:1.7.0-beta01
-androidx.compose.ui:ui-graphics-android:1.7.0-beta01
-androidx.compose.ui:ui-graphics:1.7.0-beta01
-androidx.compose.ui:ui-text-android:1.7.0-beta01
-androidx.compose.ui:ui-text:1.7.0-beta01
-androidx.compose.ui:ui-tooling-preview-android:1.7.0-beta01
-androidx.compose.ui:ui-tooling-preview:1.7.0-beta01
-androidx.compose.ui:ui-unit-android:1.7.0-beta01
-androidx.compose.ui:ui-unit:1.7.0-beta01
-androidx.compose.ui:ui-util-android:1.7.0-beta01
-androidx.compose.ui:ui-util:1.7.0-beta01
-androidx.compose.ui:ui:1.7.0-beta01
-androidx.compose:compose-bom:2024.02.02
+androidx.compose.runtime:runtime:1.7.1
+androidx.compose.ui:ui-android:1.7.0
+androidx.compose.ui:ui-geometry-android:1.7.0
+androidx.compose.ui:ui-geometry:1.7.0
+androidx.compose.ui:ui-graphics-android:1.7.0
+androidx.compose.ui:ui-graphics:1.7.0
+androidx.compose.ui:ui-text-android:1.7.0
+androidx.compose.ui:ui-text:1.7.0
+androidx.compose.ui:ui-tooling-preview-android:1.7.0
+androidx.compose.ui:ui-tooling-preview:1.7.0
+androidx.compose.ui:ui-unit-android:1.7.0
+androidx.compose.ui:ui-unit:1.7.0
+androidx.compose.ui:ui-util-android:1.7.0
+androidx.compose.ui:ui-util:1.7.0
+androidx.compose.ui:ui:1.7.0
+androidx.compose:compose-bom:2024.09.00
 androidx.concurrent:concurrent-futures:1.1.0
 androidx.core:core-ktx:1.13.1
 androidx.core:core-splashscreen:1.0.1
@ -66,10 +66,16 @@ androidx.core:core:1.13.1
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview-poolingcontainer:1.0.0
 androidx.customview:customview:1.0.0
-androidx.datastore:datastore-core:1.0.0
-androidx.datastore:datastore-preferences-core:1.0.0
-androidx.datastore:datastore-preferences:1.0.0
-androidx.datastore:datastore:1.0.0
+androidx.datastore:datastore-android:1.1.1
+androidx.datastore:datastore-core-android:1.1.1
+androidx.datastore:datastore-core-okio-jvm:1.1.1
+androidx.datastore:datastore-core-okio:1.1.1
+androidx.datastore:datastore-core:1.1.1
+androidx.datastore:datastore-preferences-android:1.1.1
+androidx.datastore:datastore-preferences-core-jvm:1.1.1
+androidx.datastore:datastore-preferences-core:1.1.1
+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.emoji2:emoji2-views-helper:1.3.0
@ -77,40 +83,40 @@ androidx.emoji2:emoji2:1.3.0
 androidx.exifinterface:exifinterface:1.3.7
 androidx.fragment:fragment:1.5.4
 androidx.graphics:graphics-path:1.0.1
-androidx.hilt:hilt-common:1.1.0
+androidx.hilt:hilt-common:1.2.0
 androidx.hilt:hilt-navigation-compose:1.2.0
 androidx.hilt:hilt-navigation:1.2.0
-androidx.hilt:hilt-work:1.1.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.3
-androidx.lifecycle:lifecycle-common-jvm:2.8.3
-androidx.lifecycle:lifecycle-common:2.8.3
-androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.3
-androidx.lifecycle:lifecycle-livedata-core:2.8.3
-androidx.lifecycle:lifecycle-livedata:2.8.3
-androidx.lifecycle:lifecycle-process:2.8.3
-androidx.lifecycle:lifecycle-runtime-android:2.8.3
-androidx.lifecycle:lifecycle-runtime-compose-android:2.8.3
-androidx.lifecycle:lifecycle-runtime-compose:2.8.3
-androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.3
-androidx.lifecycle:lifecycle-runtime-ktx:2.8.3
-androidx.lifecycle:lifecycle-runtime:2.8.3
-androidx.lifecycle:lifecycle-service:2.8.3
-androidx.lifecycle:lifecycle-viewmodel-android:2.8.3
-androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.3
-androidx.lifecycle:lifecycle-viewmodel-compose:2.8.3
-androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3
-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.3
-androidx.lifecycle:lifecycle-viewmodel:2.8.3
+androidx.lifecycle:lifecycle-common-java8:2.8.6
+androidx.lifecycle:lifecycle-common-jvm:2.8.6
+androidx.lifecycle:lifecycle-common:2.8.6
+androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.6
+androidx.lifecycle:lifecycle-livedata-core:2.8.6
+androidx.lifecycle:lifecycle-livedata:2.8.6
+androidx.lifecycle:lifecycle-process:2.8.6
+androidx.lifecycle:lifecycle-runtime-android:2.8.6
+androidx.lifecycle:lifecycle-runtime-compose-android:2.8.6
+androidx.lifecycle:lifecycle-runtime-compose:2.8.6
+androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.6
+androidx.lifecycle:lifecycle-runtime-ktx:2.8.6
+androidx.lifecycle:lifecycle-runtime:2.8.6
+androidx.lifecycle:lifecycle-service:2.8.6
+androidx.lifecycle:lifecycle-viewmodel-android:2.8.6
+androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.6
+androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6
+androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.6
+androidx.lifecycle:lifecycle-viewmodel:2.8.6
 androidx.loader:loader:1.0.0
 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
-androidx.metrics:metrics-performance:1.0.0-alpha04
-androidx.navigation:navigation-common-ktx:2.8.0-alpha06
-androidx.navigation:navigation-common:2.8.0-alpha06
-androidx.navigation:navigation-compose:2.8.0-alpha06
-androidx.navigation:navigation-runtime-ktx:2.8.0-alpha06
-androidx.navigation:navigation-runtime:2.8.0-alpha06
+androidx.metrics:metrics-performance:1.0.0-beta01
+androidx.navigation:navigation-common-ktx:2.8.0
+androidx.navigation:navigation-common:2.8.0
+androidx.navigation:navigation-compose:2.8.0
+androidx.navigation:navigation-runtime-ktx:2.8.0
+androidx.navigation:navigation-runtime:2.8.0
 androidx.print:print:1.0.0
 androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05
 androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05
@ -132,57 +138,57 @@ 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-beta02
-androidx.window:window-core:1.3.0-beta02
-androidx.window:window:1.3.0-beta02
+androidx.window:window-core-android:1.3.0
+androidx.window:window-core:1.3.0
+androidx.window:window:1.3.0
 androidx.work:work-runtime-ktx:2.9.0
 androidx.work:work-runtime:2.9.0
 com.caverock:androidsvg-aar:1.4
 com.google.accompanist:accompanist-drawablepainter:0.32.0
 com.google.accompanist:accompanist-permissions:0.34.0
-com.google.android.datatransport:transport-api:3.1.0
-com.google.android.datatransport:transport-backend-cct:3.1.9
-com.google.android.datatransport:transport-runtime:3.1.9
+com.google.android.datatransport:transport-api:3.2.0
+com.google.android.datatransport:transport-backend-cct:3.3.0
+com.google.android.datatransport:transport-runtime:3.3.0
 com.google.android.gms:play-services-ads-identifier:18.0.0
-com.google.android.gms:play-services-base:18.0.1
+com.google.android.gms:play-services-base:18.5.0
 com.google.android.gms:play-services-basement:18.4.0
 com.google.android.gms:play-services-cloud-messaging:17.2.0
-com.google.android.gms:play-services-measurement-api:22.0.2
-com.google.android.gms:play-services-measurement-base:22.0.2
-com.google.android.gms:play-services-measurement-impl:22.0.2
-com.google.android.gms:play-services-measurement-sdk-api:22.0.2
-com.google.android.gms:play-services-measurement-sdk:22.0.2
-com.google.android.gms:play-services-measurement:22.0.2
-com.google.android.gms:play-services-oss-licenses:17.0.1
+com.google.android.gms:play-services-measurement-api:22.1.0
+com.google.android.gms:play-services-measurement-base:22.1.0
+com.google.android.gms:play-services-measurement-impl:22.1.0
+com.google.android.gms:play-services-measurement-sdk-api:22.1.0
+com.google.android.gms:play-services-measurement-sdk:22.1.0
+com.google.android.gms:play-services-measurement:22.1.0
+com.google.android.gms:play-services-oss-licenses:17.1.0
 com.google.android.gms:play-services-stats:17.0.2
 com.google.android.gms:play-services-tasks:18.2.0
 com.google.code.findbugs:jsr305:3.0.2
-com.google.dagger:dagger-lint-aar:2.51.1
-com.google.dagger:dagger:2.51.1
-com.google.dagger:hilt-android:2.51.1
-com.google.dagger:hilt-core:2.51.1
+com.google.dagger:dagger-lint-aar:2.52
+com.google.dagger:dagger:2.52
+com.google.dagger:hilt-android:2.52
+com.google.dagger:hilt-core:2.52
 com.google.errorprone:error_prone_annotations:2.26.0
 com.google.firebase:firebase-abt:21.1.1
-com.google.firebase:firebase-analytics:22.0.2
+com.google.firebase:firebase-analytics:22.1.0
 com.google.firebase:firebase-annotations:16.2.0
-com.google.firebase:firebase-bom:33.1.1
+com.google.firebase:firebase-bom:33.3.0
 com.google.firebase:firebase-common-ktx:21.0.0
 com.google.firebase:firebase-common:21.0.0
 com.google.firebase:firebase-components:18.0.0
 com.google.firebase:firebase-config-interop:16.0.1
 com.google.firebase:firebase-config:22.0.0
-com.google.firebase:firebase-crashlytics:19.0.2
-com.google.firebase:firebase-datatransport:18.2.0
+com.google.firebase:firebase-crashlytics:19.1.0
+com.google.firebase:firebase-datatransport:19.0.0
 com.google.firebase:firebase-encoders-json:18.0.1
 com.google.firebase:firebase-encoders-proto:16.0.0
 com.google.firebase:firebase-encoders:17.0.0
 com.google.firebase:firebase-iid-interop:17.1.0
-com.google.firebase:firebase-installations-interop:17.1.1
+com.google.firebase:firebase-installations-interop:17.2.0
 com.google.firebase:firebase-installations:18.0.0
 com.google.firebase:firebase-measurement-connector:20.0.1
-com.google.firebase:firebase-messaging:24.0.0
+com.google.firebase:firebase-messaging:24.0.1
 com.google.firebase:firebase-perf:21.0.1
-com.google.firebase:firebase-sessions:2.0.2
+com.google.firebase:firebase-sessions:2.0.4
 com.google.firebase:protolite-well-known-types:18.0.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:31.1-android
@ -190,31 +196,34 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 com.google.protobuf:protobuf-javalite:4.26.1
 com.google.protobuf:protobuf-kotlin-lite:4.26.1
-com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0
+com.squareup.retrofit2:converter-kotlinx-serialization:2.11.0
 com.squareup.okhttp3:logging-interceptor:4.12.0
 com.squareup.okhttp3:okhttp:4.12.0
-com.squareup.okio:okio-jvm:3.8.0
-com.squareup.okio:okio:3.8.0
-com.squareup.retrofit2:retrofit:2.9.0
-io.coil-kt:coil-base:2.6.0
-io.coil-kt:coil-compose-base:2.6.0
-io.coil-kt:coil-compose:2.6.0
-io.coil-kt:coil-svg:2.6.0
-io.coil-kt:coil:2.6.0
+com.squareup.okio:okio-jvm:3.9.0
+com.squareup.okio:okio:3.9.0
+com.squareup.retrofit2:retrofit:2.11.0
+io.coil-kt:coil-base:2.7.0
+io.coil-kt:coil-compose-base:2.7.0
+io.coil-kt:coil-compose:2.7.0
+io.coil-kt:coil-svg:2.7.0
+io.coil-kt:coil:2.7.0
+jakarta.inject:jakarta.inject-api:2.0.1
 javax.inject:javax.inject:1
 org.checkerframework:checker-qual:3.12.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0
+org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.22
+org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.22
+org.jetbrains.kotlin:kotlin-stdlib-common:2.0.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
-org.jetbrains.kotlin:kotlin-stdlib:2.0.0
-org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0
-org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.0
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0
-org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.8.0
-org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.8.0
-org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.5.0
-org.jetbrains.kotlinx:kotlinx-datetime:0.5.0
+org.jetbrains.kotlin:kotlin-stdlib:2.0.20
+org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0
+org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.9.0
+org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.9.0
+org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1
+org.jetbrains.kotlinx:kotlinx-datetime:0.6.1
 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@ -1,9 +0,0 @@
-# Fix for Retrofit issue https://github.com/square/retrofit/issues/3751
-# Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).
-keep,allowobfuscation,allowshrinking interface retrofit2.Call
-keep,allowobfuscation,allowshrinking class retrofit2.Response
-
-# With R8 full mode generic signatures are stripped for classes that are not
-# kept. Suspend functions are wrapped in continuations where the type argument
-# is used.
-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -47,9 +47,13 @@
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
            <intent-filter>
-                <data
-                    android:scheme="https"
-                    android:host="www.nowinandroid.apps.samples.google.com" />
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="www.nowinandroid.apps.samples.google.com" />
            </intent-filter>
        </activity>

--- a/app/src/main/baseline-prof.txt
+++ b/app/src/main/baseline-prof.txt
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt
@ -23,7 +23,6 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
@ -55,8 +54,6 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import javax.inject.Inject

-private const val TAG = "MainActivity"
-
@AndroidEntryPoint
 class MainActivity : ComponentActivity() {

@ -78,7 +75,7 @@ class MainActivity : ComponentActivity() {
    @Inject
    lateinit var userNewsResourceRepository: UserNewsResourceRepository

-    val viewModel: MainActivityViewModel by viewModels()
+    private val viewModel: MainActivityViewModel by viewModels()

    override fun onCreate(savedInstanceState: Bundle?) {
        val splashScreen = installSplashScreen()
@ -148,7 +145,6 @@ class MainActivity : ComponentActivity() {
                    androidTheme = shouldUseAndroidTheme(uiState),
                    disableDynamicTheming = shouldDisableDynamicTheming(uiState),
                ) {
-                    @OptIn(ExperimentalMaterial3AdaptiveApi::class)
                    NiaApp(appState)
                }
            }
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt
@ -20,7 +20,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.NavHost
 import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.bookmarksScreen
-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.FOR_YOU_ROUTE
+import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouRoute
 import com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouScreen
 import com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterests
 import com.google.samples.apps.nowinandroid.feature.search.navigation.searchScreen
@ -40,12 +40,11 @@ fun NiaNavHost(
    appState: NiaAppState,
    onShowSnackbar: suspend (String, String?) -> Boolean,
    modifier: Modifier = Modifier,
-    startDestination: String = FOR_YOU_ROUTE,
 ) {
    val navController = appState.navController
    NavHost(
        navController = navController,
-        startDestination = startDestination,
+        startDestination = ForYouRoute,
        modifier = modifier,
    ) {
        forYouScreen(onTopicClick = navController::navigateToInterests)
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt
@ -16,9 +16,14 @@

 package com.google.samples.apps.nowinandroid.navigation

+import androidx.annotation.StringRes
 import androidx.compose.ui.graphics.vector.ImageVector
 import com.google.samples.apps.nowinandroid.R
 import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
+import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.BookmarksRoute
+import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouRoute
+import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute
+import kotlin.reflect.KClass
 import com.google.samples.apps.nowinandroid.feature.bookmarks.R as bookmarksR
 import com.google.samples.apps.nowinandroid.feature.foryou.R as forYouR
 import com.google.samples.apps.nowinandroid.feature.search.R as searchR
@ -31,25 +36,29 @@ import com.google.samples.apps.nowinandroid.feature.search.R as searchR
 enum class TopLevelDestination(
    val selectedIcon: ImageVector,
    val unselectedIcon: ImageVector,
-    val iconTextId: Int,
-    val titleTextId: Int,
+    @StringRes val iconTextId: Int,
+    @StringRes val titleTextId: Int,
+    val route: KClass<*>,
 ) {
    FOR_YOU(
        selectedIcon = NiaIcons.Upcoming,
        unselectedIcon = NiaIcons.UpcomingBorder,
        iconTextId = forYouR.string.feature_foryou_title,
        titleTextId = R.string.app_name,
+        route = ForYouRoute::class,
    ),
    BOOKMARKS(
        selectedIcon = NiaIcons.Bookmarks,
        unselectedIcon = NiaIcons.BookmarksBorder,
        iconTextId = bookmarksR.string.feature_bookmarks_title,
        titleTextId = bookmarksR.string.feature_bookmarks_title,
+        route = BookmarksRoute::class,
    ),
    INTERESTS(
        selectedIcon = NiaIcons.Grid3x3,
        unselectedIcon = NiaIcons.Grid3x3,
        iconTextId = searchR.string.feature_search_interests,
        titleTextId = searchR.string.feature_search_interests,
+        route = InterestsRoute::class,
    ),
 }
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
@ -60,6 +60,7 @@ import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavDestination
+import androidx.navigation.NavDestination.Companion.hasRoute
 import androidx.navigation.NavDestination.Companion.hierarchy
 import com.google.samples.apps.nowinandroid.R
 import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackground
@ -72,6 +73,7 @@ import com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalGradien
 import com.google.samples.apps.nowinandroid.feature.settings.SettingsDialog
 import com.google.samples.apps.nowinandroid.navigation.NiaNavHost
 import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination
+import kotlin.reflect.KClass
 import com.google.samples.apps.nowinandroid.feature.settings.R as settingsR

@OptIn(ExperimentalMaterial3AdaptiveApi::class)
@ -150,7 +152,7 @@ internal fun NiaApp(
            appState.topLevelDestinations.forEach { destination ->
                val hasUnread = unreadDestinations.contains(destination)
                val selected = currentDestination
-                    .isTopLevelDestinationInHierarchy(destination)
+                    .isRouteInHierarchy(destination.route)
                item(
                    selected = selected,
                    onClick = { appState.navigateToTopLevelDestination(destination) },
@ -198,8 +200,10 @@ internal fun NiaApp(
            ) {
                // Show the top app bar on top level destinations.
                val destination = appState.currentTopLevelDestination
-                val shouldShowTopAppBar = destination != null
+                var shouldShowTopAppBar = false
+
                if (destination != null) {
+                    shouldShowTopAppBar = true
                    NiaTopAppBar(
                        titleRes = destination.titleTextId,
                        navigationIcon = NiaIcons.Search,
@ -266,7 +270,7 @@ private fun Modifier.notificationDot(): Modifier =
        }
    }

-private fun NavDestination?.isTopLevelDestinationInHierarchy(destination: TopLevelDestination) =
+private fun NavDestination?.isRouteInHierarchy(route: KClass<*>) =
    this?.hierarchy?.any {
-        it.route?.contains(destination.name, true) ?: false
+        it.hasRoute(route)
    } ?: false
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt
@ -22,6 +22,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
+import androidx.navigation.NavDestination.Companion.hasRoute
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
@ -32,11 +33,8 @@ import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourc
 import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
 import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor
 import com.google.samples.apps.nowinandroid.core.ui.TrackDisposableJank
-import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.BOOKMARKS_ROUTE
 import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.navigateToBookmarks
-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.FOR_YOU_ROUTE
 import com.google.samples.apps.nowinandroid.feature.foryou.navigation.navigateToForYou
-import com.google.samples.apps.nowinandroid.feature.interests.navigation.INTERESTS_ROUTE
 import com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterests
 import com.google.samples.apps.nowinandroid.feature.search.navigation.navigateToSearch
 import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination
@ -90,11 +88,10 @@ class NiaAppState(
            .currentBackStackEntryAsState().value?.destination

    val currentTopLevelDestination: TopLevelDestination?
-        @Composable get() = when (currentDestination?.route) {
-            FOR_YOU_ROUTE -> FOR_YOU
-            BOOKMARKS_ROUTE -> BOOKMARKS
-            INTERESTS_ROUTE -> INTERESTS
-            else -> null
+        @Composable get() {
+            return TopLevelDestination.entries.firstOrNull { topLevelDestination ->
+                currentDestination?.hasRoute(route = topLevelDestination.route) ?: false
+            }
        }

    val isOffline = networkMonitor.isOnline
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/Interests2PaneViewModel.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/Interests2PaneViewModel.kt
@ -18,19 +18,26 @@ package com.google.samples.apps.nowinandroid.ui.interests2pane

 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
-import com.google.samples.apps.nowinandroid.feature.interests.navigation.TOPIC_ID_ARG
+import androidx.navigation.toRoute
+import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.StateFlow
 import javax.inject.Inject

+const val TOPIC_ID_KEY = "selectedTopicId"
+
@HiltViewModel
 class Interests2PaneViewModel @Inject constructor(
    private val savedStateHandle: SavedStateHandle,
 ) : ViewModel() {
-    val selectedTopicId: StateFlow<String?> =
-        savedStateHandle.getStateFlow(TOPIC_ID_ARG, savedStateHandle[TOPIC_ID_ARG])
+
+    val route = savedStateHandle.toRoute<InterestsRoute>()
+    val selectedTopicId: StateFlow<String?> = savedStateHandle.getStateFlow(
+        key = TOPIC_ID_KEY,
+        initialValue = route.initialTopicId,
+    )

    fun onTopicClick(topicId: String?) {
-        savedStateHandle[TOPIC_ID_ARG] = topicId
+        savedStateHandle[TOPIC_ID_KEY] = topicId
    }
 }
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt
@ -17,6 +17,7 @@
 package com.google.samples.apps.nowinandroid.ui.interests2pane

 import androidx.activity.compose.BackHandler
+import androidx.annotation.Keep
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.WindowAdaptiveInfo
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
@ -39,34 +40,26 @@ import androidx.compose.runtime.setValue
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavGraphBuilder
-import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import androidx.navigation.navArgument
 import com.google.samples.apps.nowinandroid.feature.interests.InterestsRoute
-import com.google.samples.apps.nowinandroid.feature.interests.navigation.INTERESTS_ROUTE
-import com.google.samples.apps.nowinandroid.feature.interests.navigation.TOPIC_ID_ARG
+import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute
 import com.google.samples.apps.nowinandroid.feature.topic.TopicDetailPlaceholder
-import com.google.samples.apps.nowinandroid.feature.topic.navigation.TOPIC_ROUTE
-import com.google.samples.apps.nowinandroid.feature.topic.navigation.createTopicRoute
+import com.google.samples.apps.nowinandroid.feature.topic.navigation.TopicRoute
 import com.google.samples.apps.nowinandroid.feature.topic.navigation.navigateToTopic
 import com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreen
+import kotlinx.serialization.Serializable
 import java.util.UUID

-private const val DETAIL_PANE_NAVHOST_ROUTE = "detail_pane_route"
+@Serializable internal object TopicPlaceholderRoute
+
+// TODO: Remove @Keep when https://issuetracker.google.com/353898971 is fixed
+@Keep
+@Serializable internal object DetailPaneNavHostRoute

 fun NavGraphBuilder.interestsListDetailScreen() {
-    composable(
-        route = INTERESTS_ROUTE,
-        arguments = listOf(
-            navArgument(TOPIC_ID_ARG) {
-                type = NavType.StringType
-                defaultValue = null
-                nullable = true
-            },
-        ),
-    ) {
+    composable<InterestsRoute> {
        InterestsListDetailScreen()
    }
 }
@ -104,8 +97,9 @@ internal fun InterestsListDetailScreen(
        listDetailNavigator.navigateBack()
    }

-    var nestedNavHostStartDestination by remember {
-        mutableStateOf(selectedTopicId?.let(::createTopicRoute) ?: TOPIC_ROUTE)
+    var nestedNavHostStartRoute by remember {
+        val route = selectedTopicId?.let { TopicRoute(id = it) } ?: TopicPlaceholderRoute
+        mutableStateOf(route)
    }
    var nestedNavKey by rememberSaveable(
        stateSaver = Saver({ it.toString() }, UUID::fromString),
@ -122,11 +116,11 @@ internal fun InterestsListDetailScreen(
            // If the detail pane was visible, then use the nestedNavController navigate call
            // directly
            nestedNavController.navigateToTopic(topicId) {
-                popUpTo(DETAIL_PANE_NAVHOST_ROUTE)
+                popUpTo<DetailPaneNavHostRoute>()
            }
        } else {
            // Otherwise, recreate the NavHost entirely, and start at the new destination
-            nestedNavHostStartDestination = createTopicRoute(topicId)
+            nestedNavHostStartRoute = TopicRoute(id = topicId)
            nestedNavKey = UUID.randomUUID()
        }
        listDetailNavigator.navigateTo(ListDetailPaneScaffoldRole.Detail)
@ -148,15 +142,15 @@ internal fun InterestsListDetailScreen(
                key(nestedNavKey) {
                    NavHost(
                        navController = nestedNavController,
-                        startDestination = nestedNavHostStartDestination,
-                        route = DETAIL_PANE_NAVHOST_ROUTE,
+                        startDestination = nestedNavHostStartRoute,
+                        route = DetailPaneNavHostRoute::class,
                    ) {
                        topicScreen(
                            showBackButton = !listDetailNavigator.isListPaneVisible(),
                            onBackClick = listDetailNavigator::navigateBack,
                            onTopicClick = ::onTopicClickShowDetailPane,
                        )
-                        composable(route = TOPIC_ROUTE) {
+                        composable<TopicPlaceholderRoute> {
                            TopicDetailPlaceholder()
                        }
                    }
--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/DeviceConfigurationOverrideWindowInsets.kt
+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/DeviceConfigurationOverrideWindowInsets.kt
@ -17,18 +17,17 @@
 package com.google.samples.apps.nowinandroid.ui

 import android.view.WindowInsets
-import android.widget.FrameLayout
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.AbstractComposeView
 import androidx.compose.ui.test.DeviceConfigurationOverride
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.children

 /**
- * A [DeviceConfigurationOverride] that allows overriding the [windowInsets] available
- * to the content under test.
+ * A [DeviceConfigurationOverride] that overrides the window insets for the contained content.
 */
@Suppress("ktlint:standard:function-naming")
 fun DeviceConfigurationOverride.Companion.WindowInsets(
@ -38,10 +37,17 @@ fun DeviceConfigurationOverride.Companion.WindowInsets(
    val currentWindowInsets by rememberUpdatedState(windowInsets)
    AndroidView(
        factory = { context ->
-            object : FrameLayout(context) {
+            object : AbstractComposeView(context) {
+                @Composable
+                override fun Content() {
+                    currentContentUnderTest()
+                }
+
                override fun dispatchApplyWindowInsets(insets: WindowInsets): WindowInsets {
                    children.forEach {
-                        it.dispatchApplyWindowInsets(currentWindowInsets.toWindowInsets())
+                        it.dispatchApplyWindowInsets(
+                            WindowInsets(currentWindowInsets.toWindowInsets()),
+                        )
                    }
                    return WindowInsetsCompat.CONSUMED.toWindowInsets()!!
                }
@ -52,17 +58,10 @@ fun DeviceConfigurationOverride.Companion.WindowInsets(
                 */
                @Deprecated("Deprecated in Java")
                override fun requestFitSystemWindows() {
-                    dispatchApplyWindowInsets(currentWindowInsets.toWindowInsets()!!)
+                    dispatchApplyWindowInsets(WindowInsets(currentWindowInsets.toWindowInsets()!!))
                }
-            }.apply {
-                addView(
-                    ComposeView(context).apply {
-                        setContent {
-                            currentContentUnderTest()
-                        }
-                    },
-                )
            }
        },
+        update = { with(currentWindowInsets) { it.requestApplyInsets() } },
    )
 }
--- a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreenTest.kt
+++ b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreenTest.kt
@ -14,41 +14,47 @@
 * limitations under the License.
 */

-package com.google.samples.apps.nowinandroid.ui.interests2pane
+package com.google.samples.apps.nowinandroid.ui

 import androidx.activity.compose.BackHandler
-import androidx.compose.material3.adaptive.Posture
-import androidx.compose.material3.adaptive.WindowAdaptiveInfo
-import androidx.compose.ui.test.DeviceConfigurationOverride
-import androidx.compose.ui.test.ForcedSize
+import androidx.annotation.StringRes
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.assertIsNotDisplayed
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.compose.ui.unit.DpSize
-import androidx.compose.ui.unit.dp
 import androidx.test.espresso.Espresso
-import androidx.window.core.layout.WindowSizeClass
 import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
-import com.google.samples.apps.nowinandroid.ui.stringResource
+import com.google.samples.apps.nowinandroid.ui.interests2pane.InterestsListDetailScreen
 import com.google.samples.apps.nowinandroid.uitesthiltmanifest.HiltComponentActivity
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
+import dagger.hilt.android.testing.HiltTestApplication
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
 import javax.inject.Inject
+import kotlin.properties.ReadOnlyProperty
 import kotlin.test.assertTrue
 import com.google.samples.apps.nowinandroid.feature.topic.R as FeatureTopicR

+private const val EXPANDED_WIDTH = "w1200dp-h840dp"
+private const val COMPACT_WIDTH = "w412dp-h915dp"
+
@HiltAndroidTest
+@RunWith(RobolectricTestRunner::class)
+@Config(application = HiltTestApplication::class)
 class InterestsListDetailScreenTest {
+
    @get:Rule(order = 0)
    val hiltRule = HiltAndroidRule(this)

@ -58,6 +64,11 @@ class InterestsListDetailScreenTest {
    @Inject
    lateinit var topicsRepository: TopicsRepository

+    /** Convenience function for getting all topics during tests, */
+    private fun getTopics(): List<Topic> = runBlocking {
+        topicsRepository.getTopics().first().sortedBy { it.name }
+    }
+
    // The strings used for matching in these tests.
    private val placeholderText by composeTestRule.stringResource(FeatureTopicR.string.feature_topic_select_an_interest)
    private val listPaneTag = "interests:topics"
@ -65,39 +76,18 @@ class InterestsListDetailScreenTest {
    private val Topic.testTag
        get() = "topic:${this.id}"

-    // Overrides for device sizes.
-    private enum class TestDeviceConfig(widthDp: Float, heightDp: Float) {
-        Compact(412f, 915f),
-        Expanded(1200f, 840f),
-        ;
-
-        val sizeOverride = DeviceConfigurationOverride.ForcedSize(DpSize(widthDp.dp, heightDp.dp))
-        val adaptiveInfo = WindowAdaptiveInfo(
-            windowSizeClass = WindowSizeClass.compute(widthDp, heightDp),
-            windowPosture = Posture(),
-        )
-    }
-
    @Before
    fun setup() {
        hiltRule.inject()
    }

-    /** Convenience function for getting all topics during tests, */
-    private fun getTopics(): List<Topic> = runBlocking {
-        topicsRepository.getTopics().first()
-    }
-
    @Test
+    @Config(qualifiers = EXPANDED_WIDTH)
    fun expandedWidth_initialState_showsTwoPanesWithPlaceholder() {
        composeTestRule.apply {
            setContent {
-                with(TestDeviceConfig.Expanded) {
-                    DeviceConfigurationOverride(override = sizeOverride) {
-                        NiaTheme {
-                            InterestsListDetailScreen(windowAdaptiveInfo = adaptiveInfo)
-                        }
-                    }
+                NiaTheme {
+                    InterestsListDetailScreen()
                }
            }

@ -107,15 +97,12 @@ class InterestsListDetailScreenTest {
    }

    @Test
+    @Config(qualifiers = COMPACT_WIDTH)
    fun compactWidth_initialState_showsListPane() {
        composeTestRule.apply {
            setContent {
-                with(TestDeviceConfig.Compact) {
-                    DeviceConfigurationOverride(override = sizeOverride) {
-                        NiaTheme {
-                            InterestsListDetailScreen(windowAdaptiveInfo = adaptiveInfo)
-                        }
-                    }
+                NiaTheme {
+                    InterestsListDetailScreen()
                }
            }

@ -125,15 +112,12 @@ class InterestsListDetailScreenTest {
    }

    @Test
+    @Config(qualifiers = EXPANDED_WIDTH)
    fun expandedWidth_topicSelected_updatesDetailPane() {
        composeTestRule.apply {
            setContent {
-                with(TestDeviceConfig.Expanded) {
-                    DeviceConfigurationOverride(override = sizeOverride) {
-                        NiaTheme {
-                            InterestsListDetailScreen(windowAdaptiveInfo = adaptiveInfo)
-                        }
-                    }
+                NiaTheme {
+                    InterestsListDetailScreen()
                }
            }

@ -147,15 +131,12 @@ class InterestsListDetailScreenTest {
    }

    @Test
+    @Config(qualifiers = COMPACT_WIDTH)
    fun compactWidth_topicSelected_showsTopicDetailPane() {
        composeTestRule.apply {
            setContent {
-                with(TestDeviceConfig.Compact) {
-                    DeviceConfigurationOverride(override = sizeOverride) {
-                        NiaTheme {
-                            InterestsListDetailScreen(windowAdaptiveInfo = adaptiveInfo)
-                        }
-                    }
+                NiaTheme {
+                    InterestsListDetailScreen()
                }
            }

@ -169,27 +150,25 @@ class InterestsListDetailScreenTest {
    }

    @Test
+    @Config(qualifiers = EXPANDED_WIDTH)
    fun expandedWidth_backPressFromTopicDetail_leavesInterests() {
        var unhandledBackPress = false
        composeTestRule.apply {
            setContent {
-                with(TestDeviceConfig.Expanded) {
-                    DeviceConfigurationOverride(override = sizeOverride) {
-                        NiaTheme {
-                            // Back press should not be handled by the two pane layout, and thus
-                            // "fall through" to this BackHandler.
-                            BackHandler {
-                                unhandledBackPress = true
-                            }
-                            InterestsListDetailScreen(windowAdaptiveInfo = adaptiveInfo)
-                        }
+                NiaTheme {
+                    // Back press should not be handled by the two pane layout, and thus
+                    // "fall through" to this BackHandler.
+                    BackHandler {
+                        unhandledBackPress = true
                    }
+                    InterestsListDetailScreen()
                }
            }

            val firstTopic = getTopics().first()
            onNodeWithText(firstTopic.name).performClick()

+            waitForIdle()
            Espresso.pressBack()

            assertTrue(unhandledBackPress)
@ -197,21 +176,19 @@ class InterestsListDetailScreenTest {
    }

    @Test
+    @Config(qualifiers = COMPACT_WIDTH)
    fun compactWidth_backPressFromTopicDetail_showsListPane() {
        composeTestRule.apply {
            setContent {
-                with(TestDeviceConfig.Compact) {
-                    DeviceConfigurationOverride(override = sizeOverride) {
-                        NiaTheme {
-                            InterestsListDetailScreen(windowAdaptiveInfo = adaptiveInfo)
-                        }
-                    }
+                NiaTheme {
+                    InterestsListDetailScreen()
                }
            }

            val firstTopic = getTopics().first()
            onNodeWithText(firstTopic.name).performClick()

+            waitForIdle()
            Espresso.pressBack()

            onNodeWithTag(listPaneTag).assertIsDisplayed()
@ -220,3 +197,8 @@ class InterestsListDetailScreenTest {
        }
    }
 }
+
+private fun AndroidComposeTestRule<*, *>.stringResource(
+    @StringRes resId: Int,
+): ReadOnlyProperty<Any, String> =
+    ReadOnlyProperty { _, _ -> activity.getString(resId) }
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@ -59,6 +59,7 @@ android {

 baselineProfile {
    // This specifies the managed devices to use that you run the tests on.
+    managedDevices.clear()
    managedDevices += "pixel6Api33"

    // Don't use a connected device but rely on a GMD for consistency between local and CI builds.
--- a/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/BaselineProfileMetrics.kt
+++ b/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/BaselineProfileMetrics.kt
@ -0,0 +1,50 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.nowinandroid
+
+import androidx.benchmark.macro.ExperimentalMetricApi
+import androidx.benchmark.macro.StartupTimingMetric
+import androidx.benchmark.macro.TraceSectionMetric
+
+/**
+ * Custom Metrics to measure baseline profile effectiveness.
+ */
+class BaselineProfileMetrics {
+    companion object {
+        /**
+         * A [TraceSectionMetric] that tracks the time spent in JIT compilation.
+         *
+         * This number should go down when a baseline profile is applied properly.
+         */
+        @OptIn(ExperimentalMetricApi::class)
+        val jitCompilationMetric = TraceSectionMetric("JIT Compiling %", label = "JIT compilation")
+
+        /**
+         * A [TraceSectionMetric] that tracks the time spent in class initialization.
+         *
+         * This number should go down when a baseline profile is applied properly.
+         */
+        @OptIn(ExperimentalMetricApi::class)
+        val classInitMetric = TraceSectionMetric("L%/%;", label = "ClassInit")
+
+        /**
+         * Metrics relevant to startup and baseline profile effectiveness measurement.
+         */
+        @OptIn(ExperimentalMetricApi::class)
+        val allMetrics = listOf(StartupTimingMetric(), jitCompilationMetric, classInitMetric)
+    }
+}
--- a/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/startup/StartupBenchmark.kt
+++ b/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/startup/StartupBenchmark.kt
@ -20,9 +20,9 @@ import androidx.benchmark.macro.BaselineProfileMode.Disable
 import androidx.benchmark.macro.BaselineProfileMode.Require
 import androidx.benchmark.macro.CompilationMode
 import androidx.benchmark.macro.StartupMode.COLD
-import androidx.benchmark.macro.StartupTimingMetric
 import androidx.benchmark.macro.junit4.MacrobenchmarkRule
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.google.samples.apps.nowinandroid.BaselineProfileMetrics
 import com.google.samples.apps.nowinandroid.PACKAGE_NAME
 import com.google.samples.apps.nowinandroid.allowNotifications
 import com.google.samples.apps.nowinandroid.foryou.forYouWaitForContent
@ -58,7 +58,7 @@ class StartupBenchmark {

    private fun startup(compilationMode: CompilationMode) = benchmarkRule.measureRepeated(
        packageName = PACKAGE_NAME,
-        metrics = listOf(StartupTimingMetric()),
+        metrics = BaselineProfileMetrics.allMetrics,
        compilationMode = compilationMode,
        // More iterations result in higher statistical significance.
        iterations = 20,
--- a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
@ -28,6 +28,7 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
            pluginManager.apply {
                apply("nowinandroid.android.library")
                apply("nowinandroid.hilt")
+                apply("org.jetbrains.kotlin.plugin.serialization")
            }
            extensions.configure<LibraryExtension> {
                testOptions.animationsDisabled = true
@ -41,8 +42,11 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
                add("implementation", libs.findLibrary("androidx.hilt.navigation.compose").get())
                add("implementation", libs.findLibrary("androidx.lifecycle.runtimeCompose").get())
                add("implementation", libs.findLibrary("androidx.lifecycle.viewModelCompose").get())
+                add("implementation", libs.findLibrary("androidx.navigation.compose").get())
                add("implementation", libs.findLibrary("androidx.tracing.ktx").get())
+                add("implementation", libs.findLibrary("kotlinx.serialization.json").get())

+                add("testImplementation", libs.findLibrary("androidx.navigation.testing").get())
                add("androidTestImplementation", libs.findLibrary("androidx.lifecycle.runtimeTesting").get())
            }
        }
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
@ -65,8 +65,7 @@ internal fun Project.configureAndroidCompose(
            .relativeToRootProject("compose-reports")
            .let(reportsDestination::set)

-        stabilityConfigurationFile = rootProject.layout.projectDirectory.file("compose_compiler_config.conf")
-        
-        enableStrongSkippingMode = true
+        stabilityConfigurationFile =
+            rootProject.layout.projectDirectory.file("compose_compiler_config.conf")
    }
 }
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt
@ -35,12 +35,12 @@ import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.PathSensitive
 import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
-import org.gradle.configurationcache.extensions.capitalized
 import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.register
 import org.gradle.language.base.plugins.LifecycleBasePlugin
 import org.gradle.process.ExecOperations
 import java.io.File
+import java.util.Locale
 import javax.inject.Inject

@CacheableTask
@ -107,6 +107,10 @@ abstract class CheckBadgingTask : DefaultTask() {
    }
 }

+private fun String.capitalized() = replaceFirstChar {
+    if (it.isLowerCase()) it.titlecase() else it.toString()
+}
+
 fun Project.configureBadgingTasks(
    baseExtension: BaseExtension,
    componentsExtension: ApplicationAndroidComponentsExtension,
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -30,7 +30,13 @@ buildscript {

 }

-// Lists all plugins used throughout the project
+/*
+ * By listing all the plugins used throughout all subprojects in the root project build script, it
+ * ensures that the build script classpath remains the same for all projects. This avoids potential
+ * problems with mismatching versions of transitive plugin dependencies. A subproject that applies
+ * an unlisted plugin will have that plugin and its dependencies _appended_ to the classpath, not
+ * replacing pre-existing dependencies.
+ */
 plugins {
    alias(libs.plugins.android.application) apply false
    alias(libs.plugins.android.library) apply false
--- a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_20.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_20.png
--- a/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/UserNewsResource.kt
+++ b/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/UserNewsResource.kt
@ -22,6 +22,7 @@ import kotlinx.datetime.Instant
 * A [NewsResource] with additional user information such as whether the user is following the
 * news resource's topics and whether they have saved (bookmarked) this news resource.
 */
+@ConsistentCopyVisibility
 data class UserNewsResource internal constructor(
    val id: String,
    val title: String,
--- a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt
+++ b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt
@ -22,12 +22,12 @@ import com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeList
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.Call
 import okhttp3.MediaType.Companion.toMediaType
 import retrofit2.Retrofit
+import retrofit2.converter.kotlinx.serialization.asConverterFactory
 import retrofit2.http.GET
 import retrofit2.http.Query
 import javax.inject.Inject
--- a/core/notifications/src/main/kotlin/com/google/samples/apps/nowinandroid/core/notifications/SystemTrayNotifier.kt
+++ b/core/notifications/src/main/kotlin/com/google/samples/apps/nowinandroid/core/notifications/SystemTrayNotifier.kt
@ -44,7 +44,10 @@ private const val NEWS_NOTIFICATION_SUMMARY_ID = 1
 private const val NEWS_NOTIFICATION_CHANNEL_ID = ""
 private const val NEWS_NOTIFICATION_GROUP = "NEWS_NOTIFICATIONS"
 private const val DEEP_LINK_SCHEME_AND_HOST = "https://www.nowinandroid.apps.samples.google.com"
-private const val FOR_YOU_PATH = "foryou"
+private const val DEEP_LINK_FOR_YOU_PATH = "foryou"
+private const val DEEP_LINK_BASE_PATH = "$DEEP_LINK_SCHEME_AND_HOST/$DEEP_LINK_FOR_YOU_PATH"
+const val DEEP_LINK_NEWS_RESOURCE_ID_KEY = "linkedNewsResourceId"
+const val DEEP_LINK_URI_PATTERN = "$DEEP_LINK_BASE_PATH/{$DEEP_LINK_NEWS_RESOURCE_ID_KEY}"

 /**
 * Implementation of [Notifier] that displays notifications in the system tray.
@ -161,4 +164,4 @@ private fun Context.newsPendingIntent(
    PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
 )

-private fun NewsResource.newsDeepLinkUri() = "$DEEP_LINK_SCHEME_AND_HOST/$FOR_YOU_PATH/$id".toUri()
+private fun NewsResource.newsDeepLinkUri() = "$DEEP_LINK_BASE_PATH/$id".toUri()
--- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt
+++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt
@ -87,7 +87,7 @@ fun LazyStaggeredGridScope.newsFeed(
                    onTopicClick = onTopicClick,
                    modifier = Modifier
                        .padding(horizontal = 8.dp)
-                        .animateItemPlacement(),
+                        .animateItem(),
                )
            }
        }
--- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
+++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
@ -16,8 +16,15 @@

 package com.google.samples.apps.nowinandroid.core.ui

+import android.content.ClipData
+import android.os.Build.VERSION
+import android.os.Build.VERSION_CODES
+import android.view.View
 import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.draganddrop.dragAndDropSource
+import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@ -45,6 +52,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draganddrop.DragAndDropTransferData
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalInspectionMode
@ -77,6 +85,7 @@ import java.util.Locale
 * [NewsResource] card used on the following screens: For You, Saved
 */

+@OptIn(ExperimentalFoundationApi::class)
@Composable
 fun NewsResourceCardExpanded(
    userNewsResource: UserNewsResource,
@ -88,6 +97,19 @@ fun NewsResourceCardExpanded(
    modifier: Modifier = Modifier,
 ) {
    val clickActionLabel = stringResource(R.string.core_ui_card_tap_action)
+    val sharingLabel = stringResource(R.string.core_ui_feed_sharing)
+    val sharingContent = stringResource(
+        R.string.core_ui_feed_sharing_data,
+        userNewsResource.title,
+        userNewsResource.url,
+    )
+
+    val dragAndDropFlags = if (VERSION.SDK_INT >= VERSION_CODES.N) {
+        View.DRAG_FLAG_GLOBAL
+    } else {
+        0
+    }
+
    Card(
        onClick = onClick,
        shape = RoundedCornerShape(16.dp),
@ -112,7 +134,23 @@ fun NewsResourceCardExpanded(
                    Row {
                        NewsResourceTitle(
                            userNewsResource.title,
-                            modifier = Modifier.fillMaxWidth((.8f)),
+                            modifier = Modifier
+                                .fillMaxWidth((.8f))
+                                .dragAndDropSource {
+                                    detectTapGestures(
+                                        onLongPress = {
+                                            startTransfer(
+                                                DragAndDropTransferData(
+                                                    ClipData.newPlainText(
+                                                        sharingLabel,
+                                                        sharingContent,
+                                                    ),
+                                                    flags = dragAndDropFlags,
+                                                ),
+                                            )
+                                        },
+                                    )
+                                },
                        )
                        Spacer(modifier = Modifier.weight(1f))
                        BookmarkButton(isBookmarked, onToggleBookmark)
--- a/core/ui/src/main/res/values/strings.xml
+++ b/core/ui/src/main/res/values/strings.xml
@ -29,4 +29,6 @@

    <string name="core_ui_interests_card_follow_button_content_desc">Follow interest</string>
    <string name="core_ui_interests_card_unfollow_button_content_desc">Unfollow interest</string>
+    <string name="core_ui_feed_sharing">Feed sharing</string>
+    <string name="core_ui_feed_sharing_data">%1$s: %2$s</string>
 </resources>
--- a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt
+++ b/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt
@ -21,16 +21,18 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
 import com.google.samples.apps.nowinandroid.feature.bookmarks.BookmarksRoute
+import kotlinx.serialization.Serializable

-const val BOOKMARKS_ROUTE = "bookmarks_route"
+@Serializable object BookmarksRoute

-fun NavController.navigateToBookmarks(navOptions: NavOptions) = navigate(BOOKMARKS_ROUTE, navOptions)
+fun NavController.navigateToBookmarks(navOptions: NavOptions) =
+    navigate(route = BookmarksRoute, navOptions)

 fun NavGraphBuilder.bookmarksScreen(
    onTopicClick: (String) -> Unit,
    onShowSnackbar: suspend (String, String?) -> Boolean,
 ) {
-    composable(route = BOOKMARKS_ROUTE) {
+    composable<BookmarksRoute> {
        BookmarksRoute(onTopicClick, onShowSnackbar)
    }
 }
--- a/feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt
+++ b/feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt
@ -64,20 +64,18 @@ class BookmarksViewModelTest {

    @Test
    fun oneBookmark_showsInFeed() = runTest {
-        val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.feedUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedUiState.collect() }

        newsRepository.sendNewsResources(newsResourcesTestData)
        userDataRepository.setNewsResourceBookmarked(newsResourcesTestData[0].id, true)
        val item = viewModel.feedUiState.value
        assertIs<Success>(item)
        assertEquals(item.feed.size, 1)
-
-        collectJob.cancel()
    }

    @Test
    fun oneBookmark_whenRemoving_removesFromFeed() = runTest {
-        val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.feedUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedUiState.collect() }
        // Set the news resources to be used by this test
        newsRepository.sendNewsResources(newsResourcesTestData)
        // Start with the resource saved
@ -88,7 +86,5 @@ class BookmarksViewModelTest {
        val item = viewModel.feedUiState.value
        assertIs<Success>(item)
        assertEquals(item.feed.size, 0)
-
-        collectJob.cancel()
    }
 }
--- a/feature/foryou/build.gradle.kts
+++ b/feature/foryou/build.gradle.kts
@ -29,6 +29,7 @@ dependencies {
    implementation(libs.accompanist.permissions)
    implementation(projects.core.data)
    implementation(projects.core.domain)
+    implementation(project(":core:notifications"))

    testImplementation(libs.hilt.android.testing)
    testImplementation(libs.robolectric)
--- a/feature/foryou/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt
+++ b/feature/foryou/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt
@ -17,7 +17,7 @@
 package com.google.samples.apps.nowinandroid.feature.foryou

 import androidx.activity.ComponentActivity
-import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Box
 import androidx.compose.ui.test.assertHasClickAction
 import androidx.compose.ui.test.assertIsEnabled
 import androidx.compose.ui.test.assertIsNotEnabled
@ -52,7 +52,7 @@ class ForYouScreenTest {
    @Test
    fun circularProgressIndicator_whenScreenIsLoading_exists() {
        composeTestRule.setContent {
-            BoxWithConstraints {
+            Box {
                ForYouScreen(
                    isSyncing = false,
                    onboardingUiState = OnboardingUiState.Loading,
@ -78,7 +78,7 @@ class ForYouScreenTest {
    @Test
    fun circularProgressIndicator_whenScreenIsSyncing_exists() {
        composeTestRule.setContent {
-            BoxWithConstraints {
+            Box {
                ForYouScreen(
                    isSyncing = true,
                    onboardingUiState = OnboardingUiState.NotShown,
@ -106,7 +106,7 @@ class ForYouScreenTest {
        val testData = followableTopicTestData.map { it.copy(isFollowed = false) }

        composeTestRule.setContent {
-            BoxWithConstraints {
+            Box {
                ForYouScreen(
                    isSyncing = false,
                    onboardingUiState = OnboardingUiState.Shown(
@ -149,7 +149,7 @@ class ForYouScreenTest {
    @Test
    fun topicSelector_whenSomeTopicsSelected_showsTopicChipsAndEnabledDoneButton() {
        composeTestRule.setContent {
-            BoxWithConstraints {
+            Box {
                ForYouScreen(
                    isSyncing = false,
                    onboardingUiState =
@ -196,7 +196,7 @@ class ForYouScreenTest {
    @Test
    fun feed_whenInterestsSelectedAndLoading_showsLoadingIndicator() {
        composeTestRule.setContent {
-            BoxWithConstraints {
+            Box {
                ForYouScreen(
                    isSyncing = false,
                    onboardingUiState =
@ -223,7 +223,7 @@ class ForYouScreenTest {
    @Test
    fun feed_whenNoInterestsSelectionAndLoading_showsLoadingIndicator() {
        composeTestRule.setContent {
-            BoxWithConstraints {
+            Box {
                ForYouScreen(
                    isSyncing = false,
                    onboardingUiState = OnboardingUiState.NotShown,
--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
+++ b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
@ -82,7 +82,6 @@ import androidx.compose.ui.unit.max
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.tracing.trace
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.PermissionStatus.Denied
 import com.google.accompanist.permissions.rememberPermissionState
@ -106,7 +105,7 @@ import com.google.samples.apps.nowinandroid.core.ui.launchCustomChromeTab
 import com.google.samples.apps.nowinandroid.core.ui.newsFeed

@Composable
-internal fun ForYouRoute(
+internal fun ForYouScreen(
    onTopicClick: (String) -> Unit,
    modifier: Modifier = Modifier,
    viewModel: ForYouViewModel = hiltViewModel(),
@ -320,7 +319,7 @@ private fun TopicSelection(
    onboardingUiState: OnboardingUiState.Shown,
    onTopicCheckedChanged: (String, Boolean) -> Unit,
    modifier: Modifier = Modifier,
-) = trace("TopicSelection") {
+) {
    val lazyGridState = rememberLazyGridState()
    val topicSelectionTestTag = "forYou:topicSelection"

@ -381,7 +380,7 @@ private fun SingleTopicButton(
    imageUrl: String,
    isSelected: Boolean,
    onClick: (String, Boolean) -> Unit,
-) = trace("SingleTopicButton") {
+) {
    Surface(
        modifier = Modifier
            .width(312.dp)
--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt
+++ b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt
@ -27,8 +27,8 @@ import com.google.samples.apps.nowinandroid.core.data.repository.UserDataReposit
 import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository
 import com.google.samples.apps.nowinandroid.core.data.util.SyncManager
 import com.google.samples.apps.nowinandroid.core.domain.GetFollowableTopicsUseCase
+import com.google.samples.apps.nowinandroid.core.notifications.DEEP_LINK_NEWS_RESOURCE_ID_KEY
 import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState
-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.LINKED_NEWS_RESOURCE_ID
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
@ -55,7 +55,7 @@ class ForYouViewModel @Inject constructor(
        userDataRepository.userData.map { !it.shouldHideOnboarding }

    val deepLinkedNewsResource = savedStateHandle.getStateFlow<String?>(
-        key = LINKED_NEWS_RESOURCE_ID,
+        key = DEEP_LINK_NEWS_RESOURCE_ID_KEY,
        null,
    )
        .flatMapLatest { newsResourceId ->
@ -129,7 +129,7 @@ class ForYouViewModel @Inject constructor(

    fun onDeepLinkOpened(newsResourceId: String) {
        if (newsResourceId == deepLinkedNewsResource.value?.id) {
-            savedStateHandle[LINKED_NEWS_RESOURCE_ID] = null
+            savedStateHandle[DEEP_LINK_NEWS_RESOURCE_ID_KEY] = null
        }
        analyticsHelper.logNewsDeepLinkOpen(newsResourceId = newsResourceId)
        viewModelScope.launch {
@ -153,7 +153,7 @@ private fun AnalyticsHelper.logNewsDeepLinkOpen(newsResourceId: String) =
            type = "news_deep_link_opened",
            extras = listOf(
                Param(
-                    key = LINKED_NEWS_RESOURCE_ID,
+                    key = DEEP_LINK_NEWS_RESOURCE_ID_KEY,
                    value = newsResourceId,
                ),
            ),
--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt
+++ b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt
@ -19,29 +19,31 @@ package com.google.samples.apps.nowinandroid.feature.foryou.navigation
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
-import androidx.navigation.NavType
 import androidx.navigation.compose.composable
-import androidx.navigation.navArgument
 import androidx.navigation.navDeepLink
-import com.google.samples.apps.nowinandroid.feature.foryou.ForYouRoute
+import com.google.samples.apps.nowinandroid.core.notifications.DEEP_LINK_URI_PATTERN
+import com.google.samples.apps.nowinandroid.feature.foryou.ForYouScreen
+import kotlinx.serialization.Serializable

-const val LINKED_NEWS_RESOURCE_ID = "linkedNewsResourceId"
-const val FOR_YOU_ROUTE = "for_you_route/{$LINKED_NEWS_RESOURCE_ID}"
-private const val DEEP_LINK_URI_PATTERN =
-    "https://www.nowinandroid.apps.samples.google.com/foryou/{$LINKED_NEWS_RESOURCE_ID}"
+@Serializable data object ForYouRoute

-fun NavController.navigateToForYou(navOptions: NavOptions) = navigate(FOR_YOU_ROUTE, navOptions)
+fun NavController.navigateToForYou(navOptions: NavOptions) = navigate(route = ForYouRoute, navOptions)

 fun NavGraphBuilder.forYouScreen(onTopicClick: (String) -> Unit) {
-    composable(
-        route = FOR_YOU_ROUTE,
+    composable<ForYouRoute>(
        deepLinks = listOf(
-            navDeepLink { uriPattern = DEEP_LINK_URI_PATTERN },
-        ),
-        arguments = listOf(
-            navArgument(LINKED_NEWS_RESOURCE_ID) { type = NavType.StringType },
+            navDeepLink {
+                /**
+                 * This destination has a deep link that enables a specific news resource to be
+                 * opened from a notification (@see SystemTrayNotifier for more). The news resource
+                 * ID is sent in the URI rather than being modelled in the route type because it's
+                 * transient data (stored in SavedStateHandle) that is cleared after the user has
+                 * opened the news resource.
+                 */
+                uriPattern = DEEP_LINK_URI_PATTERN
+            },
        ),
    ) {
-        ForYouRoute(onTopicClick)
+        ForYouScreen(onTopicClick)
    }
 }
--- a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt
+++ b/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt
@ -26,6 +26,7 @@ import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import com.google.samples.apps.nowinandroid.core.model.data.UserNewsResource
 import com.google.samples.apps.nowinandroid.core.model.data.mapToUserNewsResources
+import com.google.samples.apps.nowinandroid.core.notifications.DEEP_LINK_NEWS_RESOURCE_ID_KEY
 import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepository
 import com.google.samples.apps.nowinandroid.core.testing.repository.TestTopicsRepository
 import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository
@ -34,7 +35,6 @@ import com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule
 import com.google.samples.apps.nowinandroid.core.testing.util.TestAnalyticsHelper
 import com.google.samples.apps.nowinandroid.core.testing.util.TestSyncManager
 import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState
-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.LINKED_NEWS_RESOURCE_ID
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
@ -98,9 +98,8 @@ class ForYouViewModelTest {

    @Test
    fun stateIsLoadingWhenFollowedTopicsAreLoading() = runTest {
-        val collectJob1 =
-            launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
-        val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }

        topicsRepository.sendTopics(sampleTopics)

@ -109,31 +108,24 @@ class ForYouViewModelTest {
            viewModel.onboardingUiState.value,
        )
        assertEquals(NewsFeedUiState.Loading, viewModel.feedState.value)
-
-        collectJob1.cancel()
-        collectJob2.cancel()
    }

    @Test
    fun stateIsLoadingWhenAppIsSyncingWithNoInterests() = runTest {
        syncManager.setSyncing(true)

-        val collectJob =
-            launch(UnconfinedTestDispatcher()) { viewModel.isSyncing.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.isSyncing.collect() }

        assertEquals(
            true,
            viewModel.isSyncing.value,
        )
-
-        collectJob.cancel()
    }

    @Test
    fun onboardingStateIsLoadingWhenTopicsAreLoading() = runTest {
-        val collectJob1 =
-            launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
-        val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }

        userDataRepository.setFollowedTopicIds(emptySet())

@ -142,16 +134,12 @@ class ForYouViewModelTest {
            viewModel.onboardingUiState.value,
        )
        assertEquals(NewsFeedUiState.Success(emptyList()), viewModel.feedState.value)
-
-        collectJob1.cancel()
-        collectJob2.cancel()
    }

    @Test
    fun onboardingIsShownWhenNewsResourcesAreLoading() = runTest {
-        val collectJob1 =
-            launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
-        val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }

        topicsRepository.sendTopics(sampleTopics)
        userDataRepository.setFollowedTopicIds(emptySet())
@ -202,16 +190,12 @@ class ForYouViewModelTest {
            ),
            viewModel.feedState.value,
        )
-
-        collectJob1.cancel()
-        collectJob2.cancel()
    }

    @Test
    fun onboardingIsShownAfterLoadingEmptyFollowedTopics() = runTest {
-        val collectJob1 =
-            launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
-        val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }

        topicsRepository.sendTopics(sampleTopics)
        userDataRepository.setFollowedTopicIds(emptySet())
@ -263,16 +247,12 @@ class ForYouViewModelTest {
            ),
            viewModel.feedState.value,
        )
-
-        collectJob1.cancel()
-        collectJob2.cancel()
    }

    @Test
    fun onboardingIsNotShownAfterUserDismissesOnboarding() = runTest {
-        val collectJob1 =
-            launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
-        val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }

        topicsRepository.sendTopics(sampleTopics)

@ -299,16 +279,12 @@ class ForYouViewModelTest {
            ),
            viewModel.feedState.value,
        )
-
-        collectJob1.cancel()
-        collectJob2.cancel()
    }

    @Test
    fun topicSelectionUpdatesAfterSelectingTopic() = runTest {
-        val collectJob1 =
-            launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
-        val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }

        topicsRepository.sendTopics(sampleTopics)
        userDataRepository.setFollowedTopicIds(emptySet())
@ -352,16 +328,12 @@ class ForYouViewModelTest {
            ),
            viewModel.feedState.value,
        )
-
-        collectJob1.cancel()
-        collectJob2.cancel()
    }

    @Test
    fun topicSelectionUpdatesAfterUnselectingTopic() = runTest {
-        val collectJob1 =
-            launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
-        val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }

        topicsRepository.sendTopics(sampleTopics)
        userDataRepository.setFollowedTopicIds(emptySet())
@ -416,16 +388,12 @@ class ForYouViewModelTest {
            ),
            viewModel.feedState.value,
        )
-
-        collectJob1.cancel()
-        collectJob2.cancel()
    }

    @Test
    fun newsResourceSelectionUpdatesAfterLoadingFollowedTopics() = runTest {
-        val collectJob1 =
-            launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
-        val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }

        val followedTopicIds = setOf("1")
        val userData = emptyUserData.copy(
@ -460,19 +428,15 @@ class ForYouViewModelTest {
            ),
            viewModel.feedState.value,
        )
-
-        collectJob1.cancel()
-        collectJob2.cancel()
    }

    @Test
    fun deepLinkedNewsResourceIsFetchedAndResetAfterViewing() = runTest {
-        val collectJob =
-            launch(UnconfinedTestDispatcher()) { viewModel.deepLinkedNewsResource.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.deepLinkedNewsResource.collect() }

        newsRepository.sendNewsResources(sampleNewsResources)
        userDataRepository.setUserData(emptyUserData)
-        savedStateHandle[LINKED_NEWS_RESOURCE_ID] = sampleNewsResources.first().id
+        savedStateHandle[DEEP_LINK_NEWS_RESOURCE_ID_KEY] = sampleNewsResources.first().id

        assertEquals(
            expected = UserNewsResource(
@ -496,15 +460,13 @@ class ForYouViewModelTest {
                    type = "news_deep_link_opened",
                    extras = listOf(
                        Param(
-                            key = LINKED_NEWS_RESOURCE_ID,
+                            key = DEEP_LINK_NEWS_RESOURCE_ID_KEY,
                            value = sampleNewsResources.first().id,
                        ),
                    ),
                ),
            ),
        )
-
-        collectJob.cancel()
    }

    @Test
--- a/feature/interests/build.gradle.kts
+++ b/feature/interests/build.gradle.kts
@ -28,6 +28,7 @@ dependencies {
    implementation(projects.core.domain)

    testImplementation(projects.core.testing)
+    testImplementation(libs.robolectric)

    androidTestImplementation(libs.bundles.androidx.compose.ui.test)
    androidTestImplementation(projects.core.testing)
--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt
+++ b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt
@ -19,11 +19,12 @@ package com.google.samples.apps.nowinandroid.feature.interests
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.navigation.toRoute
 import com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepository
 import com.google.samples.apps.nowinandroid.core.domain.GetFollowableTopicsUseCase
 import com.google.samples.apps.nowinandroid.core.domain.TopicSortField
 import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic
-import com.google.samples.apps.nowinandroid.feature.interests.navigation.TOPIC_ID_ARG
+import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@ -39,7 +40,14 @@ class InterestsViewModel @Inject constructor(
    getFollowableTopics: GetFollowableTopicsUseCase,
 ) : ViewModel() {

-    val selectedTopicId: StateFlow<String?> = savedStateHandle.getStateFlow(TOPIC_ID_ARG, null)
+    // Key used to save and retrieve the currently selected topic id from saved state.
+    private val selectedTopicIdKey = "selectedTopicIdKey"
+
+    private val interestsRoute: InterestsRoute = savedStateHandle.toRoute()
+    private val selectedTopicId = savedStateHandle.getStateFlow(
+        key = selectedTopicIdKey,
+        initialValue = interestsRoute.initialTopicId,
+    )

    val uiState: StateFlow<InterestsUiState> = combine(
        selectedTopicId,
@ -58,7 +66,7 @@ class InterestsViewModel @Inject constructor(
    }

    fun onTopicClick(topicId: String?) {
-        savedStateHandle[TOPIC_ID_ARG] = topicId
+        savedStateHandle[selectedTopicIdKey] = topicId
    }
 }

--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt
+++ b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt
@ -17,39 +17,17 @@
 package com.google.samples.apps.nowinandroid.feature.interests.navigation

 import androidx.navigation.NavController
-import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
-import androidx.navigation.NavType
-import androidx.navigation.compose.composable
-import androidx.navigation.navArgument
-import com.google.samples.apps.nowinandroid.feature.interests.InterestsRoute
+import kotlinx.serialization.Serializable

-const val TOPIC_ID_ARG = "topicId"
-const val INTERESTS_ROUTE_BASE = "interests_route"
-const val INTERESTS_ROUTE = "$INTERESTS_ROUTE_BASE?$TOPIC_ID_ARG={$TOPIC_ID_ARG}"
+@Serializable data class InterestsRoute(
+    // The ID of the topic which will be initially selected at this destination
+    val initialTopicId: String? = null,
+)

-fun NavController.navigateToInterests(topicId: String? = null, navOptions: NavOptions? = null) {
-    val route = if (topicId != null) {
-        "${INTERESTS_ROUTE_BASE}?${TOPIC_ID_ARG}=$topicId"
-    } else {
-        INTERESTS_ROUTE_BASE
-    }
-    navigate(route, navOptions)
-}
-
-fun NavGraphBuilder.interestsScreen(
-    onTopicClick: (String) -> Unit,
+fun NavController.navigateToInterests(
+    initialTopicId: String? = null,
+    navOptions: NavOptions? = null,
 ) {
-    composable(
-        route = INTERESTS_ROUTE,
-        arguments = listOf(
-            navArgument(TOPIC_ID_ARG) {
-                defaultValue = null
-                nullable = true
-                type = NavType.StringType
-            },
-        ),
-    ) {
-        InterestsRoute(onTopicClick = onTopicClick)
-    }
+    navigate(route = InterestsRoute(initialTopicId), navOptions)
 }
--- a/feature/interests/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt
+++ b/feature/interests/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt
@ -17,6 +17,7 @@
 package com.google.samples.apps.nowinandroid.interests

 import androidx.lifecycle.SavedStateHandle
+import androidx.navigation.testing.invoke
 import com.google.samples.apps.nowinandroid.core.domain.GetFollowableTopicsUseCase
 import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
@ -25,7 +26,7 @@ import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserData
 import com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule
 import com.google.samples.apps.nowinandroid.feature.interests.InterestsUiState
 import com.google.samples.apps.nowinandroid.feature.interests.InterestsViewModel
-import com.google.samples.apps.nowinandroid.feature.interests.navigation.TOPIC_ID_ARG
+import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
@ -33,12 +34,21 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
 import kotlin.test.assertEquals

 /**
 * To learn more about how this test handles Flows created with stateIn, see
 * https://developer.android.com/kotlin/flow/test#statein
+ *
+ * These tests use Robolectric because the subject under test (the ViewModel) uses
+ * `SavedStateHandle.toRoute` which has a dependency on `android.os.Bundle`.
+ *
+ * TODO: Remove Robolectric if/when AndroidX Navigation API is updated to remove Android dependency.
+ *  See https://issuetracker.google.com/340966212.
 */
+@RunWith(RobolectricTestRunner::class)
 class InterestsViewModelTest {

    @get:Rule
@ -55,7 +65,9 @@ class InterestsViewModelTest {
    @Before
    fun setup() {
        viewModel = InterestsViewModel(
-            savedStateHandle = SavedStateHandle(mapOf(TOPIC_ID_ARG to testInputTopics[0].topic.id)),
+            savedStateHandle = SavedStateHandle(
+                route = InterestsRoute(initialTopicId = testInputTopics[0].topic.id),
+            ),
            userDataRepository = userDataRepository,
            getFollowableTopics = getFollowableTopicsUseCase,
        )
@ -68,17 +80,15 @@ class InterestsViewModelTest {

    @Test
    fun uiState_whenFollowedTopicsAreLoading_thenShowLoading() = runTest {
-        val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect() }

        userDataRepository.setFollowedTopicIds(emptySet())
        assertEquals(InterestsUiState.Loading, viewModel.uiState.value)
-
-        collectJob.cancel()
    }

    @Test
    fun uiState_whenFollowingNewTopic_thenShowUpdatedTopics() = runTest {
-        val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect() }

        val toggleTopicId = testOutputTopics[1].topic.id
        topicsRepository.sendTopics(testInputTopics.map { it.topic })
@ -102,13 +112,11 @@ class InterestsViewModelTest {
            ),
            viewModel.uiState.value,
        )
-
-        collectJob.cancel()
    }

    @Test
    fun uiState_whenUnfollowingTopics_thenShowUpdatedTopics() = runTest {
-        val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect() }

        val toggleTopicId = testOutputTopics[1].topic.id

@ -135,8 +143,6 @@ class InterestsViewModelTest {
            ),
            viewModel.uiState.value,
        )
-
-        collectJob.cancel()
    }
 }

--- a/feature/search/build.gradle.kts
+++ b/feature/search/build.gradle.kts
@ -27,7 +27,6 @@ android {
 dependencies {
    implementation(projects.core.data)
    implementation(projects.core.domain)
-    implementation(projects.core.ui)

    testImplementation(projects.core.testing)

--- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt
+++ b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt
@ -41,7 +41,6 @@ import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
 import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan
 import androidx.compose.foundation.lazy.staggeredgrid.rememberLazyStaggeredGridState
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.ClickableText
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Icon
@ -66,6 +65,7 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.LinkAnnotation
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.buildAnnotatedString
@ -73,6 +73,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.withLink
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
@ -227,23 +228,31 @@ fun EmptySearchResultBody(
            textAlign = TextAlign.Center,
            modifier = Modifier.padding(vertical = 24.dp),
        )
-        val interests = stringResource(id = searchR.string.feature_search_interests)
        val tryAnotherSearchString = buildAnnotatedString {
            append(stringResource(id = searchR.string.feature_search_try_another_search))
            append(" ")
-            withStyle(
-                style = SpanStyle(
-                    textDecoration = TextDecoration.Underline,
-                    fontWeight = FontWeight.Bold,
+            withLink(
+                LinkAnnotation.Clickable(
+                    tag = "",
+                    linkInteractionListener = {
+                        onInterestsClick()
+                    },
                ),
            ) {
-                pushStringAnnotation(tag = interests, annotation = interests)
-                append(interests)
+                withStyle(
+                    style = SpanStyle(
+                        textDecoration = TextDecoration.Underline,
+                        fontWeight = FontWeight.Bold,
+                    ),
+                ) {
+                    append(stringResource(id = searchR.string.feature_search_interests))
+                }
            }
+
            append(" ")
            append(stringResource(id = searchR.string.feature_search_to_browse_topics))
        }
-        ClickableText(
+        Text(
            text = tryAnotherSearchString,
            style = MaterialTheme.typography.bodyLarge.merge(
                TextStyle(
@ -252,13 +261,8 @@ fun EmptySearchResultBody(
                ),
            ),
            modifier = Modifier
-                .padding(start = 36.dp, end = 36.dp, bottom = 24.dp)
-                .clickable {},
-        ) { offset ->
-            tryAnotherSearchString.getStringAnnotations(start = offset, end = offset)
-                .firstOrNull()
-                ?.let { onInterestsClick() }
-        }
+                .padding(start = 36.dp, end = 36.dp, bottom = 24.dp),
+        )
    }
 }

--- a/feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt
+++ b/feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt
@ -85,20 +85,16 @@ class SearchViewModelTest {
    fun stateIsEmptyQuery_withEmptySearchQuery() = runTest {
        searchContentsRepository.addNewsResources(newsResourcesTestData)
        searchContentsRepository.addTopics(topicsTestData)
-        val collectJob =
-            launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }

        viewModel.onSearchQueryChanged("")

        assertEquals(EmptyQuery, viewModel.searchResultUiState.value)
-
-        collectJob.cancel()
    }

    @Test
    fun emptyResultIsReturned_withNotMatchingQuery() = runTest {
-        val collectJob =
-            launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }

        viewModel.onSearchQueryChanged("XXX")
        searchContentsRepository.addNewsResources(newsResourcesTestData)
@ -106,32 +102,24 @@ class SearchViewModelTest {

        val result = viewModel.searchResultUiState.value
        assertIs<SearchResultUiState.Success>(result)
-
-        collectJob.cancel()
    }

    @Test
    fun recentSearches_verifyUiStateIsSuccess() = runTest {
-        val collectJob =
-            launch(UnconfinedTestDispatcher()) { viewModel.recentSearchQueriesUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.recentSearchQueriesUiState.collect() }
        viewModel.onSearchTriggered("kotlin")

        val result = viewModel.recentSearchQueriesUiState.value
        assertIs<Success>(result)
-
-        collectJob.cancel()
    }

    @Test
    fun searchNotReady_withNoFtsTableEntity() = runTest {
-        val collectJob =
-            launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }

        viewModel.onSearchQueryChanged("")

        assertEquals(SearchNotReady, viewModel.searchResultUiState.value)
-
-        collectJob.cancel()
    }

    @Test
--- a/feature/settings/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModelTest.kt
+++ b/feature/settings/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModelTest.kt
@ -52,8 +52,7 @@ class SettingsViewModelTest {

    @Test
    fun stateIsSuccessAfterUserDataLoaded() = runTest {
-        val collectJob =
-            launch(UnconfinedTestDispatcher()) { viewModel.settingsUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.settingsUiState.collect() }

        userDataRepository.setThemeBrand(ANDROID)
        userDataRepository.setDarkThemeConfig(DARK)
@ -68,7 +67,5 @@ class SettingsViewModelTest {
            ),
            viewModel.settingsUiState.value,
        )
-
-        collectJob.cancel()
    }
 }
--- a/feature/topic/build.gradle.kts
+++ b/feature/topic/build.gradle.kts
@ -28,6 +28,7 @@ dependencies {
    implementation(projects.core.data)

    testImplementation(projects.core.testing)
+    testImplementation(libs.robolectric)

    androidTestImplementation(libs.bundles.androidx.compose.ui.test)
    androidTestImplementation(projects.core.testing)
--- a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt
+++ b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt
@ -71,7 +71,7 @@ import com.google.samples.apps.nowinandroid.core.ui.userNewsResourceCardItems
 import com.google.samples.apps.nowinandroid.feature.topic.R.string

@Composable
-internal fun TopicRoute(
+internal fun TopicScreen(
    showBackButton: Boolean,
    onBackClick: () -> Unit,
    onTopicClick: (String) -> Unit,
--- a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt
+++ b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt
@ -19,6 +19,7 @@ package com.google.samples.apps.nowinandroid.feature.topic
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.navigation.toRoute
 import com.google.samples.apps.nowinandroid.core.data.repository.NewsResourceQuery
 import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepository
@ -28,7 +29,7 @@ import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import com.google.samples.apps.nowinandroid.core.model.data.UserNewsResource
 import com.google.samples.apps.nowinandroid.core.result.Result
 import com.google.samples.apps.nowinandroid.core.result.asResult
-import com.google.samples.apps.nowinandroid.feature.topic.navigation.TopicArgs
+import com.google.samples.apps.nowinandroid.feature.topic.navigation.TopicRoute
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
@ -47,12 +48,10 @@ class TopicViewModel @Inject constructor(
    userNewsResourceRepository: UserNewsResourceRepository,
 ) : ViewModel() {

-    private val topicArgs: TopicArgs = TopicArgs(savedStateHandle)
-
-    val topicId = topicArgs.topicId
+    val topicId = savedStateHandle.toRoute<TopicRoute>().id

    val topicUiState: StateFlow<TopicUiState> = topicUiState(
-        topicId = topicArgs.topicId,
+        topicId = topicId,
        userDataRepository = userDataRepository,
        topicsRepository = topicsRepository,
    )
@ -63,7 +62,7 @@ class TopicViewModel @Inject constructor(
        )

    val newsUiState: StateFlow<NewsUiState> = newsUiState(
-        topicId = topicArgs.topicId,
+        topicId = topicId,
        userDataRepository = userDataRepository,
        userNewsResourceRepository = userNewsResourceRepository,
    )
@ -75,7 +74,7 @@ class TopicViewModel @Inject constructor(

    fun followTopicToggle(followed: Boolean) {
        viewModelScope.launch {
-            userDataRepository.setTopicIdFollowed(topicArgs.topicId, followed)
+            userDataRepository.setTopicIdFollowed(topicId, followed)
        }
    }

--- a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt
+++ b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt
@ -16,53 +16,28 @@

 package com.google.samples.apps.nowinandroid.feature.topic.navigation

-import androidx.annotation.VisibleForTesting
-import androidx.lifecycle.SavedStateHandle
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptionsBuilder
-import androidx.navigation.NavType
 import androidx.navigation.compose.composable
-import androidx.navigation.navArgument
-import com.google.samples.apps.nowinandroid.feature.topic.TopicRoute
-import java.net.URLDecoder
-import java.net.URLEncoder
-import kotlin.text.Charsets.UTF_8
+import com.google.samples.apps.nowinandroid.feature.topic.TopicScreen
+import kotlinx.serialization.Serializable

-private val URL_CHARACTER_ENCODING = UTF_8.name()
-
-@VisibleForTesting
-internal const val TOPIC_ID_ARG = "topicId"
-const val TOPIC_ROUTE = "topic_route"
-
-internal class TopicArgs(val topicId: String) {
-    constructor(savedStateHandle: SavedStateHandle) :
-        this(URLDecoder.decode(checkNotNull(savedStateHandle[TOPIC_ID_ARG]), URL_CHARACTER_ENCODING))
-}
+@Serializable data class TopicRoute(val id: String)

 fun NavController.navigateToTopic(topicId: String, navOptions: NavOptionsBuilder.() -> Unit = {}) {
-    navigate(createTopicRoute(topicId)) {
+    navigate(route = TopicRoute(topicId)) {
        navOptions()
    }
 }

-fun createTopicRoute(topicId: String): String {
-    val encodedId = URLEncoder.encode(topicId, URL_CHARACTER_ENCODING)
-    return "$TOPIC_ROUTE/$encodedId"
-}
-
 fun NavGraphBuilder.topicScreen(
    showBackButton: Boolean,
    onBackClick: () -> Unit,
    onTopicClick: (String) -> Unit,
 ) {
-    composable(
-        route = "topic_route/{$TOPIC_ID_ARG}",
-        arguments = listOf(
-            navArgument(TOPIC_ID_ARG) { type = NavType.StringType },
-        ),
-    ) {
-        TopicRoute(
+    composable<TopicRoute> {
+        TopicScreen(
            showBackButton = showBackButton,
            onBackClick = onBackClick,
            onTopicClick = onTopicClick,
--- a/feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt
+++ b/feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt
@ -17,6 +17,7 @@
 package com.google.samples.apps.nowinandroid.feature.topic

 import androidx.lifecycle.SavedStateHandle
+import androidx.navigation.testing.invoke
 import com.google.samples.apps.nowinandroid.core.data.repository.CompositeUserNewsResourceRepository
 import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
@ -25,7 +26,7 @@ import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepo
 import com.google.samples.apps.nowinandroid.core.testing.repository.TestTopicsRepository
 import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository
 import com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule
-import com.google.samples.apps.nowinandroid.feature.topic.navigation.TOPIC_ID_ARG
+import com.google.samples.apps.nowinandroid.feature.topic.navigation.TopicRoute
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.first
@ -36,13 +37,22 @@ import kotlinx.datetime.Instant
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
 import kotlin.test.assertEquals
 import kotlin.test.assertIs

 /**
 * To learn more about how this test handles Flows created with stateIn, see
 * https://developer.android.com/kotlin/flow/test#statein
+ *
+ * These tests use Robolectric because the subject under test (the ViewModel) uses
+ * `SavedStateHandle.toRoute` which has a dependency on `android.os.Bundle`.
+ *
+ * TODO: Remove Robolectric if/when AndroidX Navigation API is updated to remove Android dependency.
+ *  *  See b/340966212.
 */
+@RunWith(RobolectricTestRunner::class)
 class TopicViewModelTest {

    @get:Rule
@ -60,7 +70,9 @@ class TopicViewModelTest {
    @Before
    fun setup() {
        viewModel = TopicViewModel(
-            savedStateHandle = SavedStateHandle(mapOf(TOPIC_ID_ARG to testInputTopics[0].topic.id)),
+            savedStateHandle = SavedStateHandle(
+                route = TopicRoute(id = testInputTopics[0].topic.id),
+            ),
            userDataRepository = userDataRepository,
            topicsRepository = topicsRepository,
            userNewsResourceRepository = userNewsResourceRepository,
@ -73,7 +85,7 @@ class TopicViewModelTest {

    @Test
    fun uiStateTopic_whenSuccess_matchesTopicFromRepository() = runTest {
-        val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.topicUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.topicUiState.collect() }

        topicsRepository.sendTopics(testInputTopics.map(FollowableTopic::topic))
        userDataRepository.setFollowedTopicIds(setOf(testInputTopics[1].topic.id))
@ -85,8 +97,6 @@ class TopicViewModelTest {
        ).first()

        assertEquals(topicFromRepository, item.followableTopic.topic)
-
-        collectJob.cancel()
    }

    @Test
@ -101,18 +111,16 @@ class TopicViewModelTest {

    @Test
    fun uiStateTopic_whenFollowedIdsSuccessAndTopicLoading_thenShowLoading() = runTest {
-        val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.topicUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.topicUiState.collect() }

        userDataRepository.setFollowedTopicIds(setOf(testInputTopics[1].topic.id))
        assertEquals(TopicUiState.Loading, viewModel.topicUiState.value)
-
-        collectJob.cancel()
    }

    @Test
    fun uiStateTopic_whenFollowedIdsSuccessAndTopicSuccess_thenTopicSuccessAndNewsLoading() =
        runTest {
-            val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.topicUiState.collect() }
+            backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.topicUiState.collect() }

            topicsRepository.sendTopics(testInputTopics.map { it.topic })
            userDataRepository.setFollowedTopicIds(setOf(testInputTopics[1].topic.id))
@ -121,14 +129,12 @@ class TopicViewModelTest {

            assertIs<TopicUiState.Success>(topicUiState)
            assertIs<NewsUiState.Loading>(newsUiState)
-
-            collectJob.cancel()
        }

    @Test
    fun uiStateTopic_whenFollowedIdsSuccessAndTopicSuccessAndNewsIsSuccess_thenAllSuccess() =
        runTest {
-            val collectJob = launch(UnconfinedTestDispatcher()) {
+            backgroundScope.launch(UnconfinedTestDispatcher()) {
                combine(
                    viewModel.topicUiState,
                    viewModel.newsUiState,
@ -143,13 +149,11 @@ class TopicViewModelTest {

            assertIs<TopicUiState.Success>(topicUiState)
            assertIs<NewsUiState.Success>(newsUiState)
-
-            collectJob.cancel()
        }

    @Test
    fun uiStateTopic_whenFollowingTopic_thenShowUpdatedTopic() = runTest {
-        val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.topicUiState.collect() }
+        backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.topicUiState.collect() }

        topicsRepository.sendTopics(testInputTopics.map { it.topic })
        // Set which topic IDs are followed, not including 0.
@ -161,8 +165,6 @@ class TopicViewModelTest {
            TopicUiState.Success(followableTopic = testOutputTopics[0]),
            viewModel.topicUiState.value,
        )
-
-        collectJob.cancel()
    }
 }

--- a/gradle.properties
+++ b/gradle.properties
@ -8,7 +8,23 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Ensure important default jvmargs aren't overwritten. See https://github.com/gradle/gradle/issues/19750
-org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g
+#
+# For more information about how Gradle memory options were chosen:
+# - Metaspace See https://www.jasonpearson.dev/metaspace-in-jvm-builds/
+# - SoftRefLRUPolicyMSPerMB would default to 1000 which with a 4gb heap translates to ~51 minutes.
+#   A value of 1 means ~4 seconds before SoftRefs can be collected, which means its realistic to
+#   collect them as needed during a build that should take seconds to minutes.
+# - CodeCache normally defaults to a very small size. Increasing it from platform defaults of 32-48m
+#   because of how many classes can be loaded into memory and then cached as native compiled code
+#   for a small speed boost.
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -XX:+UseG1GC -XX:SoftRefLRUPolicyMSPerMB=1 -XX:ReservedCodeCacheSize=256m -XX:+HeapDumpOnOutOfMemoryError -Xmx4g -Xms4g
+
+# For more information about how Kotlin Daemon memory options were chosen:
+# - Kotlin JVM args only inherit Xmx, ReservedCodeCache, and MaxMetaspace. Since we are specifying
+#   other args we need to specify all of them here.
+# - We're using the Kotlin Gradle Plugin's default value for ReservedCodeCacheSize, if we do not then
+#   the Gradle JVM arg value for ReservedCodeCacheSize will be used.
+kotlin.daemon.jvmargs=-Dfile.encoding=UTF-8 -XX:+UseG1GC -XX:SoftRefLRUPolicyMSPerMB=1 -XX:ReservedCodeCacheSize=320m -XX:+HeapDumpOnOutOfMemoryError -Xmx4g -Xms4g

 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
@ -22,7 +38,7 @@ org.gradle.configureondemand=false
 org.gradle.caching=true

 # Enable configuration caching between builds.
-org.gradle.configuration-cache=true
+org.gradle.configuration-cache=false
 # This option is set because of https://github.com/google/play-services-plugins/issues/246
 # to generate the Configuration Cache regardless of incompatible tasks.
 # See https://github.com/android/nowinandroid/issues/1022 before using it.
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@ -2,56 +2,53 @@
 accompanist = "0.34.0"
 androidDesugarJdkLibs = "2.0.4"
 # AGP and tools should be updated together
-androidGradlePlugin = "8.4.0"
-androidTools = "31.4.1"
-androidxActivity = "1.8.2"
+androidGradlePlugin = "8.6.1"
+androidTools = "31.6.1"
+androidxActivity = "1.9.2"
 androidxAppCompat = "1.7.0"
 androidxBrowser = "1.8.0"
-androidxComposeAlpha = "1.7.0-beta01"
-androidxComposeBom = "2024.02.02"
-androidxComposeMaterial3Adaptive = "1.0.0-beta01"
-androidxComposeMaterial3AdaptiveNavigationSuite = "1.3.0-beta01"
+androidxComposeBom = "2024.09.00"
 androidxComposeRuntimeTracing = "1.0.0-beta01"
-androidxCore = "1.12.0"
+androidxCore = "1.13.1"
 androidxCoreSplashscreen = "1.0.1"
-androidxDataStore = "1.0.0"
+androidxDataStore = "1.1.1"
 androidxEspresso = "3.5.1"
 androidxHiltNavigationCompose = "1.2.0"
-androidxLifecycle = "2.8.3"
-androidxMacroBenchmark = "1.2.4"
-androidxMetrics = "1.0.0-alpha04"
-androidxNavigation = "2.8.0-alpha06"
+androidxLifecycle = "2.8.6"
+androidxMacroBenchmark = "1.3.0"
+androidxMetrics = "1.0.0-beta01"
+androidxNavigation = "2.8.0"
 androidxProfileinstaller = "1.3.1"
 androidxTestCore = "1.5.0"
-androidxTestExt = "1.1.5"
-androidxTestRules = "1.5.0"
-androidxTestRunner = "1.5.2"
+androidxTestExt = "1.2.1"
+androidxTestRules = "1.6.1"
+androidxTestRunner = "1.6.2"
 androidxTracing = "1.3.0-alpha02"
 androidxUiAutomator = "2.3.0"
-androidxWindowManager = "1.3.0-alpha03"
+androidxWindowManager = "1.3.0"
 androidxWork = "2.9.0"
-coil = "2.6.0"
+coil = "2.7.0"
 dependencyGuard = "0.5.0"
-firebaseBom = "33.1.1"
+firebaseBom = "33.3.0"
 firebaseCrashlyticsPlugin = "2.9.9"
 firebasePerfPlugin = "1.4.2"
 gmsPlugin = "4.4.1"
-googleOss = "17.0.1"
+googleOss = "17.1.0"
 googleOssPlugin = "0.10.6"
-hilt = "2.51.1"
-hiltExt = "1.1.0"
+hilt = "2.52"
+hiltExt = "1.2.0"
 jacoco = "0.8.7"
 junit4 = "4.13.2"
-kotlin = "2.0.0"
-kotlinxCoroutines = "1.8.0"
-kotlinxDatetime = "0.5.0"
+kotlin = "2.0.20"
+kotlinxCoroutines = "1.9.0"
+kotlinxDatetime = "0.6.1"
 kotlinxSerializationJson = "1.6.3"
-ksp = "2.0.0-1.0.21"
-moduleGraph = "2.5.0"
+ksp = "2.0.20-1.0.25"
+moduleGraph = "2.7.1"
 okhttp = "4.12.0"
 protobuf = "4.26.1"
 protobufPlugin = "0.9.4"
-retrofit = "2.9.0"
+retrofit = "2.11.0"
 retrofitKotlinxSerializationJson = "1.0.0"
 robolectric = "4.12.2"
 roborazzi = "1.7.0"
@ -71,18 +68,18 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version
 androidx-benchmark-macro = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "androidxMacroBenchmark" }
 androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidxBrowser" }
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }
-androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "androidxComposeAlpha" }
+androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
 androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" }
 androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" }
 androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
-androidx-compose-material3-navigationSuite = { group = "androidx.compose.material3", name = "material3-adaptive-navigation-suite", version.ref = "androidxComposeMaterial3AdaptiveNavigationSuite" }
-androidx-compose-material3-adaptive = { group = "androidx.compose.material3.adaptive", name = "adaptive", version.ref = "androidxComposeMaterial3Adaptive" }
-androidx-compose-material3-adaptive-layout = { group = "androidx.compose.material3.adaptive", name = "adaptive-layout", version.ref = "androidxComposeMaterial3Adaptive" }
-androidx-compose-material3-adaptive-navigation = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation", version.ref = "androidxComposeMaterial3Adaptive" }
+androidx-compose-material3-navigationSuite = { group = "androidx.compose.material3", name = "material3-adaptive-navigation-suite" }
+androidx-compose-material3-adaptive = { group = "androidx.compose.material3.adaptive", name = "adaptive" }
+androidx-compose-material3-adaptive-layout = { group = "androidx.compose.material3.adaptive", name = "adaptive-layout" }
+androidx-compose-material3-adaptive-navigation = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation" }
 androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" }
 androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
 androidx-compose-runtime-tracing = { group = "androidx.compose.runtime", name = "runtime-tracing", version.ref = "androidxComposeRuntimeTracing" }
-androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "androidxComposeAlpha" }
+androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-compose-ui-testManifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
@ -128,6 +125,7 @@ hilt-ext-compiler = { group = "androidx.hilt", name = "hilt-compiler", version.r
 hilt-ext-work = { group = "androidx.hilt", name = "hilt-work", version.ref = "hiltExt" }
 javax-inject = { module = "javax.inject:javax.inject", version = "1" }
 kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
+kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
 kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
 kotlinx-coroutines-guava = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-guava", version.ref = "kotlinxCoroutines" }
@ -141,7 +139,7 @@ okhttp-logging = { group = "com.squareup.okhttp3", name = "logging-interceptor",
 protobuf-kotlin-lite = { group = "com.google.protobuf", name = "protobuf-kotlin-lite", version.ref = "protobuf" }
 protobuf-protoc = { group = "com.google.protobuf", name = "protoc", version.ref = "protobuf" }
 retrofit-core = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
-retrofit-kotlin-serialization = { group = "com.jakewharton.retrofit", name = "retrofit2-kotlinx-serialization-converter", version.ref = "retrofitKotlinxSerializationJson" }
+retrofit-kotlin-serialization = { group = "com.squareup.retrofit2", name = "converter-kotlinx-serialization", version.ref = "retrofit" }
 robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }
 roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", version.ref = "roborazzi" }
 room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
@ -181,17 +179,17 @@ room = { id = "androidx.room", version.ref = "room" }
 secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" }

 # Plugins defined by this project
-nowinandroid-android-application = { id = "nowinandroid.android.application", version = "unspecified" }
-nowinandroid-android-application-compose = { id = "nowinandroid.android.application.compose", version = "unspecified" }
-nowinandroid-android-application-firebase = { id = "nowinandroid.android.application.firebase", version = "unspecified" }
-nowinandroid-android-application-flavors = { id = "nowinandroid.android.application.flavors", version = "unspecified" }
-nowinandroid-android-application-jacoco = { id = "nowinandroid.android.application.jacoco", version = "unspecified" }
-nowinandroid-android-feature = { id = "nowinandroid.android.feature", version = "unspecified" }
-nowinandroid-android-library = { id = "nowinandroid.android.library", version = "unspecified" }
-nowinandroid-android-library-compose = { id = "nowinandroid.android.library.compose", version = "unspecified" }
-nowinandroid-android-library-jacoco = { id = "nowinandroid.android.library.jacoco", version = "unspecified" }
-nowinandroid-android-lint = { id = "nowinandroid.android.lint", version = "unspecified" }
-nowinandroid-android-room = { id = "nowinandroid.android.room", version = "unspecified" }
-nowinandroid-android-test = { id = "nowinandroid.android.test", version = "unspecified" }
-nowinandroid-hilt = { id = "nowinandroid.hilt", version = "unspecified" }
-nowinandroid-jvm-library = { id = "nowinandroid.jvm.library", version = "unspecified" }
+nowinandroid-android-application = { id = "nowinandroid.android.application" }
+nowinandroid-android-application-compose = { id = "nowinandroid.android.application.compose" }
+nowinandroid-android-application-firebase = { id = "nowinandroid.android.application.firebase" }
+nowinandroid-android-application-flavors = { id = "nowinandroid.android.application.flavors" }
+nowinandroid-android-application-jacoco = { id = "nowinandroid.android.application.jacoco" }
+nowinandroid-android-feature = { id = "nowinandroid.android.feature" }
+nowinandroid-android-library = { id = "nowinandroid.android.library" }
+nowinandroid-android-library-compose = { id = "nowinandroid.android.library.compose" }
+nowinandroid-android-library-jacoco = { id = "nowinandroid.android.library.jacoco" }
+nowinandroid-android-lint = { id = "nowinandroid.android.lint" }
+nowinandroid-android-room = { id = "nowinandroid.android.room" }
+nowinandroid-android-test = { id = "nowinandroid.android.test" }
+nowinandroid-hilt = { id = "nowinandroid.hilt" }
+nowinandroid-jvm-library = { id = "nowinandroid.jvm.library" }
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
--- a/7
+++ b/7
@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#

 ##############################################################################
 #
@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
--- a/gradlew.bat
+++ b/gradlew.bat
@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################