From 3b10a81dbe5ddd4652d0ef01c0746c8ddfb5837d Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Tue, 11 Jan 2022 21:21:38 +0100
Subject: [PATCH] Update Element to 1.3.13

---
 metadata/im.vector.app.yml                       | 16 +++++-----------
 ..._groups_allowlist_matrix_gitlab_jitpack.patch | 10 ----------
 2 files changed, 5 insertions(+), 21 deletions(-)
 delete mode 100644 metadata/im.vector.app/dependencies_groups_allowlist_matrix_gitlab_jitpack.patch

diff --git a/metadata/im.vector.app.yml b/metadata/im.vector.app.yml
index 17c86d8287..da44ec134d 100644
--- a/metadata/im.vector.app.yml
+++ b/metadata/im.vector.app.yml
@@ -675,11 +675,9 @@ Builds:
       - cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit"
     ndk: r21d
 
-  - versionName: 1.3.12
-    versionCode: 40103120
-    disable: 'Custom maven repo used, reverting back to Jitpack not yet functional:
-        https://github.com/vector-im/element-android/pull/4827'
-    commit: v1.3.12
+  - versionName: 1.3.13
+    versionCode: 40103130
+    commit: v1.3.13
     subdir: vector
     sudo:
       - apt-get update || apt-get update
@@ -689,7 +687,6 @@ Builds:
       - sysctl -p
     patch:
       - build_gradle_remove_jitsi_repo.patch
-      - dependencies_groups_allowlist_matrix_gitlab_jitpack.patch
     gradle:
       - fdroid
     srclibs:
@@ -699,9 +696,6 @@ Builds:
       - 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
-      - sed -i -e 's/org.matrix.android:olm/org.matrix.gitlab.matrix-org:olm/' ../matrix-sdk-android/build.gradle
     build:
       - cd $$jitsi-meet$$
       - export LIBRE_BUILD=true
@@ -719,5 +713,5 @@ MaintainerNotes: Do not update unless requested by the Element team! The Element
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 1.3.12
-CurrentVersionCode: 40103120
+CurrentVersion: 1.3.13
+CurrentVersionCode: 40103130
diff --git a/metadata/im.vector.app/dependencies_groups_allowlist_matrix_gitlab_jitpack.patch b/metadata/im.vector.app/dependencies_groups_allowlist_matrix_gitlab_jitpack.patch
deleted file mode 100644
index e8f194cc86..0000000000
--- a/metadata/im.vector.app/dependencies_groups_allowlist_matrix_gitlab_jitpack.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/dependencies_groups.gradle
-+++ b/dependencies_groups.gradle
-@@ -3,6 +3,7 @@
-                 regex: [
-                 ],
-                 group: [
-+                        'org.matrix.gitlab.matrix-org',
-                         'com.github.Armen101',
-                         'com.github.BillCarsonFr',
-                         'com.github.chrisbanes',