feat(trash): v0.3.7.0 — Trash / soft delete + release docs backfill
dev / Build debug APK (push) Successful in 1m7s
release / Build & attach release APK (push) Failing after 28s

- Deleting a note now soft-deletes it (trashed flag on NoteEntity,
  additive schema, auto-migrated); trashed notes are hidden from Home,
  Favorites, Untagged, tag views, and ordinary search.
- New Trash drawer entry lists soft-deleted notes; each Trash card's
  overflow menu exposes Restore and Delete permanently.
- NoteFilter gains a Trash case; repository gains moveToTrash /
  restoreFromTrash / deletePermanently; backups round-trip the
  trashed state.
- Version bump (lockstep): versionCode 30->31, versionName
  0.3.6.3->0.3.7.0, SettingsViewModel.APP_VERSION, README intro +
  changelog, ReleaseNotes.kt 5-most-recent window.
- Development Plan §10: fix the merged 0.3.4.0/0.3.3.8 table row and
  backfill the missing 0.3.6.2/0.3.6.3 rows; add the 0.3.7.0 row.
- README changelog: backfill the missing 0.3.6.2 row; promote the
  Unreleased Trash row to 0.3.7.0.
This commit is contained in:
Incido Developer committed 2026-08-20 11:52:43 +12:00
1 parent 4bbe29851a
commit a39c52cf89
17 files changed
+386 -165

No files matched your search

+29 -27
View File
@@ -28,22 +28,17 @@ android {
applicationId = "org.incido.app"
minSdk = 26
targetSdk = 35
// v0.3.6.3: Local-dev DX — make the missing-keystore failure
// mode actionable.
// - signingConfigs.release now throws GradleException at
// config time when keystore/release.jks is missing, with
// the exact keytool incantation from keystore/README.md
// in the error message. Previously the signing config
// silently fell through with no storeFile, and packageRelease
// failed much later with the cryptic "SigningConfig release
// is missing required property storeFile" — leaving devs
// guessing at the cause.
// - .gitea/workflows/release.yml already mints the keystore
// on release runners (since v0.3.6.2), so CI is unaffected.
// - No app/Compose code changes.
// - versionCode monotonic +1 from v0.3.6.2 (29).
versionCode = 30
versionName = "0.3.6.3"
// v0.3.7.0: Trash / soft delete — deleting a note now flags it
// trashed (hidden from every active view and ordinary search);
// a Trash drawer entry exposes Restore and permanent Delete.
// - NoteEntity gains `trashed` (additive schema, auto-migrated);
// NoteFilter gains a Trash case; the repository gains
// moveToTrash / restoreFromTrash / deletePermanently; drawer,
// list, and editor ViewModels + screens wire the actions;
// backups round-trip the trashed state.
// - versionCode monotonic +1 from v0.3.6.3 (30).
versionCode = 31
versionName = "0.3.7.0"
}
// --- Signing ---
@@ -94,8 +89,6 @@ android {
}
}
}
tasks.named("assembleRelease") { dependsOn("validateReleaseKeystore") }
buildFeatures {
compose = true
}
@@ -116,6 +109,13 @@ android {
}
}
// Wire the keystore validator after Android has created the release task.
// Looking the task up before configuration completes makes the build fail
// for unrelated compile/debug tasks as well.
afterEvaluate {
tasks.findByName("assembleRelease")?.dependsOn("validateReleaseKeystore")
}
// v0.3.6.0: ship version-stamped APKs at the repo root for every
// release (e.g. `Incido-0.3.6.0-debug.apk`, `Incido-0.3.6.0-release.apk`).
// See Incido Development Plan §11 for the full release build
@@ -127,19 +127,22 @@ android {
// with `Iterable<T>.all(predicate: (T) -> Boolean)` and the modern
// `androidComponents.onVariants` API doesn't expose `outputFileName` as
// a settable property on its outputs), we just register a copy task
// that runs after both `assembleDebug` and `assembleRelease` and drops
// the built APKs at the project root with the right names.
// that runs after the debug and release builds and drops the built APKs
// at the project root with the right names. The release task is attached
// as a finalizer below, so the copy task must not depend on it directly.
//
// `copyReleaseApks` is registered as a `dependsOn` of `assembleRelease`
// so `./gradlew assembleRelease` is enough to get both files at the
// repo root in one command.
// `copyReleaseApks` runs as a finalizer of `assembleRelease`, so
// `./gradlew assembleRelease` is enough to get both files at the repo
// root in one command.
val copyReleaseApks = tasks.register("copyReleaseApks") {
group = "build"
description = "Copies debug + release APKs to the repo root, " +
"stamped with the current versionName " +
"(e.g. Incido-0.3.6.3-debug.apk, Incido-0.3.6.3-release.apk). " +
"See Incido Development Plan §11."
dependsOn("assembleDebug", "assembleRelease")
// assembleRelease invokes this task as a finalizer; depending on
// assembleRelease here would create a task graph cycle.
dependsOn("assembleDebug")
doLast {
val versionName = android.defaultConfig.versionName
val rootDir = rootProject.projectDir
@@ -163,9 +166,8 @@ val copyReleaseApks = tasks.register("copyReleaseApks") {
}
// Make `assembleRelease` finalize with `copyReleaseApks` so a single
// `./gradlew assembleRelease` produces both root-level APKs. Using
// `finalizedBy` (not `dependsOn`) avoids a circular dependency:
// `copyReleaseApks` already `dependsOn` `assembleRelease`.
// `./gradlew assembleRelease` produces both root-level APKs. The copy
// task depends on assembleDebug, avoiding a task graph cycle.
afterEvaluate {
tasks.findByName("assembleRelease")?.finalizedBy(copyReleaseApks)
}