Fixes databinding dependency on json that was breaking proguard

Change-Id: I4bd03e38bc49098356edbdf296bed627a470a284
dattien96 · Jul 19, 2018 · 024a685 · 024a685
1 parent efac4b3
commit 024a685
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -63,5 +63,3 @@ map_floorplan_nw=41.185897762727876f, 99.26048714480324f
 map_floorplan_ne=41.18938475156247f, 99.26048714480324f
 # South-East point.
 map_floorplan_se=41.18938475156247f, 99.26486649009387f
-
-#android.databinding.enableV2=true
diff --git a/mobile/build.gradle b/mobile/build.gradle
@@ -166,6 +166,10 @@ dependencies {
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"
     stagingImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion"
+
+    // Solve conflicts with gson. DataBinding is using an old version.
+    implementation "com.google.code.gson:gson:$gsonVersion"
+
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/mobile/proguard-rules.pro b/mobile/proguard-rules.pro
@@ -23,4 +23,4 @@
 -keepattributes SourceFile,LineNumberTable
 -keep public class * extends java.lang.Exception
 -keep class com.crashlytics.** { *; }
--dontwarn com.crashlytics.**
+-dontwarn com.crashlytics.**
diff --git a/shared/consumer-proguard-rules.pro b/shared/consumer-proguard-rules.pro
@@ -30,12 +30,8 @@
 -dontwarn retrofit2.Call
 
 # Databinding CardViewBindingAdapter
--dontwarn android.support.v7.widget.CardView
-
-# For 'wear' module
--dontwarn android.support.v4.**
--dontwarn org.threeten.bp.**
+-dontwarn androidx.cardview.widget.CardView
 
 -keep class com.google.samples.apps.iosched.model.** {
     *;
-}
+}
diff --git a/tv/build.gradle b/tv/build.gradle
@@ -117,6 +117,13 @@ dependencies {
     // Local unit tests
     testImplementation "junit:junit:$rootProject.junitVersion"
     testImplementation "org.hamcrest:hamcrest-library:$rootProject.hamcrestVersion"
+
+    // Solve conflicts with gson. DataBinding is using an old version.
+    implementation "com.google.code.gson:gson:$rootProject.gsonVersion"
+
+    // Solve conflicts with okhttp. Firestore is using an old version.
+    implementation "com.squareup.okhttp3:okhttp:$rootProject.okhttpVersion"
+
 }
 
 apply plugin: 'com.google.gms.google-services'