element: explicitly exclude transitive gms dependencies

Pending upstream PR: https://github.com/vector-im/element-android/pull/3125
This commit is contained in:
Marcus Hoffmann 2021-04-06 21:36:41 +02:00
parent c0429fd23f
commit 4e7b12459b
2 changed files with 38 additions and 1 deletions

View file

@ -314,6 +314,7 @@ Builds:
- versionName: 1.1.0
versionCode: 40101000
disable: contains gms through jitsi sdk
commit: v1.1.0
subdir: vector
gradle:
@ -335,6 +336,8 @@ Builds:
versionCode: 40101030
commit: v1.1.3
subdir: vector
patch:
- 62038e8a898d351064623bc7677bf275d05f66c1.patch
gradle:
- fdroid
srclibs:
@ -343,7 +346,7 @@ Builds:
- tac ../build.gradle | awk '/dl.bintray.com\/piasy\/maven/{getline;$0="mavenLocal
{"}{print $0}' | tac > ../build.gradle.new
- mv ../build.gradle.new ../build.gradle
- sed -i -e '/com.google.firebase/,+5d' build.gradle
- sed -i -e '/firebase-messaging/,+5d' build.gradle
- sed -i -e '/com.google.gms.google-services/d' build.gradle
- sed -i -e 's/enable true/enable false/g' build.gradle
scanignore:

View file

@ -0,0 +1,34 @@
From 62038e8a898d351064623bc7677bf275d05f66c1 Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Tue, 6 Apr 2021 20:50:43 +0200
Subject: [PATCH] propagate jitsi LIBRE_BUILD exclusion rules to not pull in
gms libs
Previously jitsi only had optional dependencies being disabled by the
LIBRE build flag but a while ago they introduced optional exclusion
rules which don't transitively propagate to consumers of the library, so
instead we need to mirror the exclusion rules from the jitsi gradle file:
See: https://github.com/jitsi/jitsi-meet/blob/7a64bf006ea027b77564d8847570e1ac46ff0ec0/android/sdk/build.gradle#L53
Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
---
vector/build.gradle | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/vector/build.gradle b/vector/build.gradle
index 3ee11450cc..d5a105d893 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -442,7 +442,11 @@ dependencies {
implementation('com.facebook.react:react-native-webrtc:1.87.3-jitsi-6624067@aar')
// Jitsi
- implementation('org.jitsi.react:jitsi-meet-sdk:3.1.0')
+ implementation('org.jitsi.react:jitsi-meet-sdk:3.1.0') {
+ exclude group: 'com.google.firebase'
+ exclude group: 'com.google.android.gms'
+ exclude group: 'com.android.installreferrer'
+ }
// QR-code
// Stick to 3.3.3 because of https://github.com/zxing/zxing/issues/1170