Merge branch 'android-remote-main' into optimize-ftsdatabase

Change-Id: Id1176c8dd741ed888e927a9238fbac7c9dc49543
9 months ago · db5e3bc62b
parent a022eb66a2 900b8b1a38
commit db5e3bc62b
182 changed files with 681 additions and 446 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,25 +0,0 @@
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gradle"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    registries: "*"
-    labels: [ "version update" ]
-    groups:
-      kotlin-ksp:
-        patterns:
-          - "org.jetbrains.kotlin:*"
-          - "org.jetbrains.kotlin.jvm"
-          - "com.google.devtools.ksp"
-    open-pull-requests-limit: 10
-registries:
-  maven-google:
-    type: "maven-repository"
-    url: "https://maven.google.com"
-    replaces-base: true
--- a/.github/renovate.json
+++ b/.github/renovate.json
@ -0,0 +1,12 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>android/.github:renovate-config"
+  ],
+  "baseBranches": [
+    "main"
+  ],
+  "gitIgnoredAuthors": [
+    "41898282+github-actions[bot]@users.noreply.github.com"
+  ]
+}
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@ -18,6 +18,7 @@ jobs:
    permissions:
      contents: write
      pull-requests: write
+      security-events: write

    timeout-minutes: 60

@ -25,13 +26,6 @@ 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

@ -44,12 +38,6 @@ jobs:
      - 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

@ -93,7 +81,9 @@ jobs:
        continue-on-error: false
        if: steps.screenshotsverify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository
        run: |
-          echo "::error::Screenshot tests failed, please create a PR in your fork first." && exit 1
+          echo "::error::Screenshot tests failed, please create a PR in your fork first." 
+          echo "Your fork's CI will take screenshots for your fork."
+          exit 1

      # Runs if previous job failed
      - name: Generate new screenshots if verification failed and it's a PR
@ -114,19 +104,8 @@ jobs:
      - name: Run local tests
        run: ./gradlew testDemoDebug :lint:test

-      - 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 -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
+        run: ./gradlew :app:assemble

      - name: Upload build outputs (APKs)
        uses: actions/upload-artifact@v4
@ -135,14 +114,14 @@ jobs:
          path: '**/build/outputs/apk/**/*.apk'

      - name: Upload JVM local results (XML)
-        if: always()
+        if: ${{ !cancelled() }}
        uses: actions/upload-artifact@v4
        with:
          name: local-test-results
          path: '**/build/test-results/test*UnitTest/**.xml'

      - name: Upload screenshot results (PNG)
-        if: always()
+        if: ${{ !cancelled() }}
        uses: actions/upload-artifact@v4
        with:
          name: screenshot-test-results
@ -152,12 +131,18 @@ jobs:
        run: ./gradlew :app:lintProdRelease :app-nia-catalog:lintRelease :lint:lint

      - name: Upload lint reports (HTML)
-        if: always()
+        if: ${{ !cancelled() }}
        uses: actions/upload-artifact@v4
        with:
          name: lint-reports
          path: '**/build/reports/lint-results-*.html'

+      - name: Upload lint reports (SARIF)
+        if: ${{ !cancelled() && hashFiles('**/*.sarif') != '' }}
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: './'
+
      - name: Check badging
        run: ./gradlew :app:checkProdReleaseBadging

@ -166,7 +151,7 @@ jobs:
    timeout-minutes: 55
    strategy:
      matrix:
-        api-level: [26, 30]
+        api-level: [26, 34]

    steps:
      - name: Delete unnecessary tools 🔧
@ -201,9 +186,6 @@ jobs:

      - name: Setup Gradle
        uses: gradle/actions/setup-gradle@v4
-        with:
-          validate-wrappers: true
-          gradle-home-cache-cleanup: true

      - name: Build projects and run instrumentation tests
        uses: reactivecircus/android-emulator-runner@v2
@ -226,7 +208,7 @@ jobs:
        run: ./gradlew createDemoDebugCombinedCoverageReport
        
      - name: Upload test reports
-        if: always()
+        if: ${{ !cancelled() }}
        uses: actions/upload-artifact@v4
        with:
          name: test-reports-${{ matrix.api-level }}
--- a/.github/workflows/NightlyBaselineProfiles.yaml
+++ b/.github/workflows/NightlyBaselineProfiles.yaml
@ -52,8 +52,9 @@ jobs:
          -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
+      # This generates both baseline and startup profile and adds them into the generated folder
+      - name: Generate Baseline Profile
+        run: ./gradlew :app:generateReleaseBaselineProfile
          -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=baselineprofile
          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
