From f3ea0806cd04f388489feab638b7dd3f4387d985 Mon Sep 17 00:00:00 2001 From: yostyle Date: Thu, 1 Aug 2024 11:01:49 +0200 Subject: [PATCH] Update R8 configuration to support guava --- vector-app/proguard-rules.pro | 1 + vector/build.gradle | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/vector-app/proguard-rules.pro b/vector-app/proguard-rules.pro index 6e8afc44e3..ae6cf6ee26 100644 --- a/vector-app/proguard-rules.pro +++ b/vector-app/proguard-rules.pro @@ -85,6 +85,7 @@ -dontwarn com.google.appengine.api.urlfetch.** -dontwarn com.google.common.io.LimitInputStream -dontwarn com.google.firebase.analytics.connector.AnalyticsConnector +-dontwarn com.google.j2objc.annotations.** # TCHAP guava rule -dontwarn com.google.javascript.jscomp.** -dontwarn com.likethesalad.android.templates.provider.api.TemplatesProvider -dontwarn com.yahoo.platform.yui.compressor.** diff --git a/vector/build.gradle b/vector/build.gradle index 511c4b9df3..f4ccce5425 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -278,14 +278,16 @@ dependencies { implementation "androidx.emoji2:emoji2:1.3.0" // TCHAP Manage jitsi lib + // Guava + implementation('com.google.guava:guava:33.2.1-android') // WebRTC withdmvoipImplementation('com.github.tchapgouv:webrtc:124.2.0') - withdmvoipImplementation('com.google.guava:guava:33.2.1-android') // Jitsi withvoipApi('org.jitsi.react:jitsi-meet-sdk:8.1.1') { exclude group: 'com.google.firebase' exclude group: 'com.google.android.gms' exclude group: 'com.android.installreferrer' + exclude group: 'com.android.guava' // Exclude jitsi's android-scalablevideoview fork's support library // The library exports a jetified artifact but doesn't remove the support library dependency