Skip to content

Commit 2774bf9

Browse files
MaximBelovMaximBelov
committed
Merge branch 'master' into feat-initSessionWithCallback
# Conflicts: # src/android/io/branch/BranchSDK.java
2 parents 5f755b5 + 70de5d2 commit 2774bf9

23 files changed

+598
-726
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.yml

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
---
2+
assignees: []
3+
body:
4+
-
5+
attributes:
6+
description: "What is the problem? A clear and concise description of what the bug is."
7+
label: "Describe the bug"
8+
placeholder: "Tell us what you see!"
9+
id: description
10+
type: textarea
11+
validations:
12+
required: true
13+
-
14+
attributes:
15+
description: "Please provide as much step-by-step detail as possible including logs, stack traces, and uncaught exceptions."
16+
label: "Steps to reproduce"
17+
value: |
18+
1.
19+
2.
20+
3.
21+
id: steps
22+
type: textarea
23+
validations:
24+
required: true
25+
-
26+
attributes:
27+
description: "What did you expect to happen?"
28+
label: "Expected behavior"
29+
id: expected
30+
type: textarea
31+
validations:
32+
required: true
33+
-
34+
attributes:
35+
description: "What version of sdk are you seeing this issue on?"
36+
label: "SDK Version"
37+
placeholder: "5.2.0"
38+
id: sdk-version
39+
type: input
40+
validations:
41+
required: true
42+
-
43+
attributes:
44+
description: "What devices or emulators are you seeing this bug on?"
45+
label: Make and Model
46+
placeholder: "iPhone 13 / Samsung S21"
47+
id: device
48+
type: input
49+
validations:
50+
required: true
51+
-
52+
attributes:
53+
description: "What version of the device OS?"
54+
label: OS
55+
placeholder: "iOS 15.6.1 / Android 12"
56+
id: os
57+
type: input
58+
validations:
59+
required: true
60+
-
61+
attributes:
62+
description: "Anything else that might be relevant for troubleshooting this bug. Any screenshots or videos that show the issue are very helpful."
63+
label: "Additional Information/Context"
64+
id: context
65+
type: textarea
66+
validations:
67+
required: false
68+
69+
description: "Found a bug in the Branch Cordova SDK? File it here."
70+
labels:
71+
- bug
72+
- needs-triage
73+
name: "🐞 Bug report"
74+
title: "(short issue description)"

‎.github/ISSUE_TEMPLATE/config.yml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
blank_issues_enabled: false
3+
contact_links:
4+
- name: "📕 Documentation Issue"
5+
url: https://help.branch.io/developers-hub/docs/cordova-phonegap-ionic
6+
about: Report an issue in the Branch Cordova SDK Reference documentation by clicking "Suggest edits" button on the documentation page.
7+
- name: "Branch Support"
8+
url: https://help.branch.io/using-branch/page/submit-a-ticket
9+
about: If you are having general trouble with Branch Cordova SDK integration, please submit a ticket to Branch Support.

‎.github/ISSUE_TEMPLATE/feature-request.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: 🚀 Feature Request
3+
description: Suggest an idea for this project
4+
title: "(short issue description)"
5+
labels: [feature-request, needs-triage]
6+
assignees: []
7+
body:
8+
- type: textarea
9+
id: description
10+
attributes:
11+
label: Describe the feature
12+
description: A clear and concise description of the feature you are proposing.
13+
validations:
14+
required: true

‎.github/PULL_REQUEST_TEMPLATE.md

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
## Reference
2+
SDK-XXXX -- <TITLE>.
3+
4+
## Summary
5+
<!-- Simple summary of what was changed. -->
6+
7+
## Motivation
8+
<!-- Why are you making this change? If it's for fixing a bug, if possible, please include a code snippet or example project that demonstrates the issue. -->
9+
10+
## Type Of Change
11+
<!-- Please delete options that are not relevant -->
12+
- [ ] Bug fix (non-breaking change which fixes an issue)
13+
- [ ] New feature (non-breaking change which adds functionality)
14+
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
15+
- [ ] This change requires a documentation update
16+
17+
## Testing Instructions
18+
<!-- Testing instructions, example code snippets, etc -->
19+
20+
21+
<!-- Checklist -->
22+
<!-- My code follows the style guidelines of this project -->
23+
<!-- I have performed a self-review of my code -->
24+
<!-- I have commented my code, particularly in hard-to-understand areas -->
25+
<!-- I have made corresponding changes to the documentation -->
26+
<!-- I have added tests that prove my fix is effective or that my feature works -->
27+
<!-- New and existing unit tests pass locally with my changes -->
28+
29+
cc @BranchMetrics/saas-sdk-devs for visibility.

