Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update R8 (proguard) configuration to support guava #1091

Merged
merged 1 commit into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions vector-app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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.**
Expand Down
4 changes: 3 additions & 1 deletion vector/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading