From 4e992171646650c6bcfe281a6209818493125777 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Thu, 15 Sep 2022 13:41:57 +0100 Subject: [PATCH] excluding jitsi's android-scalablevideoview fork's support library - The library exports a jetified artifact but doesn't remove the support library dependency /home/adam/dev/element/element-android/vector/build.gradle --- vector/build.gradle | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/vector/build.gradle b/vector/build.gradle index 9780fae895..069295be3d 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -100,7 +100,6 @@ android { viewBinding true } } - dependencies { implementation project(":vector-config") api project(":matrix-sdk-android") @@ -240,6 +239,19 @@ dependencies { // implementation 'org.webrtc:google-webrtc:1.0.+' implementation('com.facebook.react:react-native-webrtc:1.94.2-jitsi-10227332@aar') + // Exclude jitsi's android-scalablevideoview fork's support library + // The library exports a jetified artifact but doesn't remove the support library dependency + // https://github.com/MatrixFrog/Android-ScalableVideoView/blob/master/gradle.properties#L1 + components { + withModule("com.github.MatrixFrog:android-scalablevideoview") { + allVariants { + withDependencies { + removeAll { it.group == "com.android.support" && it.name == "appcompat-v7" } + } + } + } + } + // Jitsi api('org.jitsi.react:jitsi-meet-sdk:5.0.2') { exclude group: 'com.google.firebase' @@ -247,6 +259,7 @@ dependencies { exclude group: 'com.android.installreferrer' } + // QR-code // Stick to 3.3.3 because of https://github.com/zxing/zxing/issues/1170 implementation 'com.google.zxing:core:3.3.3'