more tweaks (#837)

Author: Langston Smith

MapboxAndroidDemo/proguard-rules.pro

@@ -7,7 +7,6 @@
 # Retain generic type information for use by reflection by converters and adapters.
 -keepattributes *Annotation*,Signature
 
-
 # Retain declared checked exceptions for use by a Proxy instance.
 -keepattributes Exceptions
 
@@ -106,23 +105,28 @@
     <init>(...);
 }
 
+
 -keep class * implements android.arch.lifecycle.LifecycleObserver {
     <init>(...);
 }
 -keepclassmembers class android.arch.** { *; }
 -keep class android.arch.** { *; }
 -dontwarn android.arch.**
 
-# Mapbox Telemetry
--keep com.mapbox.android.telemetry.**
--keep com.mapbox.android.core.location.**
+# Mapbox
+-keep class com.mapbox.android.telemetry.**
+-keep class com.mapbox.android.core.location.**
+-keep class android.arch.lifecycle.** { *; }
+-keep class com.mapbox.android.core.location.** { *; }
+-keep class com.mapbox.mapboxsdk.** { *; }
 
 # Other Android
 -dontnote android.net.http.*
 -dontnote org.apache.commons.codec.**
 -dontnote org.apache.http.**
 
--keep com.google.firebase.**
+
+-keep class com.google.firebase.**
 -dontwarn org.xmlpull.v1.**
 -dontnote org.xmlpull.v1.**
 -keep class org.xmlpull.** { *; }

MapboxAndroidWearDemo/proguard-rules.pro

@@ -68,6 +68,10 @@
 # MAS data models that will be serialized/deserialized over Gson
 -keep class com.mapbox.services.api.directionsmatrix.v1.models.** { *; }
 
+-keep class android.arch.lifecycle.** { *; }
+-keep class com.mapbox.android.core.location.** { *; }
+-keep class com.mapbox.mapboxsdk.** { *; }
+
 -dontnote com.squareup.**
 
 # --- OkHttp ---
@@ -86,8 +90,16 @@
 -dontwarn com.mapbox.api.staticmap.v1.models.StaticMarkerAnnotation
 -dontwarn com.mapbox.api.staticmap.v1.models.StaticPolylineAnnotation
 
+# Mapbox
+-keep class com.mapbox.android.telemetry.**
+-keep class com.mapbox.android.core.location.**
+-keep class android.arch.lifecycle.** { *; }
+-keep class com.mapbox.android.core.location.** { *; }
+-keep class com.mapbox.mapboxsdk.** { *; }
 
 # Other Android
+-keep public class com.google.firebase.** { public *; }
+-keep class com.google.firebase.** { *; }
 -dontnote android.net.http.*
 -dontnote org.apache.commons.codec.**
 -dontnote org.apache.http.**