From 5c16874fab11deafbe1beb1097ae058bd010c792 Mon Sep 17 00:00:00 2001 From: Ethan Neff Date: Thu, 8 Dec 2016 11:21:52 -0800 Subject: [PATCH 1/3] docs: replaced semicolon with && for fail check --- DEVELOPING.md | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/DEVELOPING.md b/DEVELOPING.md index cd190f49..ca947a47 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -67,32 +67,19 @@ gulp prerelease; > Modify `BRANCH_KEY` and `URI_SCHEME` and `config.xml` to values in [Branch Dashboard](https://dashboard.branch.io/settings/link) ```sh -cd testbed; -npm install -g cordova; +gulp prerelease && cd testbed && npm install -g cordova && cordova platform remove ios && cordova platform remove android && cordova platform remove browser && cordova platform add ios && cordova platform add android && cordova plugin remove io.branch.sdk && cordova plugin add ../ --variable BRANCH_KEY=key_live_icCccJIpd7GlYY5oOmoEtpafuDiuyXhT --variable URI_SCHEME=enefftest; -cordova platform remove ios; -cordova platform remove android; -cordova platform remove browser; - -cordova platform add ios; -cordova platform add android; - -cordova plugin remove io.branch.sdk; -cordova plugin add ../ --variable BRANCH_KEY=key_live_icCccJIpd7GlYY5oOmoEtpafuDiuyXhT --variable URI_SCHEME=enefftest; # cordova plugin add branch-cordova-sdk --variable BRANCH_KEY=key_live_icCccJIpd7GlYY5oOmoEtpafuDiuyXhT --variable URI_SCHEME=enefftest; - -cordova build ios; -cordova build android; ``` > Validate all features on both `iOS` and `Android` on `device` only (no `simulator` or `TestFlight`) ```sh -cordova build ios; -open -a Xcode platforms/ios/Branch\ Testing.xcworkspace; +cordova build ios && open -a Xcode platforms/ios/Branch\ Testing.xcworkspace; ``` + ```sh -cordova run android; +cordova build android && cordova run android; chrome://inspect/#devices ``` From 9a8a03407f01e856eae3ff3b3efd758726e6d124 Mon Sep 17 00:00:00 2001 From: Ethan Neff Date: Thu, 8 Dec 2016 11:22:15 -0800 Subject: [PATCH 2/3] fix: added iOS framework dependencies --- plugin.template.xml | 5 +++++ plugin.xml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/plugin.template.xml b/plugin.template.xml index a87d3f4d..4adc7389 100644 --- a/plugin.template.xml +++ b/plugin.template.xml @@ -101,6 +101,11 @@ SOFTWARE. + + + + + diff --git a/plugin.xml b/plugin.xml index cd7b54a0..07870039 100644 --- a/plugin.xml +++ b/plugin.xml @@ -101,6 +101,11 @@ SOFTWARE. + + + + + From 441f8a2d89e81dd92b722629a34e23ed6a3ba777 Mon Sep 17 00:00:00 2001 From: Ethan Neff Date: Thu, 8 Dec 2016 11:39:11 -0800 Subject: [PATCH 3/3] fix: list on spotlight now works --- testbed/www/js.es6/index.js | 20 ++++++++++---------- testbed/www/js/index.js | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/testbed/www/js.es6/index.js b/testbed/www/js.es6/index.js index cbb3b89c..b03a6ffc 100644 --- a/testbed/www/js.es6/index.js +++ b/testbed/www/js.es6/index.js @@ -175,11 +175,11 @@ function BranchDeepLink() { // optional fields var properties = { - $fallback_url: "www.example.com", - $desktop_url: "www.desktop.com", - $android_url: "www.android.com", - $ios_url: "www.ios.com", - $ipad_url: "www.ipad.com", + $fallback_url: "http://www.example.com/example", + $desktop_url: "http://www.example.com/desktop", + $android_url: "http://www.example.com/android", + $ios_url: "http://www.example.com/ios", + $ipad_url: "http://www.example.com/ipad", more_custom: "data", even_more_custom: true, this_is_custom: 41231 @@ -215,11 +215,11 @@ function BranchShareSheet() { // optional fields var properties = { - $fallback_url: "www.example.com", - $desktop_url: "www.desktop.com", - $android_url: "www.android.com", - $ios_url: "www.ios.com", - $ipad_url: "www.ipad.com", + $fallback_url: "http://www.example.com/example", + $desktop_url: "http://www.example.com/desktop", + $android_url: "http://www.example.com/android", + $ios_url: "http://www.example.com/ios", + $ipad_url: "http://www.example.com/ipad", more_custom: "data", even_more_custom: true, this_is_custom: 41231 diff --git a/testbed/www/js/index.js b/testbed/www/js/index.js index 8b1dff21..042c2bf7 100644 --- a/testbed/www/js/index.js +++ b/testbed/www/js/index.js @@ -177,11 +177,11 @@ function BranchDeepLink() { // optional fields var properties = { - $fallback_url: "www.example.com", - $desktop_url: "www.desktop.com", - $android_url: "www.android.com", - $ios_url: "www.ios.com", - $ipad_url: "www.ipad.com", + $fallback_url: "http://www.example.com/example", + $desktop_url: "http://www.example.com/desktop", + $android_url: "http://www.example.com/android", + $ios_url: "http://www.example.com/ios", + $ipad_url: "http://www.example.com/ipad", more_custom: "data", even_more_custom: true, this_is_custom: 41231 @@ -217,11 +217,11 @@ function BranchShareSheet() { // optional fields var properties = { - $fallback_url: "www.example.com", - $desktop_url: "www.desktop.com", - $android_url: "www.android.com", - $ios_url: "www.ios.com", - $ipad_url: "www.ipad.com", + $fallback_url: "http://www.example.com/example", + $desktop_url: "http://www.example.com/desktop", + $android_url: "http://www.example.com/android", + $ios_url: "http://www.example.com/ios", + $ipad_url: "http://www.example.com/ipad", more_custom: "data", even_more_custom: true, this_is_custom: 41231