Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Cordova #599

Merged
merged 17 commits into from
Oct 16, 2019
Merged

Update Cordova #599

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1e065d2
SDK-523 remove targetSdk check. It doesn't exist in newer manifests.
echo-branch Oct 1, 2019
6f1f7fa
SDK-523 update iOS SDK to 0.29.x. Also switch to using cocoapods. Mi…
echo-branch Oct 3, 2019
e1d6e50
SDK-523 pull android from gradle instead of aar
echo-branch Oct 8, 2019
541d004
SDK-523 add new iOS methods
echo-branch Oct 8, 2019
8b41ad7
SDK-523 add android version, this does not work reliably
echo-branch Oct 10, 2019
cf7fa3c
Merge commit '7514c2b32b89d6c7002de76a2c8e578bb4549d7b' into SDK-523-…
echo-branch Oct 10, 2019
18cab13
SDK-523 prepare for release.
echo-branch Oct 10, 2019
7749ab5
SDK-523 reset JSONObject if we failed to parse correctly
echo-branch Oct 11, 2019
709fe76
SDK-523 missed event alias
echo-branch Oct 14, 2019
c5393bf
SDK-523 correct api name on iOS
echo-branch Oct 15, 2019
125c386
SDK-523 correct Android foreground link behavior
echo-branch Oct 15, 2019
8e1128a
SDK-523 update release notes. Add known android issue.
echo-branch Oct 15, 2019
fec591e
SDK-523 add known issue ticket numbers for reference
echo-branch Oct 15, 2019
02b8441
SDK-523 update so Amazon Fire ID is handled properly
echo-branch Oct 15, 2019
3da5771
SDK-523 make exception more specific.
echo-branch Oct 15, 2019
8ec873d
SDK-523 improve format.
echo-branch Oct 15, 2019
5bc7378
SDK-423 update android version and date in changelog
echo-branch Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
SDK-523 remove targetSdk check. It doesn't exist in newer manifests.
  • Loading branch information
@echo-branch
echo-branch committed Oct 1, 2019
commit 1e065d24be516f1ffe87bcdbc334a13a9c8949da
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "branch-cordova-sdk",
"description": "Branch Metrics Cordova SDK",
"main": "src/index.js",
"version": "3.2.0",
"version": "3.3.0",
"homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
"repository": {
"type": "git",
Expand Down
12 changes: 2 additions & 10 deletions src/scripts/android/updateAndroidManifest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
manifest.file,
manifest.mainActivityIndex,
preferences,
manifest.targetSdk
);

// save manifest
Expand Down Expand Up @@ -71,14 +70,11 @@
const mainActivityIndex = getMainLaunchActivityIndex(
manifest.manifest.application[0].activity
);
const targetSdk =
manifest.manifest["uses-sdk"][0].$["android:targetSdkVersion"];

return {
file: manifest,
path: pathToManifest,
mainActivityIndex: mainActivityIndex,
targetSdk: targetSdk
mainActivityIndex: mainActivityIndex
};
}

Expand Down Expand Up @@ -230,8 +226,7 @@
function updateBranchAppLinks(
manifest,
mainActivityIndex,
preferences,
targetSdk
preferences
) {
let intentFilters =
manifest.manifest.application[0].activity[mainActivityIndex][
Expand All @@ -243,9 +238,6 @@
"android:name": androidName,
"android:autoVerify": "true"
};
if (targetSdk && parseInt(targetSdk) < 23) {
delete header["android:autoVerify"];
}

// remove
intentFilters = removeBasedOnAndroidName(intentFilters, androidName);
Expand Down