‎.github/workflows/README.md

Whitespace-only changes.

‎.github/workflows/automation-trigger-test.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#on: [push]
2+
on:
3+
workflow_dispatch:
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/github-script@v6
10+
with:
11+
github-token: ${{ secrets.BRANCHLET_ACCESS_TOKEN_PUBLIC }}
12+
script: |
13+
await github.rest.actions.createWorkflowDispatch({
14+
owner: 'BranchMetrics',
15+
repo: 'qentelli-saas-sdk-cordova-testing-automation',
16+
workflow_id: 'cordova-manual.yml',
17+
ref: 'master'
18+
})

‎.github/workflows/stale.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
2+
#
3+
# You can adjust the behavior by modifying this file.
4+
# For more information, see:
5+
# https://github.com/actions/stale
6+
name: Mark stale issues
7+
8+
on:
9+
schedule:
10+
- cron: '0 0 * * *'
11+
12+
jobs:
13+
stale:
14+
15+
runs-on: ubuntu-latest
16+
permissions:
17+
issues: write
18+
19+
steps:
20+
- uses: actions/stale@v5
21+
with:
22+
repo-token: ${{ secrets.STALE_PERSONAL_ACCESS_TOKEN }}
23+
days-before-issue-stale: 60
24+
days-before-close: 7
25+
stale-issue-message: 'This issue has been automatically marked as stale due to inactivity for 60 days. If this issue is still relevant, please respond with any updates or this issue will be closed in 7 days. If you believe this is a mistake, please comment to let us know. Thank you for your contributions.'
26+
stale-issue-label: 'no-issue-activity'
27+
close-issue-message: 'This issue has been closed due to inactivity. If this issue is still relevant, please reopen it or create a new one. Thank you for your contributions.'
28+
start-date: '2023-05-22'

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ npm-debug.log*
99
yarn-error.log*
1010
.vscode
1111
.idea
12+
cordova-ionic-phonegap-branch-deep-linking-attribution.iml
1213
src/android/.idea

‎CHANGELOG.md

+44
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,47 @@
1+
5.2.1 Jan 4, 2023
2+
* Fix Javascript method setLogging to enable logging in the native layer.
3+
* Update Android SDK to 5.2.7
4+
* Update iOS SDK to 1.45.2
5+
6+
5.2.0 August 8th, 2022
7+
* Update iOS SDK to 1.43.1
8+
* Update Android SDK to 5.2.0
9+
* Added method to generate Branch QR codes, getBranchQRCode().
10+
11+
5.1.0 May 27, 2022
12+
* Update iOS SDK to 1.42.0
13+
* Update Android SDK to 5.1.5
14+
* Update 3rd party dependencies. Of note the plist vulnerability. (Thanks Sujay-shetty)
15+
* Replace setDebug with setLogging and test devices. https://help.branch.io/using-branch/docs/adding-test-devices
16+
17+
5.0.2 February 9, 2022
18+
* Update dependencies to latest non-breaking versions, of note the shelljs vulnerability. (Thanks again Sujay-shetty!)
19+
20+
5.0.1 February 8, 2022
21+
* Remove request package (thanks for catching Sujay-shetty)
22+
23+
5.0.0 January 21, 2022
24+
* Add content items support in sendBranchEvent
25+
* Remove sendCommerceEvent
26+
* Fix bug where custom data would clobber other fields when creating event in Android plugin
27+
* Update iOS SDK to 1.40.2
28+
* Update Android SDK to 5.0.15
29+
30+
4.2.4 - May 3, 2021
31+
32+
CORE-1898 correct iOS API signature for LATD
33+
Fix alternate link domain issue - Thanks MaximBelov
34+
Fix exist check - Thanks MaximBelov
35+
36+
4.2.3 - April 29, 2021
37+
38+
Update Android SDK to 5.0.8
39+
40+
4.2.2 - April 28, 2021
41+
42+
Update iOS SDK to 1.39.2
43+
Update Android SDK to 5.0.7
44+
145
# [4.2.1](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/compare/v4.2.0...v4.2.1) (2020-11-05)
246

