From 22c8efef47e6407165b48f4733bd276b6c537fa6 Mon Sep 17 00:00:00 2001 From: Matt Hills Date: Sat, 31 Oct 2026 20:52:07 -0400 Subject: [PATCH] F-Droid recipe: match the fdroiddata submission --- fdroid/README.md | 10 ++++++++-- fdroid/com.mattintech.papercase.yml | 24 +----------------------- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/fdroid/README.md b/fdroid/README.md index 8286066..5cb7469 100644 --- a/fdroid/README.md +++ b/fdroid/README.md @@ -4,15 +4,21 @@ F-Droid builds Papercase from source and signs it with its own key. The store li (title, descriptions, icon, screenshots, changelogs) is read from [`fastlane/metadata/android`](../fastlane/metadata/android) in this repo. +[`com.mattintech.papercase.yml`](com.mattintech.papercase.yml) is the build recipe, kept +exactly as submitted to fdroiddata. It has no comments because F-Droid's formatter +(`fdroid rewritemeta`) removes them and its pipeline fails if the file isn't formatted. +Its `prebuild` step deletes the `playImplementation` line: the play flavor's Google library +is never built, but F-Droid's scanner checks build files too. + ## First submission -1. Tag the release on `main`, for example `v1.1.1` (the release workflow does the rest on GitHub). +1. Tag the release on `main`, for example `v1.2.1` (the release workflow does the rest on GitHub). 2. Fork https://gitlab.com/fdroid/fdroiddata and add [`com.mattintech.papercase.yml`](com.mattintech.papercase.yml) as `metadata/com.mattintech.papercase.yml`. 3. Check it locally if you have `fdroidserver` installed: ```bash - fdroid readmeta && fdroid lint com.mattintech.papercase && fdroid build -v -l com.mattintech.papercase + fdroid readmeta && fdroid lint com.mattintech.papercase && fdroid rewritemeta com.mattintech.papercase && fdroid build -v -l com.mattintech.papercase ``` 4. Open a merge request to fdroiddata using the "App inclusion" template. diff --git a/fdroid/com.mattintech.papercase.yml b/fdroid/com.mattintech.papercase.yml index 0fdb16f..8017ceb 100644 --- a/fdroid/com.mattintech.papercase.yml +++ b/fdroid/com.mattintech.papercase.yml @@ -1,6 +1,5 @@ -# Build recipe for F-Droid. Submit this file to https://gitlab.com/fdroid/fdroiddata -# as metadata/com.mattintech.papercase.yml (see fdroid/README.md). Categories: + - File Encryption & Vault - Security License: GPL-3.0-only AuthorName: Matt Hills @@ -14,35 +13,14 @@ RepoType: git Repo: https://github.com/mattintech/papercase.git Builds: - - versionName: 1.1.1 - versionCode: 3 - commit: v1.1.1 - subdir: app - gradle: - - fdroid - # The play flavor's Google libraries aren't built, but F-Droid's scanner checks build files too - prebuild: sed -i -e '/playImplementation/d' build.gradle.kts - - - versionName: 1.2.0 - versionCode: 4 - commit: v1.2.0 - subdir: app - gradle: - - fdroid - # The play flavor's Google libraries aren't built, but F-Droid's scanner checks build files too - prebuild: sed -i -e '/playImplementation/d' build.gradle.kts - - versionName: 1.2.1 versionCode: 5 commit: v1.2.1 subdir: app gradle: - fdroid - # The play flavor's Google libraries aren't built, but F-Droid's scanner checks build files too prebuild: sed -i -e '/playImplementation/d' build.gradle.kts -# F-Droid reads versionName and versionCode from app/build.gradle.kts at each tag. -# Only plain vMAJOR.MINOR.PATCH tags are picked up; pre-release tags are skipped. AutoUpdateMode: Version UpdateCheckMode: Tags ^v\d+\.\d+\.\d+$ CurrentVersion: 1.2.1