-             -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
+          --stacktrace
--- a/README.md
+++ b/README.md
@ -115,7 +115,8 @@ To run the tests execute the following gradle tasks:
 (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 
+> [!NOTE]
+> You should not run `./gradlew test` or `./gradlew connectedAndroidTest` as this will execute 
 tests against _all_ build variants which is both unnecessary and will result in failures as only the
 `demoDebug` variant is supported. No other variants have any tests (although this might change in future). 

@ -138,7 +139,9 @@ 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 on failing screenshot tests:** The known correct screenshots stored in this repository are recorded on CI using Linux. Other
+> [!NOTE]
+> **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
@ -12,45 +12,45 @@ androidx.browser:browser:1.8.0
 androidx.collection:collection-jvm:1.4.4
 androidx.collection:collection-ktx:1.4.4
 androidx.collection:collection:1.4.4
-androidx.compose.animation:animation-android:1.7.5
-androidx.compose.animation:animation-core-android:1.7.5
-androidx.compose.animation:animation-core:1.7.5
-androidx.compose.animation:animation:1.7.5
-androidx.compose.foundation:foundation-android:1.7.5
-androidx.compose.foundation:foundation-layout-android:1.7.5
-androidx.compose.foundation:foundation-layout:1.7.5
-androidx.compose.foundation:foundation:1.7.5
+androidx.compose.animation:animation-android:1.7.6
+androidx.compose.animation:animation-core-android:1.7.6
+androidx.compose.animation:animation-core:1.7.6
+androidx.compose.animation:animation:1.7.6
+androidx.compose.foundation:foundation-android:1.7.6
+androidx.compose.foundation:foundation-layout-android:1.7.6
+androidx.compose.foundation:foundation-layout:1.7.6
+androidx.compose.foundation:foundation:1.7.6
 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.1
 androidx.compose.material3:material3-adaptive-navigation-suite:1.3.1
 androidx.compose.material3:material3-android:1.3.1
 androidx.compose.material3:material3:1.3.1
-androidx.compose.material:material-icons-core-android:1.7.5
-androidx.compose.material:material-icons-core:1.7.5
-androidx.compose.material:material-icons-extended-android:1.7.5
-androidx.compose.material:material-icons-extended:1.7.5
-androidx.compose.material:material-ripple-android:1.7.5
-androidx.compose.material:material-ripple:1.7.5
-androidx.compose.runtime:runtime-android:1.7.5
-androidx.compose.runtime:runtime-saveable-android:1.7.5
-androidx.compose.runtime:runtime-saveable:1.7.5
-androidx.compose.runtime:runtime:1.7.5
-androidx.compose.ui:ui-android:1.7.5
-androidx.compose.ui:ui-geometry-android:1.7.5
-androidx.compose.ui:ui-geometry:1.7.5
-androidx.compose.ui:ui-graphics-android:1.7.5
-androidx.compose.ui:ui-graphics:1.7.5
-androidx.compose.ui:ui-text-android:1.7.5
-androidx.compose.ui:ui-text:1.7.5
-androidx.compose.ui:ui-tooling-preview-android:1.7.5
-androidx.compose.ui:ui-tooling-preview:1.7.5
-androidx.compose.ui:ui-unit-android:1.7.5
-androidx.compose.ui:ui-unit:1.7.5
-androidx.compose.ui:ui-util-android:1.7.5
-androidx.compose.ui:ui-util:1.7.5
-androidx.compose.ui:ui:1.7.5
-androidx.compose:compose-bom:2024.11.00
+androidx.compose.material:material-icons-core-android:1.7.6
+androidx.compose.material:material-icons-core:1.7.6
+androidx.compose.material:material-icons-extended-android:1.7.6
+androidx.compose.material:material-icons-extended:1.7.6
+androidx.compose.material:material-ripple-android:1.7.6
+androidx.compose.material:material-ripple:1.7.6
+androidx.compose.runtime:runtime-android:1.7.6
+androidx.compose.runtime:runtime-saveable-android:1.7.6
+androidx.compose.runtime:runtime-saveable:1.7.6
+androidx.compose.runtime:runtime:1.7.6
+androidx.compose.ui:ui-android:1.7.6
+androidx.compose.ui:ui-geometry-android:1.7.6
+androidx.compose.ui:ui-geometry:1.7.6
+androidx.compose.ui:ui-graphics-android:1.7.6
+androidx.compose.ui:ui-graphics:1.7.6
+androidx.compose.ui:ui-text-android:1.7.6
+androidx.compose.ui:ui-text:1.7.6
+androidx.compose.ui:ui-tooling-preview-android:1.7.6
+androidx.compose.ui:ui-tooling-preview:1.7.6
+androidx.compose.ui:ui-unit-android:1.7.6
+androidx.compose.ui:ui-unit:1.7.6
+androidx.compose.ui:ui-util-android:1.7.6
+androidx.compose.ui:ui-util:1.7.6
+androidx.compose.ui:ui:1.7.6
+androidx.compose:compose-bom:2024.12.01
 androidx.concurrent:concurrent-futures:1.1.0
 androidx.core:core-ktx:1.13.1
 androidx.core:core:1.13.1
@ -96,10 +96,10 @@ 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.52
-com.google.dagger:dagger:2.52
-com.google.dagger:hilt-android:2.52
-com.google.dagger:hilt-core:2.52
+com.google.dagger:dagger-lint-aar:2.53.1
+com.google.dagger:dagger:2.53.1
+com.google.dagger:hilt-android:2.53.1
+com.google.dagger:hilt-core:2.53.1
 com.google.guava:listenablefuture:1.0
 com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.9.0
@ -110,10 +110,10 @@ 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.20
+org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
 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.20
+org.jetbrains.kotlin:kotlin-stdlib:2.1.0
 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
@ -121,3 +121,4 @@ 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
+org.jspecify:jspecify:1.0.0
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -36,9 +36,6 @@ android {

        // Custom test runner to set up Hilt dependency graph
        testInstrumentationRunner = "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
    }

    buildTypes {
--- a/app/dependencies/prodReleaseRuntimeClasspath.txt
+++ b/app/dependencies/prodReleaseRuntimeClasspath.txt
@ -13,14 +13,14 @@ androidx.browser:browser:1.8.0
 androidx.collection:collection-jvm:1.4.4
 androidx.collection:collection-ktx:1.4.4
 androidx.collection:collection:1.4.4
-androidx.compose.animation:animation-android:1.7.5
-androidx.compose.animation:animation-core-android:1.7.5
-androidx.compose.animation:animation-core:1.7.5
-androidx.compose.animation:animation:1.7.5
-androidx.compose.foundation:foundation-android:1.7.5
-androidx.compose.foundation:foundation-layout-android:1.7.5
-androidx.compose.foundation:foundation-layout:1.7.5
-androidx.compose.foundation:foundation:1.7.5
+androidx.compose.animation:animation-android:1.7.6
+androidx.compose.animation:animation-core-android:1.7.6
+androidx.compose.animation:animation-core:1.7.6
+androidx.compose.animation:animation:1.7.6
+androidx.compose.foundation:foundation-android:1.7.6
+androidx.compose.foundation:foundation-layout-android:1.7.6
+androidx.compose.foundation:foundation-layout:1.7.6
+androidx.compose.foundation:foundation:1.7.6
 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
@ -33,36 +33,37 @@ androidx.compose.material3:material3-android:1.3.1
 androidx.compose.material3:material3-window-size-class-android:1.3.1
 androidx.compose.material3:material3-window-size-class:1.3.1
 androidx.compose.material3:material3:1.3.1
-androidx.compose.material:material-icons-core-android:1.7.5
-androidx.compose.material:material-icons-core:1.7.5
-androidx.compose.material:material-icons-extended-android:1.7.5
-androidx.compose.material:material-icons-extended:1.7.5
-androidx.compose.material:material-ripple-android:1.7.5
-androidx.compose.material:material-ripple:1.7.5
-androidx.compose.runtime:runtime-android:1.7.5
-androidx.compose.runtime:runtime-saveable-android:1.7.5
-androidx.compose.runtime:runtime-saveable:1.7.5
-androidx.compose.runtime:runtime-tracing:1.7.5
-androidx.compose.runtime:runtime:1.7.5
-androidx.compose.ui:ui-android:1.7.5
-androidx.compose.ui:ui-geometry-android:1.7.5
-androidx.compose.ui:ui-geometry:1.7.5
-androidx.compose.ui:ui-graphics-android:1.7.5
-androidx.compose.ui:ui-graphics:1.7.5
-androidx.compose.ui:ui-text-android:1.7.5
-androidx.compose.ui:ui-text:1.7.5
-androidx.compose.ui:ui-tooling-preview-android:1.7.5
-androidx.compose.ui:ui-tooling-preview:1.7.5
-androidx.compose.ui:ui-unit-android:1.7.5
-androidx.compose.ui:ui-unit:1.7.5
-androidx.compose.ui:ui-util-android:1.7.5
-androidx.compose.ui:ui-util:1.7.5
-androidx.compose.ui:ui:1.7.5
-androidx.compose:compose-bom:2024.11.00
+androidx.compose.material:material-icons-core-android:1.7.6
+androidx.compose.material:material-icons-core:1.7.6
+androidx.compose.material:material-icons-extended-android:1.7.6
+androidx.compose.material:material-icons-extended:1.7.6
+androidx.compose.material:material-ripple-android:1.7.6
+androidx.compose.material:material-ripple:1.7.6
+androidx.compose.runtime:runtime-android:1.7.6
+androidx.compose.runtime:runtime-saveable-android:1.7.6
+androidx.compose.runtime:runtime-saveable:1.7.6
+androidx.compose.runtime:runtime-tracing:1.7.6
+androidx.compose.runtime:runtime:1.7.6
+androidx.compose.ui:ui-android:1.7.6
+androidx.compose.ui:ui-geometry-android:1.7.6
+androidx.compose.ui:ui-geometry:1.7.6
+androidx.compose.ui:ui-graphics-android:1.7.6
+androidx.compose.ui:ui-graphics:1.7.6
+androidx.compose.ui:ui-text-android:1.7.6
+androidx.compose.ui:ui-text:1.7.6
+androidx.compose.ui:ui-tooling-preview-android:1.7.6
+androidx.compose.ui:ui-tooling-preview:1.7.6
+androidx.compose.ui:ui-unit-android:1.7.6
+androidx.compose.ui:ui-unit:1.7.6
+androidx.compose.ui:ui-util-android:1.7.6
+androidx.compose.ui:ui-util:1.7.6
+androidx.compose.ui:ui:1.7.6
+androidx.compose:compose-bom:2024.12.01
+androidx.concurrent:concurrent-futures-ktx:1.1.0
 androidx.concurrent:concurrent-futures:1.1.0
-androidx.core:core-ktx:1.13.1
+androidx.core:core-ktx:1.15.0
 androidx.core:core-splashscreen:1.0.1
-androidx.core:core:1.13.1
+androidx.core:core:1.15.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview-poolingcontainer:1.0.0
 androidx.customview:customview:1.0.0
@ -89,38 +90,38 @@ androidx.hilt:hilt-navigation:1.2.0
 androidx.hilt:hilt-work:1.2.0
 androidx.interpolator:interpolator:1.0.0
 androidx.legacy:legacy-support-core-utils:1.0.0
-androidx.lifecycle:lifecycle-common-java8:2.8.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.lifecycle:lifecycle-common-java8:2.8.7
+androidx.lifecycle:lifecycle-common-jvm:2.8.7
+androidx.lifecycle:lifecycle-common:2.8.7
+androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.7
+androidx.lifecycle:lifecycle-livedata-core:2.8.7
+androidx.lifecycle:lifecycle-livedata:2.8.7
+androidx.lifecycle:lifecycle-process:2.8.7
+androidx.lifecycle:lifecycle-runtime-android:2.8.7
+androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7
+androidx.lifecycle:lifecycle-runtime-compose:2.8.7
+androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7
+androidx.lifecycle:lifecycle-runtime-ktx:2.8.7
+androidx.lifecycle:lifecycle-runtime:2.8.7
+androidx.lifecycle:lifecycle-service:2.8.7
+androidx.lifecycle:lifecycle-viewmodel-android:2.8.7
+androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.7
+androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7
+androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7
+androidx.lifecycle:lifecycle-viewmodel:2.8.7
 androidx.loader:loader:1.0.0
 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
 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.navigation:navigation-common-ktx:2.8.5
+androidx.navigation:navigation-common:2.8.5
+androidx.navigation:navigation-compose:2.8.5
+androidx.navigation:navigation-runtime-ktx:2.8.5
+androidx.navigation:navigation-runtime:2.8.5
 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
-androidx.profileinstaller:profileinstaller:1.3.1
+androidx.profileinstaller:profileinstaller:1.4.1
 androidx.resourceinspection:resourceinspection-annotation:1.0.1
 androidx.room:room-common:2.6.1
 androidx.room:room-ktx:2.6.1
@ -141,11 +142,11 @@ androidx.window.extensions.core:core:1.0.0
 androidx.window:window-core-android:1.3.0
 androidx.window:window-core:1.3.0
 androidx.window:window:1.3.0
-androidx.work:work-runtime-ktx:2.9.0
-androidx.work:work-runtime:2.9.0
+androidx.work:work-runtime-ktx:2.10.0
+androidx.work:work-runtime:2.10.0
 com.caverock:androidsvg-aar:1.4
 com.google.accompanist:accompanist-drawablepainter:0.32.0
-com.google.accompanist:accompanist-permissions:0.36.0
+com.google.accompanist:accompanist-permissions:0.37.0
 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
@ -153,31 +154,31 @@ com.google.android.gms:play-services-ads-identifier:18.0.0
 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.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-measurement-api:22.1.2
+com.google.android.gms:play-services-measurement-base:22.1.2
+com.google.android.gms:play-services-measurement-impl:22.1.2
+com.google.android.gms:play-services-measurement-sdk-api:22.1.2
+com.google.android.gms:play-services-measurement-sdk:22.1.2
+com.google.android.gms:play-services-measurement:22.1.2
 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.52
-com.google.dagger:dagger:2.52
-com.google.dagger:hilt-android:2.52
-com.google.dagger:hilt-core:2.52
+com.google.dagger:dagger-lint-aar:2.53.1
+com.google.dagger:dagger:2.53.1
+com.google.dagger:hilt-android:2.53.1
+com.google.dagger:hilt-core:2.53.1
 com.google.errorprone:error_prone_annotations:2.26.0
 com.google.firebase:firebase-abt:21.1.1
-com.google.firebase:firebase-analytics:22.1.0
+com.google.firebase:firebase-analytics:22.1.2
 com.google.firebase:firebase-annotations:16.2.0
-com.google.firebase:firebase-bom:33.3.0
+com.google.firebase:firebase-bom:33.7.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.1.0
+com.google.firebase:firebase-config:22.0.1
+com.google.firebase:firebase-crashlytics:19.3.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
@ -186,16 +187,15 @@ com.google.firebase:firebase-iid-interop:17.1.0
 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.1
-com.google.firebase:firebase-perf:21.0.1
-com.google.firebase:firebase-sessions:2.0.4
-com.google.firebase:protolite-well-known-types:18.0.0
+com.google.firebase:firebase-messaging:24.1.0
+com.google.firebase:firebase-perf:21.0.3
+com.google.firebase:firebase-sessions:2.0.7
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:31.1-android
 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.28.2
-com.google.protobuf:protobuf-kotlin-lite:4.28.2
+com.google.protobuf:protobuf-javalite:4.29.2
+com.google.protobuf:protobuf-kotlin-lite:4.29.2
 com.squareup.okhttp3:logging-interceptor:4.12.0
 com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.9.0
@ -212,10 +212,10 @@ javax.inject:javax.inject:1
 org.checkerframework:checker-qual:3.12.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-common:2.1.0
 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.20
+org.jetbrains.kotlin:kotlin-stdlib:2.1.0
 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
@ -224,9 +224,10 @@ 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
-org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3
 org.jetbrains:annotations:23.0.0
+org.jspecify:jspecify:1.0.0
--- a/app/prodRelease-badging.txt
+++ b/app/prodRelease-badging.txt
@ -1,6 +1,6 @@
-package: name='com.google.samples.apps.nowinandroid' versionCode='8' versionName='0.1.2' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
+package: name='com.google.samples.apps.nowinandroid' versionCode='8' versionName='0.1.2' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
 sdkVersion:'21'
-targetSdkVersion:'34'
+targetSdkVersion:'35'
 uses-permission: name='android.permission.INTERNET'
 uses-permission: name='android.permission.ACCESS_NETWORK_STATE'
 uses-permission: name='android.permission.POST_NOTIFICATIONS'
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -41,6 +41,7 @@

        <activity
            android:name=".MainActivity"
+            android:configChanges="uiMode"
            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt
@ -22,10 +22,7 @@ import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@ -35,21 +32,22 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.metrics.performance.JankStats
+import androidx.tracing.trace
 import com.google.samples.apps.nowinandroid.MainActivityUiState.Loading
-import com.google.samples.apps.nowinandroid.MainActivityUiState.Success
 import com.google.samples.apps.nowinandroid.core.analytics.AnalyticsHelper
 import com.google.samples.apps.nowinandroid.core.analytics.LocalAnalyticsHelper
 import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository
 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.designsystem.theme.NiaTheme
-import com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig
-import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand
 import com.google.samples.apps.nowinandroid.core.ui.LocalTimeZone
 import com.google.samples.apps.nowinandroid.ui.NiaApp
 import com.google.samples.apps.nowinandroid.ui.rememberNiaAppState
+import com.google.samples.apps.nowinandroid.util.isSystemInDarkTheme
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@ -81,53 +79,60 @@ class MainActivity : ComponentActivity() {
        val splashScreen = installSplashScreen()
        super.onCreate(savedInstanceState)

-        var uiState: MainActivityUiState by mutableStateOf(Loading)
+        // We keep this as a mutable state, so that we can track changes inside the composition.
+        // This allows us to react to dark/light mode changes.
+        var themeSettings by mutableStateOf(
+            ThemeSettings(
+                darkTheme = resources.configuration.isSystemInDarkTheme,
+                androidTheme = Loading.shouldUseAndroidTheme,
+                disableDynamicTheming = Loading.shouldDisableDynamicTheming,
+            ),
+        )

        // Update the uiState
        lifecycleScope.launch {
            lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                viewModel.uiState
-                    .onEach { uiState = it }
-                    .collect()
-            }
-        }
-
-        // Keep the splash screen on-screen until the UI state is loaded. This condition is
-        // evaluated each time the app needs to be redrawn so it should be fast to avoid blocking
-        // the UI.
-        splashScreen.setKeepOnScreenCondition {
-            when (uiState) {
-                Loading -> true
-                is Success -> false
-            }
+                combine(
+                    isSystemInDarkTheme(),
+                    viewModel.uiState,
+                ) { systemDark, uiState ->
+                    ThemeSettings(
+                        darkTheme = uiState.shouldUseDarkTheme(systemDark),
+                        androidTheme = uiState.shouldUseAndroidTheme,
+                        disableDynamicTheming = uiState.shouldDisableDynamicTheming,
+                    )
                }
-
+                    .onEach { themeSettings = it }
+                    .map { it.darkTheme }
+                    .distinctUntilChanged()
+                    .collect { darkTheme ->
+                        trace("niaEdgeToEdge") {
                            // Turn off the decor fitting system windows, which allows us to handle insets,
-        // including IME animations, and go edge-to-edge
-        // This also sets up the initial system bar style based on the platform theme
-        enableEdgeToEdge()
-
-        setContent {
-            val darkTheme = shouldUseDarkTheme(uiState)
-
-            // Update the edge to edge configuration to match the theme
+                            // including IME animations, and go edge-to-edge.
                            // This is the same parameters as the default enableEdgeToEdge call, but we manually
                            // resolve whether or not to show dark theme using uiState, since it can be different
                            // than the configuration's dark theme value based on the user preference.
-            DisposableEffect(darkTheme) {
                            enableEdgeToEdge(
                                statusBarStyle = SystemBarStyle.auto(
-                        android.graphics.Color.TRANSPARENT,
-                        android.graphics.Color.TRANSPARENT,
+                                    lightScrim = android.graphics.Color.TRANSPARENT,
+                                    darkScrim = android.graphics.Color.TRANSPARENT,
                                ) { darkTheme },
                                navigationBarStyle = SystemBarStyle.auto(
-                        lightScrim,
-                        darkScrim,
+                                    lightScrim = lightScrim,
+                                    darkScrim = darkScrim,
                                ) { darkTheme },
                            )
-                onDispose {}
                        }
+                    }
+            }
+        }
+
+        // Keep the splash screen on-screen until the UI state is loaded. This condition is
+        // evaluated each time the app needs to be redrawn so it should be fast to avoid blocking
+        // the UI.
+        splashScreen.setKeepOnScreenCondition { viewModel.uiState.value.shouldKeepSplashScreen() }

+        setContent {
            val appState = rememberNiaAppState(
                networkMonitor = networkMonitor,
                userNewsResourceRepository = userNewsResourceRepository,
@ -141,9 +146,9 @@ class MainActivity : ComponentActivity() {
                LocalTimeZone provides currentTimeZone,
            ) {
                NiaTheme(
-                    darkTheme = darkTheme,
-                    androidTheme = shouldUseAndroidTheme(uiState),
-                    disableDynamicTheming = shouldDisableDynamicTheming(uiState),
+                    darkTheme = themeSettings.darkTheme,
+                    androidTheme = themeSettings.androidTheme,
+                    disableDynamicTheming = themeSettings.disableDynamicTheming,
                ) {
                    NiaApp(appState)
                }
@ -162,47 +167,6 @@ class MainActivity : ComponentActivity() {
    }
 }

-/**
- * Returns `true` if the Android theme should be used, as a function of the [uiState].
- */
-@Composable
-private fun shouldUseAndroidTheme(
-    uiState: MainActivityUiState,
-): Boolean = when (uiState) {
-    Loading -> false
-    is Success -> when (uiState.userData.themeBrand) {
-        ThemeBrand.DEFAULT -> false
-        ThemeBrand.ANDROID -> true
-    }
-}
-
-/**
- * Returns `true` if the dynamic color is disabled, as a function of the [uiState].
- */
-@Composable
-private fun shouldDisableDynamicTheming(
-    uiState: MainActivityUiState,
-): Boolean = when (uiState) {
-    Loading -> false
-    is Success -> !uiState.userData.useDynamicColor
-}
-
-/**
- * Returns `true` if dark theme should be used, as a function of the [uiState] and the
- * current system context.
- */
-@Composable
-private fun shouldUseDarkTheme(
-    uiState: MainActivityUiState,
-): Boolean = when (uiState) {
-    Loading -> isSystemInDarkTheme()
-    is Success -> when (uiState.userData.darkThemeConfig) {
-        DarkThemeConfig.FOLLOW_SYSTEM -> isSystemInDarkTheme()
-        DarkThemeConfig.LIGHT -> false
-        DarkThemeConfig.DARK -> true
-    }
-}
-
 /**
 * The default light scrim, as defined by androidx and the platform:
 * https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:activity/activity/src/main/java/androidx/activity/EdgeToEdge.kt;l=35-38;drc=27e7d52e8604a080133e8b842db10c89b4482598
@ -214,3 +178,13 @@ private val lightScrim = android.graphics.Color.argb(0xe6, 0xFF, 0xFF, 0xFF)
 * https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:activity/activity/src/main/java/androidx/activity/EdgeToEdge.kt;l=40-44;drc=27e7d52e8604a080133e8b842db10c89b4482598
 */
 private val darkScrim = android.graphics.Color.argb(0x80, 0x1b, 0x1b, 0x1b)
+
+/**
+ * Class for the system theme settings.
+ * This wrapping class allows us to combine all the changes and prevent unnecessary recompositions.
+ */
+data class ThemeSettings(
+    val darkTheme: Boolean,
+    val androidTheme: Boolean,
+    val disableDynamicTheming: Boolean,
+)
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivityViewModel.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivityViewModel.kt
@ -21,6 +21,8 @@ import androidx.lifecycle.viewModelScope
 import com.google.samples.apps.nowinandroid.MainActivityUiState.Loading
 import com.google.samples.apps.nowinandroid.MainActivityUiState.Success
 import com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepository
+import com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig
+import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand
 import com.google.samples.apps.nowinandroid.core.model.data.UserData
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharingStarted
@ -44,5 +46,40 @@ class MainActivityViewModel @Inject constructor(

 sealed interface MainActivityUiState {
    data object Loading : MainActivityUiState
-    data class Success(val userData: UserData) : MainActivityUiState
+
+    data class Success(val userData: UserData) : MainActivityUiState {
+        override val shouldDisableDynamicTheming = !userData.useDynamicColor
+
+        override val shouldUseAndroidTheme: Boolean = when (userData.themeBrand) {
+            ThemeBrand.DEFAULT -> false
+            ThemeBrand.ANDROID -> true
+        }
+
+        override fun shouldUseDarkTheme(isSystemDarkTheme: Boolean) =
+            when (userData.darkThemeConfig) {
+                DarkThemeConfig.FOLLOW_SYSTEM -> isSystemDarkTheme
+                DarkThemeConfig.LIGHT -> false
+                DarkThemeConfig.DARK -> true
+            }
+    }
+
+    /**
+     * Returns `true` if the state wasn't loaded yet and it should keep showing the splash screen.
+     */
+    fun shouldKeepSplashScreen() = this is Loading
+
+    /**
+     * Returns `true` if the dynamic color is disabled.
+     */
+    val shouldDisableDynamicTheming: Boolean get() = true
+
+    /**
+     * Returns `true` if the Android theme should be used.
+     */
+    val shouldUseAndroidTheme: Boolean get() = false
+
+    /**
+     * Returns `true` if dark theme should be used.
+     */
+    fun shouldUseDarkTheme(isSystemDarkTheme: Boolean) = isSystemDarkTheme
 }
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaApplication.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaApplication.kt
@ -17,6 +17,9 @@
 package com.google.samples.apps.nowinandroid

 import android.app.Application
+import android.content.pm.ApplicationInfo
+import android.os.StrictMode
+import android.os.StrictMode.ThreadPolicy.Builder
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import com.google.samples.apps.nowinandroid.sync.initializers.Sync
@ -37,10 +40,34 @@ class NiaApplication : Application(), ImageLoaderFactory {

    override fun onCreate() {
        super.onCreate()
+
+        setStrictModePolicy()
+
        // Initialize Sync; the system responsible for keeping data in the app up to date.
        Sync.initialize(context = this)
        profileVerifierLogger()
    }

    override fun newImageLoader(): ImageLoader = imageLoader.get()
+
+    /**
+     * Return true if the application is debuggable.
+     */
+    private fun isDebuggable(): Boolean {
+        return 0 != applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE
+    }
+
+    /**
+     * Set a thread policy that detects all potential problems on the main thread, such as network
+     * and disk access.
+     *
+     * If a problem is found, the offending call will be logged and the application will be killed.
+     */
+    private fun setStrictModePolicy() {
+        if (isDebuggable()) {
+            StrictMode.setThreadPolicy(
+                Builder().detectAll().penaltyLog().penaltyDeath().build(),
+            )
+        }
+    }
 }
--- 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
@ -37,7 +37,6 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.SnackbarResult.ActionPerformed
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.WindowAdaptiveInfo
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.runtime.Composable
@ -76,7 +75,6 @@ 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)
@Composable
 fun NiaApp(
    appState: NiaAppState,
@ -126,7 +124,6 @@ fun NiaApp(
@OptIn(
    ExperimentalMaterial3Api::class,
    ExperimentalComposeUiApi::class,
-    ExperimentalMaterial3AdaptiveApi::class,
 )
 internal fun NiaApp(
    appState: NiaAppState,
--- 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
@ -18,6 +18,8 @@ package com.google.samples.apps.nowinandroid.ui

 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.navigation.NavController
@ -25,7 +27,6 @@ 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
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navOptions
 import androidx.tracing.trace
@ -83,9 +84,21 @@ class NiaAppState(
    userNewsResourceRepository: UserNewsResourceRepository,
    timeZoneMonitor: TimeZoneMonitor,
 ) {
+    private val previousDestination = mutableStateOf<NavDestination?>(null)
+
    val currentDestination: NavDestination?
-        @Composable get() = navController
-            .currentBackStackEntryAsState().value?.destination
+        @Composable get() {
+            // Collect the currentBackStackEntryFlow as a state
+            val currentEntry = navController.currentBackStackEntryFlow
+                .collectAsState(initial = null)
+
+            // Fallback to previousDestination if currentEntry is null
+            return currentEntry.value?.destination.also { destination ->
+                if (destination != null) {
+                    previousDestination.value = destination
+                }
+            } ?: previousDestination.value
+        }

    val currentTopLevelDestination: TopLevelDestination?
        @Composable get() {
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/util/UiExtensions.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/util/UiExtensions.kt
@ -0,0 +1,49 @@
+/*
+ * 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.util
+
+import android.content.res.Configuration
+import androidx.activity.ComponentActivity
+import androidx.core.util.Consumer
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.conflate
+import kotlinx.coroutines.flow.distinctUntilChanged
+
+/**
+ * Convenience wrapper for dark mode checking
+ */
+val Configuration.isSystemInDarkTheme
+    get() = (uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
+
+/**
+ * Registers listener for configuration changes to retrieve whether system is in dark theme or not.
+ * Immediately upon subscribing, it sends the current value and then registers listener for changes.
+ */
+fun ComponentActivity.isSystemInDarkTheme() = callbackFlow {
+    channel.trySend(resources.configuration.isSystemInDarkTheme)
+
+    val listener = Consumer<Configuration> {
+        channel.trySend(it.isSystemInDarkTheme)
+    }
+
+    addOnConfigurationChangedListener(listener)
+
+    awaitClose { removeOnConfigurationChangedListener(listener) }
+}
+    .distinctUntilChanged()
+    .conflate()
--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt
+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt
@ -16,7 +16,6 @@

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

-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.Posture
 import androidx.compose.material3.adaptive.WindowAdaptiveInfo
 import androidx.compose.runtime.CompositionLocalProvider
@ -113,7 +112,6 @@ class NiaAppScreenSizesScreenshotTests {
        TimeZone.setDefault(TimeZone.getTimeZone("UTC"))
    }

-    @OptIn(ExperimentalMaterial3AdaptiveApi::class)
    private fun testNiaAppScreenshotWithSize(width: Dp, height: Dp, screenshotName: String) {
        composeTestRule.setContent {
            CompositionLocalProvider(
--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt
+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt
@ -34,7 +34,6 @@ import androidx.compose.foundation.layout.windowInsetsStartWidth
 import androidx.compose.foundation.layout.windowInsetsTopHeight
 import androidx.compose.material3.SnackbarDuration.Indefinite
 import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.Posture
 import androidx.compose.material3.adaptive.WindowAdaptiveInfo
 import androidx.compose.runtime.Composable
@ -209,7 +208,6 @@ class SnackbarInsetsScreenshotTests {
        }
    }

-    @OptIn(ExperimentalMaterial3AdaptiveApi::class)
    private fun testSnackbarScreenshotWithSize(
        snackbarHostState: SnackbarHostState,
        width: Dp,
--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt
+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt
@ -19,7 +19,6 @@ package com.google.samples.apps.nowinandroid.ui
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.material3.SnackbarDuration.Indefinite
 import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.Posture
 import androidx.compose.material3.adaptive.WindowAdaptiveInfo
 import androidx.compose.runtime.CompositionLocalProvider
@ -182,7 +181,6 @@ class SnackbarScreenshotTests {
        }
    }

-    @OptIn(ExperimentalMaterial3AdaptiveApi::class)
    private fun testSnackbarScreenshotWithSize(
        snackbarHostState: SnackbarHostState,
        width: Dp,
--- a/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png
+++ b/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png
--- a/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png
+++ b/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png
--- a/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png
+++ b/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png
--- a/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationBar.png
+++ b/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationBar.png
--- a/app/src/testDemo/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png
+++ b/app/src/testDemo/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png
--- a/app/src/testDemo/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png
+++ b/app/src/testDemo/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png
--- a/app/src/testDemo/screenshots/insets_snackbar_compact_medium.png
+++ b/app/src/testDemo/screenshots/insets_snackbar_compact_medium.png
--- a/app/src/testDemo/screenshots/insets_snackbar_compact_medium_noSnackbar.png
+++ b/app/src/testDemo/screenshots/insets_snackbar_compact_medium_noSnackbar.png
--- a/app/src/testDemo/screenshots/insets_snackbar_expanded_expanded.png
+++ b/app/src/testDemo/screenshots/insets_snackbar_expanded_expanded.png
--- a/app/src/testDemo/screenshots/insets_snackbar_medium_medium.png
+++ b/app/src/testDemo/screenshots/insets_snackbar_medium_medium.png
--- a/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationBar.png
+++ b/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationBar.png
--- a/app/src/testDemo/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png
+++ b/app/src/testDemo/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png
--- a/app/src/testDemo/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png
+++ b/app/src/testDemo/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png
--- a/app/src/testDemo/screenshots/snackbar_compact_medium.png
+++ b/app/src/testDemo/screenshots/snackbar_compact_medium.png
--- a/app/src/testDemo/screenshots/snackbar_compact_medium_noSnackbar.png
+++ b/app/src/testDemo/screenshots/snackbar_compact_medium_noSnackbar.png
--- a/app/src/testDemo/screenshots/snackbar_expanded_expanded.png
+++ b/app/src/testDemo/screenshots/snackbar_expanded_expanded.png
--- a/app/src/testDemo/screenshots/snackbar_medium_medium.png
+++ b/app/src/testDemo/screenshots/snackbar_medium_medium.png
--- a/build-logic/convention/build.gradle.kts
+++ b/build-logic/convention/build.gradle.kts
@ -15,10 +15,10 @@
 */

 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

 plugins {
    `kotlin-dsl`
+    alias(libs.plugins.android.lint)
 }

 group = "com.google.samples.apps.nowinandroid.buildlogic"
@ -46,6 +46,7 @@ dependencies {
    compileOnly(libs.ksp.gradlePlugin)
    compileOnly(libs.room.gradlePlugin)
    implementation(libs.truth)
+    lintChecks(libs.androidx.lint.gradle)
 }

 tasks {
@ -58,59 +59,59 @@ tasks {
 gradlePlugin {
    plugins {
        register("androidApplicationCompose") {
-            id = "nowinandroid.android.application.compose"
+            id = libs.plugins.nowinandroid.android.application.compose.get().pluginId
            implementationClass = "AndroidApplicationComposeConventionPlugin"
        }
        register("androidApplication") {
-            id = "nowinandroid.android.application"
+            id = libs.plugins.nowinandroid.android.application.asProvider().get().pluginId
            implementationClass = "AndroidApplicationConventionPlugin"
        }
        register("androidApplicationJacoco") {
-            id = "nowinandroid.android.application.jacoco"
+            id = libs.plugins.nowinandroid.android.application.jacoco.get().pluginId
            implementationClass = "AndroidApplicationJacocoConventionPlugin"
        }
        register("androidLibraryCompose") {
-            id = "nowinandroid.android.library.compose"
+            id = libs.plugins.nowinandroid.android.library.compose.get().pluginId
            implementationClass = "AndroidLibraryComposeConventionPlugin"
        }
        register("androidLibrary") {
-            id = "nowinandroid.android.library"
+            id = libs.plugins.nowinandroid.android.library.asProvider().get().pluginId
            implementationClass = "AndroidLibraryConventionPlugin"
        }
        register("androidFeature") {
-            id = "nowinandroid.android.feature"
+            id = libs.plugins.nowinandroid.android.feature.get().pluginId
            implementationClass = "AndroidFeatureConventionPlugin"
        }
        register("androidLibraryJacoco") {
-            id = "nowinandroid.android.library.jacoco"
+            id = libs.plugins.nowinandroid.android.library.jacoco.get().pluginId
            implementationClass = "AndroidLibraryJacocoConventionPlugin"
        }
        register("androidTest") {
-            id = "nowinandroid.android.test"
+            id = libs.plugins.nowinandroid.android.test.get().pluginId
            implementationClass = "AndroidTestConventionPlugin"
        }
        register("hilt") {
-            id = "nowinandroid.hilt"
+            id = libs.plugins.nowinandroid.hilt.get().pluginId
            implementationClass = "HiltConventionPlugin"
        }
        register("androidRoom") {
-            id = "nowinandroid.android.room"
+            id = libs.plugins.nowinandroid.android.room.get().pluginId
            implementationClass = "AndroidRoomConventionPlugin"
        }
        register("androidFirebase") {
-            id = "nowinandroid.android.application.firebase"
+            id = libs.plugins.nowinandroid.android.application.firebase.get().pluginId
            implementationClass = "AndroidApplicationFirebaseConventionPlugin"
        }
        register("androidFlavors") {
-            id = "nowinandroid.android.application.flavors"
+            id = libs.plugins.nowinandroid.android.application.flavors.get().pluginId
            implementationClass = "AndroidApplicationFlavorsConventionPlugin"
        }
        register("androidLint") {
-            id = "nowinandroid.android.lint"
+            id = libs.plugins.nowinandroid.android.lint.get().pluginId
            implementationClass = "AndroidLintConventionPlugin"
        }
        register("jvmLibrary") {
-            id = "nowinandroid.jvm.library"
+            id = libs.plugins.nowinandroid.jvm.library.get().pluginId
            implementationClass = "JvmLibraryConventionPlugin"
        }
    }
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@ -38,7 +38,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {

            extensions.configure<ApplicationExtension> {
                configureKotlinAndroid(this)
-                defaultConfig.targetSdk = 34
+                defaultConfig.targetSdk = 35
                @Suppress("UnstableApiUsage")
                testOptions.animationsDisabled = true
                configureGradleManagedDevices(this)
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
@ -21,6 +21,7 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.exclude

 class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
    override fun apply(target: Project) {
@ -33,9 +34,18 @@ class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {

            dependencies {
                val bom = libs.findLibrary("firebase-bom").get()
-                add("implementation", platform(bom))
+                "implementation"(platform(bom))
                "implementation"(libs.findLibrary("firebase.analytics").get())
-                "implementation"(libs.findLibrary("firebase.performance").get())
+                "implementation"(libs.findLibrary("firebase.performance").get()) {
+                    /*
+                    Exclusion of protobuf / protolite dependencies is necessary as the
+                    datastore-proto brings in protobuf dependencies. These are the source of truth
+                    for Now in Android.
+                    That's why the duplicate classes from below dependencies are excluded.
+                    */
+                    exclude(group = "com.google.protobuf", module = "protobuf-javalite")
+                    exclude(group = "com.google.firebase", module = "protolite-well-known-types")
+                }
                "implementation"(libs.findLibrary("firebase.crashlytics").get())
            }

--- a/build-logic/convention/src/main/kotlin/AndroidApplicationJacocoConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationJacocoConventionPlugin.kt
@ -14,8 +14,8 @@
 *   limitations under the License.
 */

+import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
-import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import com.google.samples.apps.nowinandroid.configureJacoco
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@ -25,7 +25,7 @@ class AndroidApplicationJacocoConventionPlugin : Plugin<Project> {
    override fun apply(target: Project) {
        with(target) {
            pluginManager.apply("jacoco")
-            val androidExtension = extensions.getByType<BaseAppModuleExtension>()
+            val androidExtension = extensions.getByType<ApplicationExtension>()

            androidExtension.buildTypes.configureEach {
                enableAndroidTestCoverage = true
--- a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
@ -36,18 +36,18 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
            }

            dependencies {
-                add("implementation", project(":core:ui"))
-                add("implementation", project(":core:designsystem"))
+                "implementation"(project(":core:ui"))
+                "implementation"(project(":core:designsystem"))

-                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())
+                "implementation"(libs.findLibrary("androidx.hilt.navigation.compose").get())
+                "implementation"(libs.findLibrary("androidx.lifecycle.runtimeCompose").get())
+                "implementation"(libs.findLibrary("androidx.lifecycle.viewModelCompose").get())
+                "implementation"(libs.findLibrary("androidx.navigation.compose").get())
+                "implementation"(libs.findLibrary("androidx.tracing.ktx").get())
+                "implementation"(libs.findLibrary("kotlinx.serialization.json").get())

-                add("testImplementation", libs.findLibrary("androidx.navigation.testing").get())
-                add("androidTestImplementation", libs.findLibrary("androidx.lifecycle.runtimeTesting").get())
+                "testImplementation"(libs.findLibrary("androidx.navigation.testing").get())
+                "androidTestImplementation"(libs.findLibrary("androidx.lifecycle.runtimeTesting").get())
            }
        }
    }
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@ -26,7 +26,6 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.kotlin

 class AndroidLibraryConventionPlugin : Plugin<Project> {
    override fun apply(target: Project) {
@ -39,7 +38,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {

            extensions.configure<LibraryExtension> {
                configureKotlinAndroid(this)
-                defaultConfig.targetSdk = 34
+                defaultConfig.targetSdk = 35
                defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                testOptions.animationsDisabled = true
                configureFlavors(this)
@ -53,10 +52,10 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
                disableUnnecessaryAndroidTests(target)
            }
            dependencies {
-                add("androidTestImplementation", libs.findLibrary("kotlin.test").get())
-                add("testImplementation", libs.findLibrary("kotlin.test").get())
+                "androidTestImplementation"(libs.findLibrary("kotlin.test").get())
+                "testImplementation"(libs.findLibrary("kotlin.test").get())

-                add("implementation", libs.findLibrary("androidx.tracing.ktx").get())
+                "implementation"(libs.findLibrary("androidx.tracing.ktx").get())
            }
        }
    }
--- a/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt
@ -42,5 +42,7 @@ class AndroidLintConventionPlugin : Plugin<Project> {

 private fun Lint.configure() {
    xmlReport = true
+    sarifReport = true
    checkDependencies = true
+    disable += "GradleDependency"
 }
--- a/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt
@ -41,9 +41,9 @@ class AndroidRoomConventionPlugin : Plugin<Project> {
            }

            dependencies {
-                add("implementation", libs.findLibrary("room.runtime").get())
-                add("implementation", libs.findLibrary("room.ktx").get())
-                add("ksp", libs.findLibrary("room.compiler").get())
+                "implementation"(libs.findLibrary("room.runtime").get())
+                "implementation"(libs.findLibrary("room.ktx").get())
+                "ksp"(libs.findLibrary("room.compiler").get())
            }
        }
    }
--- a/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt
@ -31,7 +31,7 @@ class AndroidTestConventionPlugin : Plugin<Project> {

            extensions.configure<TestExtension> {
                configureKotlinAndroid(this)
-                defaultConfig.targetSdk = 34
+                defaultConfig.targetSdk = 35
                configureGradleManagedDevices(this)
            }
        }
--- a/build-logic/convention/src/main/kotlin/HiltConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/HiltConventionPlugin.kt
@ -25,13 +25,13 @@ class HiltConventionPlugin : Plugin<Project> {
        with(target) {
            pluginManager.apply("com.google.devtools.ksp")
            dependencies {
-                add("ksp", libs.findLibrary("hilt.compiler").get())
+                "ksp"(libs.findLibrary("hilt.compiler").get())
            }

            // Add support for Jvm Module, base on org.jetbrains.kotlin.jvm
            pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
                dependencies {
-                    add("implementation", libs.findLibrary("hilt.core").get())
+                    "implementation"(libs.findLibrary("hilt.core").get())
                }
            }

@ -39,7 +39,7 @@ class HiltConventionPlugin : Plugin<Project> {
            pluginManager.withPlugin("com.android.base") {
                pluginManager.apply("dagger.hilt.android.plugin")
                dependencies {
-                    add("implementation", libs.findLibrary("hilt.android").get())
+                    "implementation"(libs.findLibrary("hilt.android").get())
                }
            }
        }
--- a/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt
@ -19,7 +19,6 @@ import com.google.samples.apps.nowinandroid.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.kotlin

 class JvmLibraryConventionPlugin : Plugin<Project> {
    override fun apply(target: Project) {
@ -30,7 +29,7 @@ class JvmLibraryConventionPlugin : Plugin<Project> {
            }
            configureKotlinJvm()
            dependencies {
-                add("testImplementation", libs.findLibrary("kotlin.test").get())
+                "testImplementation"(libs.findLibrary("kotlin.test").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
@ -37,10 +37,10 @@ internal fun Project.configureAndroidCompose(

        dependencies {
            val bom = libs.findLibrary("androidx-compose-bom").get()
-            add("implementation", platform(bom))
-            add("androidTestImplementation", platform(bom))
-            add("implementation", libs.findLibrary("androidx-compose-ui-tooling-preview").get())
-            add("debugImplementation", libs.findLibrary("androidx-compose-ui-tooling").get())
+            "implementation"(platform(bom))
+            "androidTestImplementation"(platform(bom))
+            "implementation"(libs.findLibrary("androidx-compose-ui-tooling-preview").get())
+            "debugImplementation"(libs.findLibrary("androidx-compose-ui-tooling").get())
        }

        testOptions {
@ -53,8 +53,10 @@ internal fun Project.configureAndroidCompose(

    extensions.configure<ComposeCompilerGradlePluginExtension> {
        fun Provider<String>.onlyIfTrue() = flatMap { provider { it.takeIf(String::toBoolean) } }
-        fun Provider<*>.relativeToRootProject(dir: String) = flatMap {
-            rootProject.layout.buildDirectory.dir(projectDir.toRelativeString(rootDir))
+        fun Provider<*>.relativeToRootProject(dir: String) = map {
+            isolated.rootProject.projectDirectory
+                .dir("build")
+                .dir(projectDir.toRelativeString(rootDir))
        }.map { it.dir(dir) }

        project.providers.gradleProperty("enableComposeCompilerMetrics").onlyIfTrue()
@ -65,7 +67,7 @@ internal fun Project.configureAndroidCompose(
            .relativeToRootProject("compose-reports")
            .let(reportsDestination::set)

-        stabilityConfigurationFile =
-            rootProject.layout.projectDirectory.file("compose_compiler_config.conf")
+        stabilityConfigurationFiles
+            .add(isolated.rootProject.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
@ -39,8 +39,6 @@ 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
@ -123,15 +121,17 @@ fun Project.configureBadgingTasks(
        val generateBadging =
            tasks.register<GenerateBadgingTask>(generateBadgingTaskName) {
                apk = variant.artifacts.get(SingleArtifact.APK_FROM_BUNDLE)
-
-                aapt2Executable = File(
-                    baseExtension.sdkDirectory,
+                aapt2Executable.set(
+                    // TODO: Replace with `sdkComponents.aapt2` when it's available in AGP
+                    //       https://issuetracker.google.com/issues/376815836
+                    componentsExtension.sdkComponents.sdkDirectory.map { directory ->
+                        directory.file(
                            "${SdkConstants.FD_BUILD_TOOLS}/" +
                                "${baseExtension.buildToolsVersion}/" +
                                SdkConstants.FN_AAPT2,
                        )
-
-
+                    }
+                )
                badging = project.layout.buildDirectory.file(
                    "outputs/apk_from_bundle/${variant.name}/${variant.name}-badging.txt",
                )
@ -140,7 +140,7 @@ fun Project.configureBadgingTasks(

        val updateBadgingTaskName = "update${capitalizedVariantName}Badging"
        tasks.register<Copy>(updateBadgingTaskName) {
-            from(generateBadging.get().badging)
+            from(generateBadging.map(GenerateBadgingTask::badging))
            into(project.layout.projectDirectory)
        }

@ -148,7 +148,7 @@ fun Project.configureBadgingTasks(
        tasks.register<CheckBadgingTask>(checkBadgingTaskName) {
            goldenBadging = project.layout.projectDirectory.file("${variant.name}-badging.txt")

-            generatedBadging = generateBadging.get().badging
+            generatedBadging.set(generateBadging.flatMap(GenerateBadgingTask::badging))

            this.updateBadgingTaskName = updateBadgingTaskName

--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt
@ -19,10 +19,12 @@ package com.google.samples.apps.nowinandroid
 import com.android.build.api.artifact.ScopedArtifact
 import com.android.build.api.variant.AndroidComponentsExtension
 import com.android.build.api.variant.ScopedArtifacts
+import com.android.build.api.variant.SourceDirectories
 import org.gradle.api.Project
 import org.gradle.api.file.Directory
 import org.gradle.api.file.RegularFile
 import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.testing.Test
 import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.configure
@ -88,11 +90,14 @@ internal fun Project.configureJacoco(
                    html.required = true
                }

-                // TODO: This is missing files in src/debug/, src/prod, src/demo, src/demoDebug...
+                fun SourceDirectories.Flat?.toFilePaths(): Provider<List<String>> = this
+                    ?.all
+                    ?.map { directories -> directories.map { it.asFile.path } }
+                    ?: provider { emptyList() }
                sourceDirectories.setFrom(
                    files(
-                        "$projectDir/src/main/java",
-                        "$projectDir/src/main/kotlin",
+                        variant.sources.java.toFilePaths(),
+                        variant.sources.kotlin.toFilePaths()
                    ),
                )

--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
@ -26,8 +26,8 @@ import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.provideDelegate
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
-import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension

 /**
 * Configure base Kotlin with Android options
@ -36,7 +36,7 @@ internal fun Project.configureKotlinAndroid(
    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
    commonExtension.apply {
-        compileSdk = 34
+        compileSdk = 35

        defaultConfig {
            minSdk = 21
@ -54,7 +54,7 @@ internal fun Project.configureKotlinAndroid(
    configureKotlin<KotlinAndroidProjectExtension>()

    dependencies {
-        add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get())
+        "coreLibraryDesugaring"(libs.findLibrary("android.desugarJdkLibs").get())
    }
 }

@ -75,7 +75,7 @@ internal fun Project.configureKotlinJvm() {
 /**
 * Configure base Kotlin options
 */
-private inline fun <reified T : KotlinTopLevelExtension> Project.configureKotlin() = configure<T> {
+private inline fun <reified T : KotlinBaseExtension> Project.configureKotlin() = configure<T> {
    // Treat all Kotlin warnings as errors (disabled by default)
    // Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
    val warningsAsErrors: String? by project
@ -90,5 +90,19 @@ private inline fun <reified T : KotlinTopLevelExtension> Project.configureKotlin
            // Enable experimental coroutines APIs, including Flow
            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
        )
+        freeCompilerArgs.add(
+            /**
+             * Remove this args after Phase 3.
+             * https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-consistent-copy-visibility/#deprecation-timeline
+             *
+             * Deprecation timeline
+             * Phase 3. (Supposedly Kotlin 2.2 or Kotlin 2.3).
+             * The default changes.
+             * Unless ExposedCopyVisibility is used, the generated 'copy' method has the same visibility as the primary constructor.
+             * The binary signature changes. The error on the declaration is no longer reported.
+             * '-Xconsistent-data-class-copy-visibility' compiler flag and ConsistentCopyVisibility annotation are now unnecessary.
+             */
+            "-Xconsistent-data-class-copy-visibility"
+        )
    }
 }
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt
@ -16,23 +16,26 @@ enum class FlavorDimension {
@Suppress("EnumEntryName")
 enum class NiaFlavor(val dimension: FlavorDimension, val applicationIdSuffix: String? = null) {
    demo(FlavorDimension.contentType, applicationIdSuffix = ".demo"),
-    prod(FlavorDimension.contentType)
+    prod(FlavorDimension.contentType),
 }

 fun configureFlavors(
    commonExtension: CommonExtension<*, *, *, *, *, *>,
-    flavorConfigurationBlock: ProductFlavor.(flavor: NiaFlavor) -> Unit = {}
+    flavorConfigurationBlock: ProductFlavor.(flavor: NiaFlavor) -> Unit = {},
 ) {
    commonExtension.apply {
-        flavorDimensions += FlavorDimension.contentType.name
+        FlavorDimension.values().forEach { flavorDimension ->
+            flavorDimensions += flavorDimension.name
+        }
+
        productFlavors {
-            NiaFlavor.values().forEach {
-                create(it.name) {
-                    dimension = it.dimension.name
-                    flavorConfigurationBlock(this, it)
+            NiaFlavor.values().forEach { niaFlavor ->
+                register(niaFlavor.name) {
+                    dimension = niaFlavor.dimension.name
+                    flavorConfigurationBlock(this, niaFlavor)
                    if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) {
-                        if (it.applicationIdSuffix != null) {
-                            applicationIdSuffix = it.applicationIdSuffix
+                        if (niaFlavor.applicationIdSuffix != null) {
+                            applicationIdSuffix = niaFlavor.applicationIdSuffix
                        }
                    }
                }
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@ -14,6 +14,13 @@
 * limitations under the License.
 */

+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+    }
+}
+
 dependencyResolutionManagement {
    repositories {
        google {
--- a/core/data/build.gradle.kts
+++ b/core/data/build.gradle.kts
@ -31,7 +31,6 @@ android {
    testOptions {
        unitTests {
            isIncludeAndroidResources = true
-            isReturnDefaultValues = true
        }
    }
 }
--- a/core/datastore/build.gradle.kts
+++ b/core/datastore/build.gradle.kts
@ -25,11 +25,6 @@ android {
        consumerProguardFiles("consumer-proguard-rules.pro")
    }
    namespace = "com.google.samples.apps.nowinandroid.core.datastore"
-    testOptions {
-        unitTests {
-            isReturnDefaultValues = true
-        }
-    }
 }

 dependencies {
--- a/core/designsystem/build.gradle.kts
+++ b/core/designsystem/build.gradle.kts
@ -21,9 +21,6 @@ plugins {
 }

 android {
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
    namespace = "com.google.samples.apps.nowinandroid.core.designsystem"
 }

@ -47,6 +44,4 @@ dependencies {
    testImplementation(libs.hilt.android.testing)
    testImplementation(libs.robolectric)
    testImplementation(projects.core.screenshotTesting)
-
-    androidTestImplementation(libs.bundles.androidx.compose.ui.test)
 }
--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt
+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt
@ -28,10 +28,8 @@ import androidx.compose.material3.NavigationRail
 import androidx.compose.material3.NavigationRailItem
 import androidx.compose.material3.NavigationRailItemDefaults
 import androidx.compose.material3.Text
-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.WindowAdaptiveInfo
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
-import androidx.compose.material3.adaptive.navigationsuite.ExperimentalMaterial3AdaptiveNavigationSuiteApi
 import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults
 import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteItemColors
 import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
@ -184,10 +182,6 @@ fun NiaNavigationRail(
 * @param windowAdaptiveInfo The window adaptive info.
 * @param content The app content inside the scaffold.
 */
-@OptIn(
-    ExperimentalMaterial3AdaptiveNavigationSuiteApi::class,
-    ExperimentalMaterial3AdaptiveApi::class,
-)
@Composable
 fun NiaNavigationSuiteScaffold(
    navigationSuiteItems: NiaNavigationSuiteScope.() -> Unit,
@ -242,7 +236,6 @@ fun NiaNavigationSuiteScaffold(
 /**
 * A wrapper around [NavigationSuiteScope] to declare navigation items.
 */
-@OptIn(ExperimentalMaterial3AdaptiveNavigationSuiteApi::class)
 class NiaNavigationSuiteScope internal constructor(
    private val navigationSuiteScope: NavigationSuiteScope,
    private val navigationSuiteItemColors: NavigationSuiteItemColors,
--- a/core/designsystem/src/test/screenshots/Background/Background_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/Background_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Background/Background_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/Background_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Background/Background_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/Background_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Background/Background_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/Background_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Background/Background_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/Background_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/Button_dark_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/Button_dark_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/Button_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/Button_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Button/Button_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/Button_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/Button_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/Button_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/Button_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/Button_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Button/Button_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/Button_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_fontScale2.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChip_fontScale2.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png
--- a/Show More
+++ b/Show More