Merge pull request #254 from BranchMetrics/fix_ios_frameworks

Fix ios frameworks and core spotlight
BranchMetrics · Dec 8, 2016 · 3bb0704 · 3bb0704
2 parents 2c95f60 + 441f8a2
commit 3bb0704
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 37 deletions.
diff --git 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
 ```
 

diff --git a/plugin.template.xml b/plugin.template.xml
@@ -101,6 +101,11 @@ SOFTWARE.
                 </dict>
             </array>
         </config-file>
+        <framework src="SafariServices.framework"/>
+        <framework src="AdSupport.framework"/>
+        <framework src="CoreTelephony.framework"/>
+        <framework src="CoreSpotlight.framework"/>
+        <framework src="MobileCoreServices.framework"/>
         <header-file src="src/ios/BranchNPM.h" />
         <header-file src="src/ios/BranchSDK.h" />
         <source-file src="src/ios/BranchSDK.m" />

diff --git a/plugin.xml b/plugin.xml
@@ -101,6 +101,11 @@ SOFTWARE.
                 </dict>
             </array>
         </config-file>
+        <framework src="SafariServices.framework"/>
+        <framework src="AdSupport.framework"/>
+        <framework src="CoreTelephony.framework"/>
+        <framework src="CoreSpotlight.framework"/>
+        <framework src="MobileCoreServices.framework"/>
         <header-file src="src/ios/BranchNPM.h" />
         <header-file src="src/ios/BranchSDK.h" />
         <source-file src="src/ios/BranchSDK.m" />

diff --git 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
@@ -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