Jean-Luc Makiola
e726db9606
Phase 1 of the shared-kit plan: Calendula becomes the second core-time consumer. floret-kit is embedded as a git submodule and wired with includeBuild, so the app depends on de.jeanlucmakiola.floret:core-time and Gradle substitutes the local source module (built from source). - Remove the app's TimeBridge (Instant <-> epoch millis) + its test; the helpers now live in core-time. Repoint the 7 call sites to de.jeanlucmakiola.floret.time. - Calendula's richer time formatting (TimeFormat, 24h CompositionLocal) stays app-local by design. Reproducible-build handling (Calendula publishes via official F-Droid repro): - Pin the submodule to a foojay-free kit commit (the resolver would let a build fetch a JDK -> non-reproducible; the kit never used a toolchain block). - Harden scripts/check_reproducible_release.sh to scan the included build's Gradle scripts for the toolchain-resolver invariant. - Draft fdroiddata recipe: submodules: true (else F-Droid checks out an empty floret-kit/ and the from-source build fails). - CI build checkouts fetch submodules recursively. Clean composite build + unit tests + lintDebug + repro guard all green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
72 lines
3.4 KiB
Bash
Executable File
72 lines
3.4 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Reproducibility guard for the official F-Droid repo (de.jeanlucmakiola.calendula).
|
|
#
|
|
# F-Droid only republishes OUR signed binary if a from-source build reproduces it
|
|
# byte-for-byte and the binary carries no extra signing blocks. If any invariant
|
|
# below regresses, the official repo silently stalls on the last good version
|
|
# (fails safe — but you'd be stuck on an old release without noticing). So fail
|
|
# loudly here, on every PR.
|
|
#
|
|
# Each invariant was learned from a real fdroiddata CI rejection (see
|
|
# docs/fdroid-official/ and the v2.7.3 -> v2.7.5 history):
|
|
# 1. vcsInfo { include = false } — else AGP embeds env-dependent git
|
|
# metadata (META-INF/version-control-info.textproto) -> not reproducible.
|
|
# 2. no foojay toolchain resolver — F-Droid's offline source scanner
|
|
# rejects org.gradle.toolchains.foojay-resolver (it can fetch a JDK over
|
|
# the network at build time).
|
|
# 3. dependenciesInfo { includeInApk = false } — else AGP embeds a "Dependency
|
|
# metadata" block (id 0x504b4453) in the APK Signing Block, which F-Droid's
|
|
# binary scanner rejects as an extra signing block.
|
|
set -euo pipefail
|
|
|
|
APP="app/build.gradle.kts"
|
|
SETTINGS="settings.gradle.kts"
|
|
fail=0
|
|
|
|
# 1. AGP VCS-info must be disabled on the release build. -z reads the whole file
|
|
# as one record so the match can span newlines; [^}] keeps it inside the block.
|
|
if grep -Pzoq 'vcsInfo\s*\{[^}]*include\s*=\s*false' "$APP"; then
|
|
echo "OK: vcsInfo { include = false } — no env-dependent VCS metadata embedded."
|
|
else
|
|
echo "ERROR: '$APP' release build is missing 'vcsInfo { include = false }'." >&2
|
|
echo " AGP would embed version-control-info.textproto, breaking reproducibility." >&2
|
|
fail=1
|
|
fi
|
|
|
|
# 2. The foojay toolchain resolver must not be present in any Gradle script.
|
|
# This includes the floret-kit submodule: it's an included build (composite
|
|
# build via `includeBuild`), so F-Droid evaluates its Gradle scripts too when
|
|
# building from source — the same offline-scanner bar applies to it.
|
|
gradle_files=("$SETTINGS" "$APP")
|
|
[ -f build.gradle.kts ] && gradle_files+=(build.gradle.kts)
|
|
if [ -d floret-kit ]; then
|
|
while IFS= read -r f; do gradle_files+=("$f"); done \
|
|
< <(find floret-kit -name '*.gradle.kts' -not -path '*/build/*')
|
|
fi
|
|
if grep -qi 'foojay' "${gradle_files[@]}"; then
|
|
echo "ERROR: foojay toolchain resolver found in: $(grep -li foojay "${gradle_files[@]}" | tr '\n' ' ')" >&2
|
|
echo " F-Droid's source scanner rejects org.gradle.toolchains.foojay-resolver" >&2
|
|
echo " (it can fetch a JDK over the network). Remove the plugin." >&2
|
|
fail=1
|
|
else
|
|
echo "OK: no foojay toolchain resolver — offline build scanner stays happy."
|
|
fi
|
|
|
|
# 3. AGP dependency-metadata block must not be embedded in the APK.
|
|
if grep -Pzoq 'dependenciesInfo\s*\{[^}]*includeInApk\s*=\s*false' "$APP"; then
|
|
echo "OK: dependenciesInfo { includeInApk = false } — no extra APK signing block."
|
|
else
|
|
echo "ERROR: '$APP' is missing 'dependenciesInfo { includeInApk = false }'." >&2
|
|
echo " AGP would embed a 'Dependency metadata' block (0x504b4453) in the APK" >&2
|
|
echo " Signing Block, which F-Droid's binary scanner rejects." >&2
|
|
fail=1
|
|
fi
|
|
|
|
if [ "$fail" -ne 0 ]; then
|
|
echo >&2
|
|
echo "Reproducible-release invariant(s) violated — official F-Droid publishing would" >&2
|
|
echo "stall. Fix the above before merging. See docs/fdroid-official/." >&2
|
|
exit 1
|
|
fi
|
|
echo "All reproducible-release invariants hold."
|