347
# [4.2.0](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/compare/v4.1.3...v4.2.0) (2020-8-26)

‎SECURITY.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Security Policy
2+
3+
## Reporting a Vulnerability
4+
If you discover a potential security issue in this project we ask that you notify Branch Security directly via email to [email protected]
5+
Please do not open GitHub issues or pull requests - this makes the problem immediately visible to everyone, including malicious actors.

‎package.json

+16-17
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "branch-cordova-sdk",
33
"description": "Branch Metrics Cordova SDK",
44
"main": "src/index.js",
5-
"version": "4.2.2",
5+
"version": "5.2.1",
66
"homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
77
"repository": {
88
"type": "git",
@@ -55,24 +55,23 @@
5555
]
5656
},
5757
"dependencies": {
58-
"fs": "0.0.1-security",
59-
"glob": "^7.1.4",
58+
"glob": "^8.0.3",
6059
"mkpath": "^1.0.0",
61-
"node-version-compare": "^1.0.1",
62-
"plist": "^3.0.1",
63-
"request": "^2.85.0",
64-
"shelljs": "^0.8.3",
65-
"xcode": "^2.0.0",
66-
"xml2js": "^0.4.19"
60+
"node-version-compare": "^1.0.3",
61+
"plist": "^3.0.5",
62+
"shelljs": "^0.8.5",
63+
"xcode": "^3.0.1",
64+
"xml2js": "^0.4.23"
6765
},
6866
"devDependencies": {
69-
"@commitlint/cli": "^8.3.5",
70-
"@commitlint/config-conventional": "^8.3.4",
71-
"eslint": "^6.8.0",
72-
"eslint-config-airbnb-base": "^14.1.0",
73-
"eslint-plugin-import": "^2.20.2",
74-
"husky": "^4.2.5",
75-
"lint-staged": "^10.1.7",
76-
"prettier": "^2.0.5"
67+
"fs": "0.0.1-security",
68+
"@commitlint/cli": "^17.0.1",
69+
"@commitlint/config-conventional": "^17.0.0",
70+
"eslint": "^8.16.0",
71+
"eslint-config-airbnb-base": "^15.0.0",
72+
"eslint-plugin-import": "^2.26.0",
73+
"husky": "^8.0.1",
74+
"lint-staged": "^12.4.2",
75+
"prettier": "^2.6.2"
7776
}
7877
}

‎plugin.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ SOFTWARE.
2424
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
2525
xmlns:android="http://schemas.android.com/apk/res/android"
2626
id="branch-cordova-sdk"
27-
version="4.2.2">
27+
version="5.2.1">
2828

2929
<!-- Description -->
3030
<name>branch-cordova-sdk</name>
@@ -63,7 +63,7 @@ SOFTWARE.
6363
<!-- Manifest configuration is done via a js script. We should move it to this config in the future. -->
6464

6565
<source-file src="src/android/io/branch/BranchSDK.java" target-dir="src/io/branch" />
66-
<framework src="io.branch.sdk.android:library:5.0.7"/>
66+
<framework src="io.branch.sdk.android:library:5.2.7"/>
6767
</platform>
6868

6969
<!-- iOS -->
@@ -84,10 +84,10 @@ SOFTWARE.
8484

8585
<podspec>
8686
<config>
87-
<source url="https://github.com/CocoaPods/Specs.git"/>
87+
<source url="https://cdn.cocoapods.org/"/>
8888
</config>
8989
<pods>
90-
<pod name="Branch" spec="~> 1.39.2" />
90+
<pod name="Branch" spec="~> 1.45.2" />
9191
</pods>
9292
</podspec>
9393
</platform>

0 commit comments

Comments
 (0)