fix(build): back out log-wiring WIP swept into the vc bump
Some checks failed
build-apk / build-and-publish (push) Failing after 3m34s
gitleaks / scan (push) Failing after 1s

The versionCode bump (8d9ad35) was committed with a broad 'git commit -a',
which swept in in-progress dogfood log-shipping edits (build.gradle.kts token
plumbing + StrawApp/SettingsScreen referencing an untracked LogShipper.kt) --
unreviewed, incomplete, and it broke the gradle-kotlin-dsl compile. Restore
those four files to pre-wiring; vc=92 ships only the player-collapse fix + the
strawcore reliability/npe-sync pass. The log-wiring is preserved on
feat/dogfood-logging for the coordinated logs.sulkta.com deploy.
This commit is contained in:
Cobb 2026-07-29 07:13:59 -07:00
parent 8d9ad3513f
commit 71155b32b9
4 changed files with 9 additions and 193 deletions

View file

@ -36,29 +36,6 @@ configure<ApplicationExtension> {
versionCode = STRAW_VERSION_CODE
versionName = STRAW_VERSION_NAME
resValue("string", "app_name", "Straw")
// Dogfood log-shipping token (feature/diag/LogShipper.kt). This repo
// is PUBLIC — the token must NEVER be committed, so it's injected at
// build time and defaults to "":
// 1. env var STRAW_LOGS_INGEST_TOKEN — CI: add a Forgejo Actions
// repo secret STRAW_LOGS_INGEST_TOKEN and pass it in the
// "Assemble debug APK" step's env block in
// .forgejo/workflows/build.yml.
// 2. `straw.logs.ingest.token=…` in local.properties (gitignored)
// for local dogfood builds.
// Empty token ⇒ LogShipper is fully disabled (no-op, zero network,
// no Settings row) — contributor builds neither break nor phone home.
val strawLogsToken: String = System.getenv("STRAW_LOGS_INGEST_TOKEN")
?: java.util.Properties().let { props ->
val f = rootProject.file("local.properties")
if (f.exists()) f.inputStream().use(props::load)
props.getProperty("straw.logs.ingest.token")
}
?: ""
// Escape so a pathological token can't break out of the generated
// String literal in BuildConfig.java.
val escapedToken = strawLogsToken.replace("\\", "\\\\").replace("\"", "\\\"")
buildConfigField("String", "STRAW_LOGS_TOKEN", "\"$escapedToken\"")
}
// Explicit signing so CI / release builds reuse ONE keystore instead of