Merge pull request #345 from BranchMetrics/npm-update

fix: removed google play services
BranchMetrics · Jul 13, 2017 · 779a9a0 · 779a9a0
2 parents e465000 + 2686897
commit 779a9a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -23,4 +23,4 @@
 *.yml eol=lf
 
 *.jar binary
-*.png binary
+*.png binary
diff --git a/build.gradle b/build.gradle
@@ -13,6 +13,6 @@ dependencies {
   compile 'com.google.android.gms:play-services-appindexing:9.+'
   // branch chrome tabs for better matching
   compile 'com.android.support:customtabs:23.3.0'
-  // branch gaid for better device matching
-  compile 'com.google.android.gms:play-services-ads:9+'
+  // branch gaid for better device matching (TODO: turned off because it conflicts with other plugins)
+  // compile 'com.google.android.gms:play-services-ads:11+'
 }