Merge pull request #599 from BranchMetrics/staging

Update Cordova

Author: echo-branch

CHANGELOG.md

@@ -1,3 +1,20 @@
+<a name="4.0.0"></a>
+# [4.0.0](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/compare/v3.2.0...v4.0.0) (2019-10-15)
+
+* Update iOS SDK to 0.29.1
+* Update Android SDK to 4.1.1
+* Switch to Cocoapods
+* Switch to Maven
+* Add Event Alias
+* Add CPID and LATD methods
+* Add Amazon Fire ID
+* Fix foreground linking
+
+Known issues:
+* iOS command line build fails due a cordova issue, workaround is to build from xcode.  SDK-558  https://github.com/apache/cordova-ios/issues/659
+* Android installation hooks require Android platform to be added before the plugin.  SDK-585
+* CPID and LATD methods do not work on Android.  SDK-557
+
 <a name="3.2.0"></a>
 # [3.2.0](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/compare/v3.1.6...v3.2.0) (2019-5-24)
 

package.json

@@ -2,7 +2,7 @@
   "name": "branch-cordova-sdk",
   "description": "Branch Metrics Cordova SDK",
   "main": "src/index.js",
-  "version": "3.2.0",
+  "version": "4.0.0",
   "homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
   "repository": {
     "type": "git",
@@ -16,6 +16,12 @@
     "ios"
   ],
   "license": "MIT",
+  "engines": [
+    { 
+      "name": "cordova",
+      "version": ">=9.0.0"
+    }
+  ],
   "dependencies": {
     "fs": "0.0.1-security",
     "glob": "^7.1.4",

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="3.2.0">
+  version="4.0.0">
 
   <!-- Description -->
   <name>branch-cordova-sdk</name>
@@ -59,162 +59,35 @@ SOFTWARE.
       </feature>
     </config-file>
 
+    <!-- Manifest configuration is done via a js script.  We should move it to this config in the future. -->
+
     <source-file src="src/android/io/branch/BranchSDK.java" target-dir="src/io/branch" />
-    <source-file src="src/android/dependencies/Branch.aar" target-dir="app/libs" />
-    <framework src="src/android/dependencies/rules.gradle" custom="true" type="gradleReference" />
+    <framework src="io.branch.sdk.android:library:4.1.1"/>
   </platform>
 
   <!-- iOS -->
   <platform name="ios">
-    <config-file target="config.xml" parent="/*">
-      <feature name="BranchSDK">
-        <param name="ios-package" value="BranchSDK" />
-        <param name="onload" value="true" />
-      </feature>
-    </config-file>
-
-    <framework src="iAd.framework" />
-    <framework src="SafariServices.framework" />
-    <framework src="AdSupport.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" />
-    <source-file src="src/ios/AppDelegate+BranchSdk.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+FABKits.h" />
-    <header-file src="src/ios/dependencies/Fabric/Fabric.h" />
-
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCApplication.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCApplication.m" />
-    <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" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCConfig.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCConfig.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCCrashlyticsWrapper.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCCrashlyticsWrapper.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCDebug.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCDebug.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCDeepLinkViewControllerInstance.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCDeepLinkViewControllerInstance.m" />
-    <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/Branch-SDK/BNCEncodingUtils.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCEncodingUtils.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCError.h" />
-    <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/BNCKeyChain.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCKeyChain.m" />
-    <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" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCLinkData.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCLocalization.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCLocalization.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCLog.h" />
-    <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/BNCThreads.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCThreads.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BNCURLBlackList.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BNCURLBlackList.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Branch+Validator.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Branch+Validator.m" />
-    <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" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BranchActivityItemProvider.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BranchCSSearchableItemAttributeSet.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BranchCSSearchableItemAttributeSet.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BranchConstants.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BranchConstants.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BranchContentDiscoverer.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BranchContentDiscoverer.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BranchContentDiscoveryManifest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BranchContentDiscoveryManifest.m" />
-    <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" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BranchShareLink.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BranchUniversalObject.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BranchUniversalObject.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BranchView.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BranchView.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/BranchViewHandler.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/BranchViewHandler.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/NSMutableDictionary+Branch.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/NSMutableDictionary+Branch.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/NSString+Branch.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/NSString+Branch.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/UIViewController+Branch.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/UIViewController+Branch.m" />
-
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCNetworkService.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/BNCNetworkService.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCNetworkServiceProtocol.h" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerInterface.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerInterface.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerRequestQueue.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerRequestQueue.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerResponse.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerResponse.m" />
-
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCloseRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCloseRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchInstallRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchInstallRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLogoutRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLogoutRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchOpenRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchOpenRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchRegisterViewRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchRegisterViewRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchSetIdentityRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchSetIdentityRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchShortUrlRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchShortUrlRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchSpotlightUrlRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchSpotlightUrlRequest.m" />
-    <header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchUserCompletedActionRequest.h" />
-    <source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchUserCompletedActionRequest.m" />
-
+      <plugins-plist key="BranchSDK" string="BranchSDK" />
+
+      <config-file target="config.xml" parent="/*">
+          <feature name="BranchSDK">
+              <param name="ios-package" value="BranchSDK" />
+              <param name="onload" value="true" />
+          </feature>
+      </config-file>
+
+      <header-file src="src/ios/BranchNPM.h" />
+      <header-file src="src/ios/BranchSDK.h" />
+      <source-file src="src/ios/BranchSDK.m" />
+      <source-file src="src/ios/AppDelegate+BranchSdk.m" />
+
+      <podspec>
+          <config>
+              <source url="https://github.com/CocoaPods/Specs.git"/>
+          </config>
+          <pods use-frameworks="true">
+              <pod name="Branch" spec="~> 0.29.0" />
+          </pods>
+      </podspec>
   </platform>
 </plugin>