From 1645477b7f2cdb69aa0969dbf75a801949616396 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Wed, 15 Dec 2021 12:56:57 +0000
Subject: [PATCH] Update Element to 1.3.10

---
 metadata/im.vector.app.yml                    | 38 ++++++++++++++++++-
 .../build_gradle_remove_jitsi_repo.patch      | 19 ++++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 metadata/im.vector.app/build_gradle_remove_jitsi_repo.patch

diff --git a/metadata/im.vector.app.yml b/metadata/im.vector.app.yml
index d15b6ba939..f9c1020740 100644
--- a/metadata/im.vector.app.yml
+++ b/metadata/im.vector.app.yml
@@ -675,11 +675,45 @@ Builds:
       - cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit"
     ndk: r21d
 
+  - versionName: 1.3.10
+    versionCode: 40103100
+    commit: v1.3.10
+    subdir: vector
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y -t stretch-backports npm jq openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+      - sysctl fs.inotify.max_user_watches=524288
+      - sysctl -p
+    patch:
+      - build_gradle_remove_jitsi_repo.patch
+    gradle:
+      - fdroid
+    srclibs:
+      - jitsi-meet@android-sdk-3.10.0
+    prebuild:
+      - sed -i -e '/com.google.gms.google-services/d' build.gradle ../build.gradle
+      - sed -i -e 's/enable true/enable false/g' build.gradle
+      - sed -i -e '/google()/a\        mavenLocal()' ../build.gradle
+      - sed -i -e '/gplayImplementation(.*) {/,/}/d; /gplayImplementation/d' build.gradle
+      - sed -i -e 's;https://gitlab.matrix.org/api/v4/projects/27/packages/maven;https://jitpack.io;'
+        ../build.gradle
+    build:
+      - cd $$jitsi-meet$$
+      - export LIBRE_BUILD=true
+      - npm install webpack-bundle-analyzer
+      - npm install
+      - mkdir -p "$HOME/.m2"
+      - bash android/scripts/release-sdk.sh "$HOME/.m2/repository"
+      - mkdir -p "$HOME/.m2/repository/org/webkit"
+      - cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit"
+    ndk: r21d
+
 MaintainerNotes: Do not update unless requested by the Element team! The Element team
     will ping us whenever they feel a new release is ready. See https://github.com/vector-im/element-android/issues/3728
     as an example of their release process.
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 1.3.9
-CurrentVersionCode: 40103090
+CurrentVersion: 1.3.10
+CurrentVersionCode: 40103100
diff --git a/metadata/im.vector.app/build_gradle_remove_jitsi_repo.patch b/metadata/im.vector.app/build_gradle_remove_jitsi_repo.patch
new file mode 100644
index 0000000000..12da95c875
--- /dev/null
+++ b/metadata/im.vector.app/build_gradle_remove_jitsi_repo.patch
@@ -0,0 +1,19 @@
+--- a/build.gradle
++++ b/build.gradle
+@@ -51,16 +51,6 @@
+                 groups.jitpack.group.each { includeGroup it }
+             }
+         }
+-        // Jitsi repo
+-        maven {
+-            url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-3.10.0"
+-            // Note: to test Jitsi release you can use a local file like this:
+-            // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-3.10.0"
+-            content {
+-                groups.jitsi.regex.each { includeGroupByRegex it }
+-                groups.jitsi.group.each { includeGroup it }
+-            }
+-        }
+         google {
+             content {
+                 groups.google.regex.each { includeGroupByRegex it }
\ No newline at end of file