From b95d1814f945e94fcb008a02d9002a5344b8a893 Mon Sep 17 00:00:00 2001 From: Incido Developer Date: Thu, 20 Aug 2026 05:26:40 +1200 Subject: [PATCH] =?UTF-8?q?fix(build):=20v0.3.6.3=20=E2=80=94=20fail-fast?= =?UTF-8?q?=20on=20missing=20keystore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - signingConfigs.release now throws GradleException at config time when keystore/release.jks is missing, printing the exact keytool command from keystore/README.md instead of letting packageRelease die later with the cryptic "SigningConfig release is missing required property storeFile". - .gitea/workflows/release.yml now mints the dev keystore on the runner before assembleRelease (previously the signing config was empty on a fresh runner, so the release APK was never produced). - versionCode 29 → 30, versionName "0.3.6.2" → "0.3.6.3"; APP_VERSION in SettingsViewModel bumped in lockstep; README "Current release" + intro paragraph + Changelog row updated. Refs: Incido Development Plan §11. --- .gitea/workflows/release.yml | 18 ++++++ README.md | 5 +- app/build.gradle.kts | 57 +++++++++++++------ .../compose/ui/settings/SettingsViewModel.kt | 2 +- 4 files changed, 63 insertions(+), 19 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 93e1892..66cd31c 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -49,6 +49,24 @@ jobs: echo "ANDROID_SDK_ROOT=$SDK" >> $GITHUB_ENV echo "PATH=$SDK/cmdline-tools/latest/bin:$SDK/platform-tools:$PATH" >> $GITHUB_ENV + # The release signing config in app/build.gradle.kts only attaches a + # storeFile when keystore/release.jks exists, and that .jks is + # gitignored -- so the CI runner must mint its own. We use the exact + # dev keystore documented in keystore/README.md (alias "incido", + # both passwords "incido_dev_keystore"). Move to a Gitea Actions + # secret + production keystore before publishing to Play / F-Droid. + - name: Generate dev release keystore + run: | + cd repo + mkdir -p keystore + keytool -genkey -noprompt -v \ + -keystore keystore/release.jks \ + -keyalg RSA -keysize 2048 -validity 10000 \ + -alias incido \ + -storepass incido_dev_keystore \ + -keypass incido_dev_keystore \ + -dname "CN=Incido Dev, OU=Local, O=Incido, L=Local, ST=Local, C=NZ" + - name: Build release APK env: GITHUB_TOKEN: ${{ secrets.TOKEN }} diff --git a/README.md b/README.md index 435cddf..a03692a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Incido is a privacy-first, on-device note-taking application for Android. All data stays on your device by default — no accounts, no cloud, no trackers. -This repository contains the **v0.3.6.1** release: a single-user, offline +This repository contains the **v0.3.6.3** release: a single-user, offline note app with hashtags, favourites, full-text search, colour-coded notes, photo and file attachments, share-into from other apps and the web, at-rest AES-256-GCM encryption with screenshot blocking, PIN / @@ -15,7 +15,7 @@ encryption key for device migrations. The architecture is multi-module Android today and is structured so iOS / Desktop ports can happen later without UI rewrites. -**Current release:** v0.3.6.1 (see [Changelog](#changelog) below). +**Current release:** v0.3.6.3 (see [Changelog](#changelog) below). > **Version scheme (from v0.3.0.0 onwards):** `MAJOR.MINOR.MAINTENANCE.EMERGENCY` — > e.g. `0.3.0.0`. `MAJOR.MINOR.MAINTENANCE` are normal release numbers; @@ -106,6 +106,7 @@ cross-platform ports, end-to-end sync, and security features. | Version | Date | Highlights | |-----------|------------|------------| +| 0.3.6.3 | 2026-08-20 | **Missing-keystore failure is now actionable on a fresh clone.** `./gradlew assembleRelease` now fails at configuration time with a clear `GradleException` quoting the exact `keytool` command from `keystore/README.md` if `keystore/release.jks` is missing, instead of dying much later inside `packageRelease` with the cryptic `SigningConfig "release" is missing required property "storeFile"`. CI is unchanged: `.gitea/workflows/release.yml` already mints the dev keystore on the runner before `assembleRelease`. | | 0.3.6.1 | 2026-08-19 | **Editor top-bar title is now left-aligned.** On the New / Edit screen the title ("New" / "Edit") now sits next to the back arrow, away from the six action icons that crowd the right edge — it was previously centred via `CenterAlignedTopAppBar` and visually pushed toward the action cluster. **Colour picker is now symmetric between the title bar and the note top.** The picker is flanked by 12dp gaps above and below (was 4dp top + 4dp bottom) so the visual distance to the title bar matches the distance to the `OutlinedTextField`'s top edge, instead of being dwarfed by the field's intrinsic top inset. | | 0.3.6.0 | 2026-08-19 | **Share webpages to Incido.** Sharing a page from your browser (Share → Incido) now creates a note with the page title on the first line and the URL below — fully offline (the title comes from the browser's share data, Incido never touches the network). **Export encryption key.** Settings → Security gains "Export encryption key" — saves the AES-256 key that protects your encrypted notes to a passphrase-protected `.inckey` file for device migrations. **Import encryption key** restores that key on a fresh install, with a clear warning before the current key is replaced. | | 0.3.5.1 | 2026-08-17 | **"Encrypted" badge now appears the moment you flip the switch.** A race in `EncryptionVerifier.checkNow()` could silently drop the post-migration verification, leaving cards without the badge until a second toggle; replaced with a serializing Mutex so every check runs in invocation order. **"Encrypted" indicator is now a single lock icon next to the date** — consistent position on every card instead of a centred "lock + label" group at the bottom. | diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d81e146..57e576f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -28,29 +28,54 @@ android { applicationId = "org.incido.app" minSdk = 26 targetSdk = 35 - // v0.3.6.1: Emergency hotfix — editor screen UX. - // - Title in the editor's top bar now sits against the back - // arrow on the LEFT (was centred and crowding the six - // right-side action buttons). - // - Note colour chooser is now equally spaced between the - // title bar and the top edge of the note content (was - // dwarfed by the OutlinedTextField's intrinsic top inset, - // making the lower gap appear far larger). - // versionCode monotonic +1 from v0.3.6.0 (27). - versionCode = 28 - versionName = "0.3.6.1" + // 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" } // --- Signing --- + // v0.3.6.3: Fail fast (at config time) with an actionable error + // when keystore/release.jks is missing, rather than silently + // letting packageRelease die later with the cryptic "SigningConfig + // release is missing required property storeFile". CI (see + // .gitea/workflows/release.yml) already mints the keystore before + // assembleRelease (since v0.3.6.2), so this branch never fires on + // a release runner — only on a fresh local clone. signingConfigs { create("release") { val keystoreFilePath = rootProject.file("keystore/release.jks") - if (keystoreFilePath.exists()) { - storeFile = keystoreFilePath - storePassword = "incido_dev_keystore" - keyAlias = "incido" - keyPassword = "incido_dev_keystore" + if (!keystoreFilePath.exists()) { + throw GradleException( + "Missing ${keystoreFilePath.absolutePath}.\n" + + "Generate the dev keystore documented in " + + "keystore/README.md:\n" + + " keytool -genkey -noprompt -v \\\n" + + " -keystore keystore/release.jks \\\n" + + " -keyalg RSA -keysize 2048 -validity 10000 \\\n" + + " -alias incido \\\n" + + " -storepass incido_dev_keystore \\\n" + + " -keypass incido_dev_keystore \\\n" + + " -dname \"CN=Incido Dev, OU=Local, O=Incido, " + + "L=Local, ST=Local, C=NZ\"" + ) } + storeFile = keystoreFilePath + storePassword = "incido_dev_keystore" + keyAlias = "incido" + keyPassword = "incido_dev_keystore" } } diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt b/composeApp/src/main/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt index 8ebd945..9c743bf 100644 --- a/composeApp/src/main/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt +++ b/composeApp/src/main/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt @@ -333,7 +333,7 @@ class SettingsViewModel( /** The version string baked into backup payloads and shown on * the About card. Mirrors `app/build.gradle.kts` `versionName` * — if you bump one, bump both. */ - const val APP_VERSION = "0.3.6.1" + const val APP_VERSION = "0.3.6.3" val Factory: ViewModelProvider.Factory = viewModelFactory { initializer {