From fa48365aaacde9fab6fde7e78f1e91167c375e37 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 26 Jul 2023 12:03:08 +0200
Subject: [PATCH] Fix fdroid changelog generation

May still be broken for split ABI, but at least works again for
universal apk now

Change-Id: Ib04b56effc23cb05645040f8981d6b0e23188495
---
 increment_version.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/increment_version.sh b/increment_version.sh
index b72f159d0b..4f6176a129 100755
--- a/increment_version.sh
+++ b/increment_version.sh
@@ -113,9 +113,11 @@ fi
 
 new_tag="sc_v$version"
 
+  # Append 0 for universal apk
+universalVersionCode="${versionCode}0"
+
 if ((preview)); then
-    # Append 0 for universal apk
-    echo "versionCode ${versionCode}0"
+    echo "versionCode ${universalVersionCode}"
     echo "versionName $version"
     exit 0
 fi
@@ -151,12 +153,13 @@ git_changelog() {
         | grep -v "weblate/sc" \
         | grep -v "\\[.*merge.*\\]" \
         | grep -v "Disable Android Auto supports" \
+        | grep -v "Switch to alternative Schil" \
         | grep -v "\\[gplay-release\\]" \
         || echo "No significant changes since the last stable release"
 }
 
 changelog_dir=fastlane/metadata/android/en-US/changelogs
-changelog_file="$changelog_dir/$versionCode.txt"
+changelog_file="$changelog_dir/$universalVersionCode.txt"
 mkdir -p "$changelog_dir"
 if [ "$release_type" = "test" ]; then
     git_changelog > "$changelog_file"
@@ -189,7 +192,7 @@ done
 
 git add -A
 if [ "$release_type" = "test" ]; then
-    git commit -m "Test version $versionCode"
+    git commit -m "Test version $universalVersionCode"
 else
     git commit -m "Increment version"
     git tag "$new_tag"