Merge pull request #345 from BranchMetrics/npm-update

ethanneff · web-flow · commit 779a9a0d009f · 2017-07-13T11:59:40.000-07:00
fix: removed google play services
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+'
 }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ dependencies {`
`13`	`13`	`compile 'com.google.android.gms:play-services-appindexing:9.+'`
`14`	`14`	`// branch chrome tabs for better matching`
`15`	`15`	`compile 'com.android.support:customtabs:23.3.0'`
`16`		`- // branch gaid for better device matching`
`17`		`- compile 'com.google.android.gms:play-services-ads:9+'`
	`16`	`+ // branch gaid for better device matching (TODO: turned off because it conflicts with other plugins)`
	`17`	`+ // compile 'com.google.android.gms:play-services-ads:11+'`
`18`	`18`	`}`