From 745cf45a7108e08869ae566ed1fae309c38cf061 Mon Sep 17 00:00:00 2001
From: Alex Austin <alexjaustin@gmail.com>
Date: Tue, 21 Jun 2016 15:16:29 -0700
Subject: [PATCH] update with latest

---
 NPMdeployment.txt |  5 +++++
 package.json      |  9 ++++++++-
 plugin.xml        | 22 +++++++++++-----------
 testbed/init.sh   |  2 +-
 4 files changed, 25 insertions(+), 13 deletions(-)
 create mode 100644 NPMdeployment.txt

diff --git a/NPMdeployment.txt b/NPMdeployment.txt
new file mode 100644
index 00000000..0f7bf0ec
--- /dev/null
+++ b/NPMdeployment.txt
@@ -0,0 +1,5 @@
+NPM deployment
+
+1. comment out iOS framework in plugin.xml
+2. change header file references of Cordova iOS libs from <Branch/Branch.h> to "Branch.h"
+3. remove "../Fabric" from all Fabric related imports
\ No newline at end of file
diff --git a/package.json b/package.json
index 123636d3..95d0ac86 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.1.4",
+  "version": "2.1.5",
   "name": "branch-cordova-sdk",
   "description": "Branch Metrics Cordova SDK",
   "main": "www/branch.js",
@@ -34,5 +34,12 @@
     "plist": "^1.2.0",
     "rimraf": "^2.5.2",
     "xml2js": "^0.4.16"
+  },
+  "devDependencies": {
+    "mkpath": "^1.0.0",
+    "node-version-compare": "^1.0.1",
+    "plist": "^1.2.0",
+    "rimraf": "^2.5.2",
+    "xml2js": "^0.4.16"
   }
 }
diff --git a/plugin.xml b/plugin.xml
index 0dd6c7ad..57ca9bfd 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -25,7 +25,7 @@ SOFTWARE.
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="io.branch.sdk"
-        version="2.1.4">
+        version="2.1.5">
 
     <name>branch-cordova-sdk</name>
     <description>Branch SDK Plugin</description>
@@ -104,9 +104,16 @@ SOFTWARE.
         <source-file src="src/ios/BranchSDK.m" />
         <source-file src="src/ios/AppDelegate+BranchSdk.m" />
         <!-- COMMENT if building for NPM -->
-        <framework custom="true" src="src/ios/dependencies/Branch.framework" />
+        <!-- <framework custom="true" src="src/ios/dependencies/Branch.framework" /> -->
         <!-- UNCOMMENT if building for NPM -->
-        <!-- <header-file src="src/ios/dependencies/Branch-SDK/BNCConfig.h" />
+        <header-file src="src/ios/dependencies/Fabric/ANSCompatibility.h" />
+        <header-file src="src/ios/dependencies/Fabric/Answers.h" /> 
+        <header-file src="src/ios/dependencies/Fabric/FABAttributes.h" /> 
+        <header-file src="src/ios/dependencies/Fabric/FABKitProtocol.h" /> 
+        <header-file src="src/ios/dependencies/Fabric/Fabric.h" /> 
+        <header-file src="src/ios/dependencies/Fabric/Fabric+FABKits.h" /> 
+        
+        <header-file src="src/ios/dependencies/Branch-SDK/BNCConfig.h" />
         <header-file src="src/ios/dependencies/Branch-SDK/BNCCallbacks.h" />
         <header-file src="src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.h" />
         <source-file src="src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.m" />
@@ -153,13 +160,6 @@ SOFTWARE.
         <header-file src="src/ios/dependencies/Branch-SDK/BNCDeviceInfo.h" />
         <source-file src="src/ios/dependencies/Branch-SDK/BNCDeviceInfo.m" /> 
 
-        <header-file src="src/ios/dependencies/Fabric/ANSCompatibility.h" />
-        <header-file src="src/ios/dependencies/Fabric/Answers.h" /> 
-        <header-file src="src/ios/dependencies/Fabric/FABAttributes.h" /> 
-        <header-file src="src/ios/dependencies/Fabric/FABKitProtocol.h" /> 
-        <header-file src="src/ios/dependencies/Fabric/Fabric.h" /> 
-        <header-file src="src/ios/dependencies/Fabric/Fabric+FABKits.h" /> 
-
         <header-file src="src/ios/dependencies/Branch-SDK/Requests/BNCServerRequest.h" />
         <source-file src="src/ios/dependencies/Branch-SDK/Requests/BNCServerRequest.m" />
         <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchApplyPromoCodeRequest.h" />
@@ -195,6 +195,6 @@ SOFTWARE.
         <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchUserCompletedActionRequest.h" />
         <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchUserCompletedActionRequest.m" />
         <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchValidatePromoCodeRequest.h" />
-        <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchValidatePromoCodeRequest.m" /> -->
+        <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchValidatePromoCodeRequest.m" />
     </platform>
 </plugin>
diff --git a/testbed/init.sh b/testbed/init.sh
index d2969408..c0b8c752 100644
--- a/testbed/init.sh
+++ b/testbed/init.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 cordova platform add ios android
 
-cordova plugin add ../ --link --variable BRANCH_KEY=key_live_fnmRM1FXtu11t6e4LU8WsldpvDcA0bzv --variable URI_SCHEME=testbed
+cordova plugin add ../ --variable BRANCH_KEY=key_live_fnmRM1FXtu11t6e4LU8WsldpvDcA0bzv --variable URI_SCHEME=testbed
 
 # Include this plugin if you want to run a unit-test for the plugin
 # cordova plugin add http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework.git