Fix #342 - Exclude play-services-ads from dependencies

OneBusAway · Oct 27, 2015 · e0c168a · e0c168a
1 parent 20d9450
commit e0c168a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/onebusaway-android/build.gradle b/onebusaway-android/build.gradle
@@ -274,7 +274,9 @@ tasks.whenTaskAdded { theTask ->
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
     // Google Play Services Analytics (we need this on Amazon flavor too)
-    compile 'com.google.android.gms:play-services-analytics:8.1.0'
+    compile('com.google.android.gms:play-services-analytics:8.1.0') {
+        exclude module: 'play-services-ads' // See #342
+    }
     // Google Play Services Location (we need this on Amazon flavor too)
     compile 'com.google.android.gms:play-services-location:8.1.0'
     // Support libraries

diff --git a/onebusaway-android/proguard-project.txt b/onebusaway-android/proguard-project.txt
@@ -37,3 +37,6 @@
 
 # SearchView
 -keep class android.support.v7.widget.SearchView { *; }
+
+# Below is required to do a release build as of Play Services 8.1 - see #342
+-dontwarn com.google.android.gms.ads.**