[Marcogn]

What and why

Supersedes #44, #46 and #52. The three PRs block each other, so none of them can merge alone:

• AGP 9.4.1 (Deps: Bump the build-toolchain group across 1 directory with 9 updates #44) needs Gradle 9.6.0 or newer.
• Gradle 9.8.0 (Deps: Bump the other group across 1 directory with 5 updates #46) removed an internal API that AGP 8.13 uses.
• From 2.59, Hilt's Gradle plugin needs AGP 9.
• core 1.19, navigation 2.10 and hilt-navigation-compose 1.4 (Deps: Bump the androidx group across 1 directory with 8 updates #52) need AGP 9.1 or newer and compileSdk 37.

Versions:

• Gradle 9.8.0. The wrapper was regenerated: the jar is byte-identical to Dependabot's, and distributionSha256Sum was added.
• AGP 9.4.1, Kotlin 2.4.21, KSP 2.3.12, Compose BOM 2026.09.00.
• Hilt 2.60.1, Room 2.8.5, core-ktx 1.19.1, navigation 2.10.2, hilt-navigation-compose 1.4.0, appcompat 1.8.0, lifecycle 2.11.0 (already resolved transitively), coroutines/serialization 1.11.0, Robolectric 4.17.

Build changes:

• Built-in Kotlin (AGP 9). Removed org.jetbrains.kotlin.android. kotlinOptions is now a top-level kotlin { compilerOptions } block. No opt-out properties.
• SDK levels. compileSdk 37. targetSdk stays 36 and minSdk stays 24.
• Room schema assets. They use assets.directories.add(...) because srcDirs is deprecated.

Test fix: AnalysisViewModelTest failed intermittently under Room 2.8 with "connection is closed". Its ViewModels were never cleared, so their Room flows ran another query after @After had closed the DB. The new TrackedViewModels test helper puts them in a ViewModelStore, and the store is cleared before the DB is closed. The same change is applied to SurpriseMeViewModelTest.

Reasoning and sources: docs/implementation-decisions.md, "Dependabot #44, #46 and #52 combined".

How it was checked

• lintDebug, testDebugUnitTest, assembleDebug green locally: 377 tests, 0 failures, lint 0 errors and 21 warnings. The two ViewModel test classes were also run 3 times in a row, all green. No new tests: TrackedViewModels is a test helper.
• Reviewed against REVIEW.md / CLAUDE.md rules: /code-review and architecture-reviewer, twice. The fixes are in the second commit.
• CHANGELOG.md [Unreleased] updated (no user-visible change intended)
• CLAUDE.md / docs/ updated: compileSdk 37, the Robolectric gotcha, a new ViewModel teardown gotcha, and the preflight in docs/plan/README.md.

Device checks

• Install over the current version (2.1.1): teams and roster are still there (Room 2.6 → 2.8).
• Navigation between the screens and the system back gesture (navigation 2.10).
• In-app language switch (appcompat 1.8).
• Theme, dropdowns and the slot editor look as before (Compose BOM 2026.09 / Material 3).
• Release build: the update check and the Info screen.

Open points

• Deprecation warnings left for a follow-up: androidx.hilt.navigation.compose.hiltViewModel (moved to androidx.hilt.lifecycle.viewmodel.compose) and MenuAnchorType (now ExposedDropdownMenuAnchorType).
• After merging, close Deps: Bump the build-toolchain group across 1 directory with 9 updates #44, Deps: Bump the other group across 1 directory with 5 updates #46 and Deps: Bump the androidx group across 1 directory with 8 updates #52 as superseded.
• Branch name: kept the one assigned to this session (ccr-…), not <type>/<what>.

---

Generated by Claude Code