Merge branch 'staging'

# Conflicts:
#	plugin.xml

Author: echo-branch

CHANGELOG.md

@@ -1,4 +1,5 @@
-<a name="4.0.0"></a>
+# [4.2.1](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/compare/v4.2.0...v4.2.1) (2020-11-05)
+
 # [4.2.0](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/compare/v4.1.3...v4.2.0) (2020-8-26)
 
 * Update iOS SDK to 0.35.0

package.json

@@ -2,7 +2,7 @@
   "name": "branch-cordova-sdk",
   "description": "Branch Metrics Cordova SDK",
   "main": "src/index.js",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
   "repository": {
     "type": "git",

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="4.2.0">
+  version="4.2.1">
 
   <!-- Description -->
   <name>branch-cordova-sdk</name>

src/scripts/ios/updateHeaderPaths.js

@@ -24,7 +24,7 @@
     config = config.split("\n")
       .map(function (line) {
         if (line.indexOf("HEADER_SEARCH_PATHS") > -1 && line.indexOf("Branch-SDK") === -1) {
-          line += ' "${PODS_ROOT}/Branch/Branch-SDK/Branch-SDK" "${PODS_ROOT}/Branch/Branch-SDK/Branch-SDK/Networking" "${PODS_ROOT}/Branch/Branch-SDK/Branch-SDK/Networking/Requests"';
+          line += ' "${PODS_ROOT}/Branch/Branch-SDK"';
         }
         return line;
       });