Merge pull request #400 from BranchMetrics/more-fixes

More fixes

.gitignore

@@ -9,6 +9,7 @@ node_modules
 .installed
 .gradle/
 .idea/
+tmp/
 cordova-ionic-phonegap-branch-deep-linking.iml
 local.properties
 out/

CHANGELOG.md

@@ -1,14 +1,39 @@
 # CHANGELOG
 Questions? [Contact us](https://support.branch.io/support/tickets/new)
 
+## [v2.6.18](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/releases/tag/v2.6.18) (2017-11-10)
+
+- **Completed Changes**
+  - Merge pull request #391 from BranchMetrics/fix-associated-domainsfix: corrected the duplication of custom link domains in the iOS enti… ([f67eb](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/f67eb65fdde31e1c0f04a4d0c5fd72880ba4bdba))
+
+- **Closed Issues**
+  - Cold Start ([#397](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/397))
+  - Cannot resolve module 'cordova/exec' in branch.js ([#396](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/396))
+  - iOS distribution error, applinks not supported ([#395](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/395))
+  - ios - Terminating app due to uncaught exception 'NSUnknownKeyException', reason: '[<BranchUniversalObject 0x1c42ece80> setValue:forUndefinedKey:]: this class is not key value coding-compliant for the key integer.' ([#390](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/390))
+
+## [v2.6.17](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/releases/tag/v2.6.17) (2017-11-09)
+
+- **Completed Changes**
+  - Merge branch 'master' into fix-associated-domains ([24919](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/24919563eab3a83469683cee1d6a4eb6f31b0be8))
+  - fix: corrected the duplication of custom link domains in the iOS entitlements ([99901](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/999016b1eb9e6e4332574cb33aea6e7abdc51521))
+  - Merge pull request #388 from BranchMetrics/updatesUpdates ([eb064](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/eb06417ac73780a37cee7aa8877bb04b7d807d84))
+
+- **Closed Issues**
+  - Getting Error: Cannot read property '$' of undefined while building android apk ([#389](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/389))
+  - Android app not receiving Branch link data ([#387](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/387))
+
 ## [v2.6.16](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/releases/tag/v2.6.16) (2017-10-31)
 
 - **Completed Changes**
+  - chore: relocated known issues in contributing ([82371](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/823718b93d2f456098d6c77981eaf41c3438d018))
+  - chore: updated the changelog ([a452c](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/a452c23e051f247c36d4c4881cc99b14d97523c8))
+  - chore: updated npm version to 2.6.17 ([212d3](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/212d380bd4148e5326b06618abe4a99416a38ebe))
+  - fix: updated android to 2.13.1Hot fix : Referral params are not returned when initSession is called mutiple times while an init session is in progress ([aec99](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/aec99398eaef6cdb38143e5372ff6c03fe6f7f87))
   - docs: added testing steps to updating the sdk ([15374](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/15374b0824e7315f87afed891df76418f570ff3c))
   - Merge pull request #385 from BranchMetrics/bulkylots of fixes ([b1185](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/b11855a0c8cd670dccd076ccc69e0635e5d99c15))
 
 - **Closed Issues**
-  - Android app not receiving Branch link data ([#387](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/387))
   - Unable to get working with phonegap build ([#386](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/386))
   - Branch Deep Linking not working in Android ([#384](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/384))
   - What is "ios-team-release"? where can I take it from? ([#383](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/383))

CONTRIBUTING.md

@@ -65,7 +65,8 @@
 - **[optional]** Update [Android](https://github.com/BranchMetrics/android-branch-deep-linking/releases) and [iOS](https://github.com/BranchMetrics/ios-branch-deep-linking/releases) SDKs
 
   ```sh
-  ./src/scripts/npm/updateNativeSdk.sh -a 2.5.9 -i 0.13.5
+  ./src/scripts/npm/updateNativeSdk.sh -a 2.5.9 
+  ./src/scripts/npm/updateNativeSdk.sh -i 0.13.5
   ```
 
 - **[optional]** Update `CHANGELOG.md`

package.json

@@ -2,7 +2,7 @@
   "name": "branch-cordova-sdk",
   "description": "Branch Metrics Cordova SDK",
   "main": "src/branch.js",
-  "version": "2.6.17",
+  "version": "2.6.19",
   "homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
   "repository": {
     "type": "git",
@@ -56,12 +56,8 @@
     "gulp": "^3.9.1",
     "gulp-standard": "^10.1.0",
     "husky": "^0.14.3",
-    "mkpath": "^1.0.0",
-    "node-version-compare": "^1.0.1",
     "npm-check-updates": "^2.12.1",
-    "plist": "^2.1.0",
     "semantic-release": "^7.0.1",
-    "validate-commit-msg": "^2.14.0",
-    "xml2js": "^0.4.18"
+    "validate-commit-msg": "^2.14.0"
   }
 }

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.17">
+  version="2.6.19">
 
   <!-- 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.17">
+  version="2.6.19">
 
   <!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
 
@@ -93,6 +93,8 @@ SOFTWARE.
     <header-file src="src/ios/dependencies/Fabric/Fabric+FABKits.h" />
     <header-file src="src/ios/dependencies/Fabric/Fabric.h" />
 
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCAvailability.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCAvailability.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCCallbacks.h" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCCommerceEvent.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCCommerceEvent.m" />
@@ -114,6 +116,7 @@ SOFTWARE.
     <source-file src="src/ios/dependencies/Branch-SDK/BNCError.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCFabricAnswers.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCFabricAnswers.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCFieldDefines.h" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCLinkCache.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCLinkCache.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCLinkData.h" />
@@ -124,13 +127,12 @@ SOFTWARE.
     <source-file src="src/ios/dependencies/Branch-SDK/BNCLog.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BNCSpotlightService.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BNCSpotlightService.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCStrongMatchHelper.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCStrongMatchHelper.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCSystemObserver.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCSystemObserver.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCXcode7Support.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCXcode7Support.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Branch-SDK-Prefix.pch" />
     <header-file src="src/ios/dependencies/Branch-SDK/Branch.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/Branch.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BranchActivityItemProvider.h" />
@@ -146,6 +148,10 @@ SOFTWARE.
     <header-file src="src/ios/dependencies/Branch-SDK/BranchContentPathProperties.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BranchContentPathProperties.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BranchDeepLinkingController.h" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BranchDelegate.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BranchDelegate.m" />
+    <header-file src="src/ios/dependencies/Branch-SDK/BranchEvent.h" />
+    <source-file src="src/ios/dependencies/Branch-SDK/BranchEvent.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BranchLinkProperties.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BranchLinkProperties.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/BranchShareLink.h" />

src/ios/BranchSDK.m

@@ -439,10 +439,10 @@ - (void)createBranchUniversalObject:(CDVInvokedUrlCommand*)command
             NSString *indexingMode = [properties valueForKey:key];
             // Default contentIndexMode is always public
             if ([indexingMode isEqualToString:@"private"]) {
-                branchUniversalObj.contentIndexMode = ContentIndexModePrivate;
+                branchUniversalObj.contentIndexMode = BranchContentIndexModePrivate;
             }
             else {
-                branchUniversalObj.contentIndexMode = ContentIndexModePublic;
+                branchUniversalObj.contentIndexMode = BranchContentIndexModePublic;
             }
         }
         else if ([key isEqualToString:@"canonicalIdentifier"]) {

src/ios/dependencies/Branch-SDK/BNCXcode7Support.h → src/ios/dependencies/Branch-SDK/BNCAvailability.h

@@ -1,22 +1,30 @@
 //
-//  BNCXcode7Support.h
-//  Branch-TestBed
+//  BNCAvailability.h
+//  Branch-SDK
 //
 //  Created by Edward on 10/26/16.
 //  Copyright © 2016 Branch Metrics. All rights reserved.
 //
 
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000
-#warning Warning: Compiling with Xcode 7 support
-
+#if __has_feature(modules)
 @import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
 
-@interface NSLocale (BranchXcode7Support)
-- (NSString*) countryCode;
-- (NSString*) languageCode;
-@end
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_10_0
+#warning Warning: Compiling with pre-iOS 10 / Xcode 7 support.
 
 typedef NSString * UIActivityType;
 typedef NSString * UIApplicationOpenURLOptionsKey;
 
 #endif
+
+#ifndef NS_STRING_ENUM
+#define NS_STRING_ENUM
+#endif
+
+@interface NSLocale (BranchAvailability)
+- (NSString*) countryCode;
+- (NSString*) languageCode;
+@end

src/ios/dependencies/Branch-SDK/BNCXcode7Support.m → src/ios/dependencies/Branch-SDK/BNCAvailability.m

@@ -1,14 +1,12 @@
 //
-//  BNCXcode7Support.m
-//  Branch-TestBed
+//  BNCAvailability.m
+//  Branch-SDK
 //
 //  Created by Edward on 10/26/16.
 //  Copyright © 2016 Branch Metrics. All rights reserved.
 //
 
-
-#import "BNCXcode7Support.h"
-
+#import "BNCAvailability.h"
 
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000
 //  Usually nothing goes here.

src/ios/dependencies/Branch-SDK/BNCCallbacks.h

@@ -6,8 +6,11 @@
 //  Copyright © 2016 Branch Metrics. All rights reserved.
 //
 
-#ifndef BNCCallbacks_h
-#define BNCCallbacks_h
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
 
 @class BranchUniversalObject, BranchLinkProperties;
 
@@ -17,5 +20,3 @@ typedef void (^callbackWithStatus) (BOOL changed, NSError * _Nullable error);
 typedef void (^callbackWithList) (NSArray * _Nullable list, NSError * _Nullable error);
 typedef void (^callbackWithUrlAndSpotlightIdentifier) (NSString * _Nullable url, NSString * _Nullable spotlightIdentifier, NSError * _Nullable error);
 typedef void (^callbackWithBranchUniversalObject) (BranchUniversalObject * _Nullable universalObject, BranchLinkProperties * _Nullable linkProperties, NSError * _Nullable error);
-
-#endif /* BNCCallbacks_h */