Merge pull request #353 from BranchMetrics/android-dependencies

fixed conflicting android dependencies

Author: ethanneff

build.gradle

@@ -7,12 +7,12 @@ android {
 dependencies {
   // multidex for frameworks
   compile 'com.android.support:multidex:1.0.1'
-  // branch sdk
+  // Branch sdk
   compile 'io.branch.sdk.android:library:2+'
-  // branch app indexing
-  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 (TODO: turned off because it conflicts with other plugins)
+  // Branch app indexing
+  // 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 (TODO: turned off because it conflicts with other plugins)
   // compile 'com.google.android.gms:play-services-ads:11+'
 }

package.json

@@ -2,7 +2,7 @@
   "name": "branch-cordova-sdk",
   "description": "Branch Metrics Cordova SDK",
   "main": "src/branch.js",
-  "version": "2.6.6",
+  "version": "2.6.7",
   "homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
   "repository": {
     "type": "git",

plugin.template.xml

@@ -24,7 +24,7 @@ SOFTWARE.
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="branch-cordova-sdk"
-  version="2.6.6">
+  version="2.6.7">
 
   <!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
 

plugin.xml

@@ -24,7 +24,7 @@ SOFTWARE.
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="branch-cordova-sdk"
-  version="2.6.6">
+  version="2.6.7">
 
   <!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->