From c9a4e6815743bdbb0fdfa8f19909e68b07977b06 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Tue, 11 Aug 2026 15:38:15 +0200
Subject: [PATCH] Serialize reproducible release modules

---
 tools/reproducible-builds/build-release.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/reproducible-builds/build-release.sh b/tools/reproducible-builds/build-release.sh
index e474dc32..bd3af191 100755
--- a/tools/reproducible-builds/build-release.sh
+++ b/tools/reproducible-builds/build-release.sh
@@ -52,9 +52,7 @@ gradle_args=(
 )
 
 cd "$PROJECT_ROOT"
-./gradlew "${gradle_args[@]}" \
-  :app:clean :wear:clean \
-  :app:bundleRelease :wear:bundleRelease
+./gradlew "${gradle_args[@]}" :app:clean :app:bundleRelease
 
 aab_source="$PROJECT_ROOT/app/build/outputs/bundle/release/app-release.aab"
 if [ ! -f "$aab_source" ]; then
@@ -63,6 +61,8 @@ if [ ! -f "$aab_source" ]; then
 fi
 cp "$aab_source" "$OUTPUT_DIR/bitchat-android-release-unsigned.aab"
 
+./gradlew "${gradle_args[@]}" :wear:clean :wear:bundleRelease
+
 wear_aab_source="$PROJECT_ROOT/wear/build/outputs/bundle/release/wear-release.aab"
 if [ ! -f "$wear_aab_source" ]; then
   echo "error: expected Wear release AAB not found" >&2
@@ -71,9 +71,7 @@ fi
 cp "$wear_aab_source" "$OUTPUT_DIR/bitchat-android-wear-release-unsigned.aab"
 
 # AGP cannot build split APKs and an app bundle from the same intermediates.
-./gradlew "${gradle_args[@]}" \
-  :app:clean :wear:clean \
-  :app:assembleRelease :wear:assembleRelease
+./gradlew "${gradle_args[@]}" :app:clean :app:assembleRelease
 
 declare -A apk_names=(
   ["app-arm64-v8a-release-unsigned.apk"]="bitchat-android-arm64-unsigned.apk"
@@ -92,6 +90,8 @@ for source_name in "${!apk_names[@]}"; do
   cp "$source_path" "$OUTPUT_DIR/${apk_names[$source_name]}"
 done
 
+./gradlew "${gradle_args[@]}" :wear:clean :wear:assembleRelease
+
 wear_apk_source="$PROJECT_ROOT/wear/build/outputs/apk/release/wear-release-unsigned.apk"
 if [ ! -f "$wear_apk_source" ]; then
   echo "error: expected Wear release APK not found" >&2