iris
b6b33dc9c5
The four Kotlin files that were the link rather than this product now come from the submodule: the pinned TrustManager, the enrollment store and its Keystore sealing, the QR capture activity, and the local-network permission check. `:link` is a subproject resolved by path, so the app half is version-locked to the same commit the Rust half already was. What stays here is the two facts that are actually about this app, and both are load-bearing in a way that would fail quietly if got wrong: the `aiapp` URI scheme, and the Keystore alias `aiapp-token-key` that every enrolled phone's token is already sealed under. A wrong alias would leave those phones reading as not enrolled with nothing on screen to explain it, so the value is carried over exactly and the reason is written beside it. Call sites are unchanged. `ServerSettings` stays available unqualified as a typealias and `applyPinnedTls()` stays an extension, so the diff is the three files that bind the product-specific values plus two imports -- rather than every screen that happens to use a setting. Also clears a warning the build had been printing: `setup?.id.orEmpty()` where the compiler already knows `setup` is non-null, because `chosen` came from that setup's own provider list. Verified by running the build, not only by reading it: ktfmt, Kotlin compile and Android Lint are all clean with no warnings, and the APK still builds -- which exercises the pinned-CA generator, since that is the step that reads the CA off this machine. Still unpushed, per the hold until the rebuild bug is proven fixed. Note the submodule: a checkout of this commit needs `git submodule update --init` before `app/` or `server/` will build.
49 lines
2.8 KiB
TOML
49 lines
2.8 KiB
TOML
# Latest stable versions as of 2026-08-28 (checked against Google Maven /
|
|
# Maven Central; prereleases deliberately skipped). zxing-embedded checked
|
|
# 2026-08-25.
|
|
[versions]
|
|
agp = "9.3.2"
|
|
kotlin = "2.4.10"
|
|
compose-multiplatform = "1.12.0"
|
|
# material3 ships on its own release train, separate from the CMP version.
|
|
compose-material3 = "1.9.0"
|
|
androidx-activityCompose = "1.13.0"
|
|
# Declared rather than inherited because this
|
|
# code now calls its extensions directly (SharedPreferences.edit, String
|
|
# .toUri), and a transitive it merely inherited could change under it.
|
|
androidx-core-ktx = "1.19.0"
|
|
zxing-embedded = "4.3.0"
|
|
# The Kotlin formatter, run at its defaults (see CODE_RULES rule 27). ktfmt
|
|
# itself is Kotlin-org owned and has almost nothing to configure, which is
|
|
# the point; this is the Gradle wrapper for it. Checked 2026-08-28.
|
|
ktfmt-gradle = "0.27.0"
|
|
# Backports java.time (and more) to API 24, which UsageScreen needs: its
|
|
# reset countdown is OffsetDateTime/Duration, both API 26. Checked
|
|
# 2026-08-28 against Google Maven.
|
|
desugar-jdk-libs = "2.1.5"
|
|
|
|
[libraries]
|
|
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
|
|
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core-ktx" }
|
|
# In-app QR scanner: a ready-made scanning Activity (camera preview, runtime
|
|
# permission prompt, flashlight toggle) reached through the AndroidX Activity
|
|
# Result API (ScanContract, added in 4.3.0). Fully offline -- no Play
|
|
# Services / ML Kit model download involved.
|
|
zxing-embedded = { module = "com.journeyapps:zxing-android-embedded", version.ref = "zxing-embedded" }
|
|
desugar-jdk-libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar-jdk-libs" }
|
|
# Declared directly rather than through the plugin's `compose.*` accessors,
|
|
# which are deprecated as of CMP 1.11.
|
|
compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose-multiplatform" }
|
|
compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "compose-multiplatform" }
|
|
compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "compose-material3" }
|
|
compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "compose-multiplatform" }
|
|
|
|
[plugins]
|
|
androidApplication = { id = "com.android.application", version.ref = "agp" }
|
|
# For the :link subproject (wg-app-link/app), which resolves its plugins
|
|
# from the build including it rather than from its own catalog.
|
|
androidLibrary = { id = "com.android.library", version.ref = "agp" }
|
|
composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
|
|
composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
|
|
ktfmt = { id = "com.ncorti.ktfmt.gradle", version.ref = "ktfmt-gradle" }
|