Update R8 configuration to support guava

tchapgouv · Aug 1, 2024 · f3ea080 · f3ea080
1 parent ee9e9d7
commit f3ea080
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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