Merge pull request BranchMetrics#566 from BranchMetrics/staging

Staging

.gitignore

@@ -7,3 +7,4 @@ node_modules/
 package-lock.json
 npm-debug.log*
 yarn-error.log*
+.vscode

CHANGELOG.md

@@ -1,3 +1,9 @@
+<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)
+
+* Fix Cordova 9 incompatibility.
+* Fix aar not found on Android builds.
+
 <a name="3.1.6"></a>
 # [3.1.6](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/compare/v3.1.5...v3.1.6) (2019-2-28)
 

package.json

@@ -2,7 +2,7 @@
   "name": "branch-cordova-sdk",
   "description": "Branch Metrics Cordova SDK",
   "main": "src/index.js",
-  "version": "3.1.6",
+  "version": "3.2.0",
   "homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
   "repository": {
     "type": "git",
@@ -16,91 +16,16 @@
     "ios"
   ],
   "license": "MIT",
-  "scripts": {
-    "validate": "            echo 'run validation scripts';     node ./src/scripts/npm/updatePluginXml",
-    "travis-deploy-once": "  echo 'prevent multiple deploys';   travis-deploy-once",
-    "commitmsg": "           echo 'validate commit messages';   commitlint -e $GIT_PARAMS",
-    "precommit": "           echo 'run prettier on commit';     lint-staged",
-    "examples": "            echo 'generate examples';          node ./src/scripts/examples",
-    "prettier": "            echo 'run prettier';               prettier --write './{src,testbed,tests}/**/*.js'",
-    "lint": "                echo 'run code linter';            eslint --ext=js --fix ./src",
-    "semantic-release": "    echo 'run continuous integration'; semantic-release"
-  },
   "dependencies": {
+    "fs": "0.0.1-security",
+    "glob": "^7.1.4",
     "mkpath": "^1.0.0",
     "node-version-compare": "^1.0.1",
     "plist": "^3.0.1",
     "request": "^2.85.0",
+    "shelljs": "^0.8.3",
+    "xcode": "^2.0.0",
     "xml2js": "^0.4.19"
   },
-  "eslintConfig": {
-    "extends": [
-      "airbnb-base/legacy",
-      "prettier"
-    ],
-    "rules": {
-      "no-console": 0,
-      "no-alert": 0,
-      "no-use-before-define": 0
-    },
-    "globals": {
-      "Promise": true,
-      "Branch": true
-    }
-  },
-  "release": {
-    "verifyConditions": [
-      "@semantic-release/changelog",
-      "@semantic-release/github",
-      "@semantic-release/git",
-      "@semantic-release/npm"
-    ],
-    "verifyRelease": [
-      {
-        "path": "@semantic-release/exec",
-        "cmd": "node ./src/scripts/npm/updateNpmVersion"
-      }
-    ],
-    "prepare": [
-      {
-        "path": "@semantic-release/changelog",
-        "changelogFile": "CHANGELOG.md"
-      },
-      "@semantic-release/git"
-    ],
-    "publish": [
-      "@semantic-release/github",
-      "@semantic-release/npm"
-    ]
-  },
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ]
-  },
-  "lint-staged": {
-    "src/*.{js,json,css,md}": [
-      "prettier --write",
-      "git add"
-    ]
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^6.2.0",
-    "@commitlint/config-conventional": "^6.1.3",
-    "@semantic-release/changelog": "^2.0.2",
-    "@semantic-release/exec": "^2.2.4",
-    "@semantic-release/git": "^4.0.3",
-    "@semantic-release/github": "^4.2.15",
-    "@semantic-release/npm": "^3.2.5",
-    "eslint": "^4.19.1",
-    "eslint-config-airbnb-base": "^12.1.0",
-    "eslint-config-prettier": "^2.9.0",
-    "eslint-plugin-import": "^2.11.0",
-    "eslint-plugin-jest": "^21.15.1",
-    "husky": "^0.14.3",
-    "lint-staged": "^7.0.5",
-    "prettier": "^1.12.1",
-    "semantic-release": "^15.2.0",
-    "travis-deploy-once": "^5.0.0"
-  }
+  "devDependencies": {}
 }

plugin.xml

@@ -24,9 +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.1.6">
-
-  <!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
+  version="3.2.0">
 
   <!-- Description -->
   <name>branch-cordova-sdk</name>
@@ -42,7 +40,6 @@ SOFTWARE.
   </engines>
 
   <!-- Hooks -->
-  <hook src="src/scripts/hooks/beforePluginInstall.js" type="before_plugin_install" />
   <hook src="src/scripts/hooks/beforePrepare.js" type="after_plugin_install" />
   <hook src="src/scripts/hooks/afterPrepare.js" type="after_plugin_add" />
   <hook src="src/scripts/hooks/beforePrepare.js" type="before_prepare" />

src/android/dependencies/rules.gradle

@@ -1,4 +1,11 @@
 dependencies {
-    implementation fileTree(dir: 'libs', include: '*.aar')
+    compile (name:'Branch', ext:'aar')
 }
+repositories {
+    flatDir {
+        dirs 'app/libs', 'libs'
+    }
+}
+
+