From af06cbebba1e10bd8fc5dbbfe364cf4d4f996ca8 Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Mon, 2 Sep 2019 12:17:24 +0200
Subject: [PATCH] riot-android: add newer versions

Completely rewrite build recipe, introduce splits, etc.

Closes fdroid/fdroiddata#1601
---
 metadata/im.vector.alpha.yml | 64 +++++++++++++++++++++++++++++++-----
 1 file changed, 56 insertions(+), 8 deletions(-)

diff --git a/metadata/im.vector.alpha.yml b/metadata/im.vector.alpha.yml
index d61a60450f..95fa5015bd 100644
--- a/metadata/im.vector.alpha.yml
+++ b/metadata/im.vector.alpha.yml
@@ -68,7 +68,7 @@ Description: |-
     * NonFreeNet - Currently the integration server is not configurable in this client and linked to the non-free New Vector implementation. Free alternatives exists but supporting them in Riot Android is still being worked on.
 
 RepoType: git
-Repo: https://github.com/Bubu/mini-vector-android.git
+Repo: https://github.com/vector-im/riot-android
 
 Builds:
   - versionName: 0.3.2
@@ -1837,14 +1837,62 @@ Builds:
       - cp $$matrixsdk$$/matrix-sdk/build/outputs/aar/matrix-sdk-release-*.aar libs/matrix-sdk.aar
     ndk: r17c
 
-MaintainerNotes: |-
-    Upstream puts their library aars inside the repo, we need build them our self. We truncate instead of deleting them such that the initial gradle clean is successful.
-    jitsi-meet needs react-native which we get via npm. This pulls in a few prebuilt binaries for now :-/.
-    Then we walk through olmsdk, jitsi-meet, matrixsdk (which needs those other two, at least partly) and finally riot, which needs all three dependencies.
+  - versionName: 0.9.4
+    versionCode: 10090400
+    commit: v0.9.4
+    subdir: vector
+    gradle:
+      - appfdroid
+    output: build/outputs/apk/appfdroid/release/vector-appfdroid-armeabi-v7a-release-unsigned.apk
+    prebuild:
+      - sed -i -e '/com.google.firebase/,+5d' build.gradle
+      - sed -i -e '/com.google.gms.google-services/d' build.gradle
+    scanignore:
+      - build.gradle
 
-    Currently pinned jitsi-lib version needs a few hacks to still build from source: https://github.com/vector-im/riot-android/issues/2507
+  - versionName: 0.9.4
+    versionCode: 20090400
+    commit: v0.9.4
+    subdir: vector
+    gradle:
+      - appfdroid
+    output: build/outputs/apk/appfdroid/release/vector-appfdroid-arm64-v8a-release-unsigned.apk
+    prebuild:
+      - sed -i -e '/com.google.firebase/,+5d' build.gradle
+      - sed -i -e '/com.google.gms.google-services/d' build.gradle
+    scanignore:
+      - build.gradle
+
+  - versionName: 0.9.4
+    versionCode: 30090400
+    commit: v0.9.4
+    subdir: vector
+    gradle:
+      - appfdroid
+    output: build/outputs/apk/appfdroid/release/vector-appfdroid-x86-release-unsigned.apk
+    prebuild:
+      - sed -i -e '/com.google.firebase/,+5d' build.gradle
+      - sed -i -e '/com.google.gms.google-services/d' build.gradle
+    scanignore:
+      - build.gradle
+
+  - versionName: 0.9.4
+    versionCode: 40090400
+    commit: v0.9.4
+    subdir: vector
+    gradle:
+      - appfdroid
+    output: build/outputs/apk/appfdroid/release/vector-appfdroid-x86_64-release-unsigned.apk
+    prebuild:
+      - sed -i -e '/com.google.firebase/,+5d' build.gradle
+      - sed -i -e '/com.google.gms.google-services/d' build.gradle
+    scanignore:
+      - build.gradle
+
+MaintainerNotes: Upstream builds and publishes a libre build of the jitsi sdk. The
+    sdk build and riot use that sdk. The maven repo can be re=created by using ./build_jitsi_libs.sh
 
 AutoUpdateMode: None
 UpdateCheckMode: Tags
-CurrentVersion: 0.8.28a
-CurrentVersionCode: 82801
+CurrentVersion: 0.9.4
+CurrentVersionCode: 40090400