Skip to content

Commit

Permalink
Merge branch 'master' into feat-initSessionWithCallback
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/android/io/branch/BranchSDK.java
  • Loading branch information
MaximBelov committed Jun 13, 2023
2 parents 5f755b5 + 70de5d2 commit 2774bf9
Show file tree
Hide file tree
Showing 23 changed files with 598 additions and 726 deletions.
74 changes: 74 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
---
assignees: []
body:
-
attributes:
description: "What is the problem? A clear and concise description of what the bug is."
label: "Describe the bug"
placeholder: "Tell us what you see!"
id: description
type: textarea
validations:
required: true
-
attributes:
description: "Please provide as much step-by-step detail as possible including logs, stack traces, and uncaught exceptions."
label: "Steps to reproduce"
value: |
1.
2.
3.
id: steps
type: textarea
validations:
required: true
-
attributes:
description: "What did you expect to happen?"
label: "Expected behavior"
id: expected
type: textarea
validations:
required: true
-
attributes:
description: "What version of sdk are you seeing this issue on?"
label: "SDK Version"
placeholder: "5.2.0"
id: sdk-version
type: input
validations:
required: true
-
attributes:
description: "What devices or emulators are you seeing this bug on?"
label: Make and Model
placeholder: "iPhone 13 / Samsung S21"
id: device
type: input
validations:
required: true
-
attributes:
description: "What version of the device OS?"
label: OS
placeholder: "iOS 15.6.1 / Android 12"
id: os
type: input
validations:
required: true
-
attributes:
description: "Anything else that might be relevant for troubleshooting this bug. Any screenshots or videos that show the issue are very helpful."
label: "Additional Information/Context"
id: context
type: textarea
validations:
required: false

description: "Found a bug in the Branch Cordova SDK? File it here."
labels:
- bug
- needs-triage
name: "🐞 Bug report"
title: "(short issue description)"
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
blank_issues_enabled: false
contact_links:
- name: "📕 Documentation Issue"
url: https://help.branch.io/developers-hub/docs/cordova-phonegap-ionic
about: Report an issue in the Branch Cordova SDK Reference documentation by clicking "Suggest edits" button on the documentation page.
- name: "Branch Support"
url: https://help.branch.io/using-branch/page/submit-a-ticket
about: If you are having general trouble with Branch Cordova SDK integration, please submit a ticket to Branch Support.
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: 🚀 Feature Request
description: Suggest an idea for this project
title: "(short issue description)"
labels: [feature-request, needs-triage]
assignees: []
body:
- type: textarea
id: description
attributes:
label: Describe the feature
description: A clear and concise description of the feature you are proposing.
validations:
required: true
29 changes: 29 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
## Reference
SDK-XXXX -- <TITLE>.

## Summary
<!-- Simple summary of what was changed. -->

## Motivation
<!-- 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. -->

## Type Of Change
<!-- Please delete options that are not relevant -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] This change requires a documentation update

## Testing Instructions
<!-- Testing instructions, example code snippets, etc -->


<!-- Checklist -->
<!-- My code follows the style guidelines of this project -->
<!-- I have performed a self-review of my code -->
<!-- I have commented my code, particularly in hard-to-understand areas -->
<!-- I have made corresponding changes to the documentation -->
<!-- I have added tests that prove my fix is effective or that my feature works -->
<!-- New and existing unit tests pass locally with my changes -->

cc @BranchMetrics/saas-sdk-devs for visibility.
Empty file added .github/workflows/README.md
Empty file.
18 changes: 18 additions & 0 deletions .github/workflows/automation-trigger-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#on: [push]
on:
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v6
with:
github-token: ${{ secrets.BRANCHLET_ACCESS_TOKEN_PUBLIC }}
script: |
await github.rest.actions.createWorkflowDispatch({
owner: 'BranchMetrics',
repo: 'qentelli-saas-sdk-cordova-testing-automation',
workflow_id: 'cordova-manual.yml',
ref: 'master'
})
28 changes: 28 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
#
# You can adjust the behavior by modifying this file.
# For more information, see:
# https://github.com/actions/stale
name: Mark stale issues

on:
schedule:
- cron: '0 0 * * *'

jobs:
stale:

runs-on: ubuntu-latest
permissions:
issues: write

steps:
- uses: actions/stale@v5
with:
repo-token: ${{ secrets.STALE_PERSONAL_ACCESS_TOKEN }}
days-before-issue-stale: 60
days-before-close: 7
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.'
stale-issue-label: 'no-issue-activity'
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.'
start-date: '2023-05-22'
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ npm-debug.log*
yarn-error.log*
.vscode
.idea
cordova-ionic-phonegap-branch-deep-linking-attribution.iml
src/android/.idea
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,47 @@
5.2.1 Jan 4, 2023
* Fix Javascript method setLogging to enable logging in the native layer.
* Update Android SDK to 5.2.7
* Update iOS SDK to 1.45.2

5.2.0 August 8th, 2022
* Update iOS SDK to 1.43.1
* Update Android SDK to 5.2.0
* Added method to generate Branch QR codes, getBranchQRCode().

5.1.0 May 27, 2022
* Update iOS SDK to 1.42.0
* Update Android SDK to 5.1.5
* Update 3rd party dependencies. Of note the plist vulnerability. (Thanks Sujay-shetty)
* Replace setDebug with setLogging and test devices. https://help.branch.io/using-branch/docs/adding-test-devices

5.0.2 February 9, 2022
* Update dependencies to latest non-breaking versions, of note the shelljs vulnerability. (Thanks again Sujay-shetty!)

5.0.1 February 8, 2022
* Remove request package (thanks for catching Sujay-shetty)

5.0.0 January 21, 2022
* Add content items support in sendBranchEvent
* Remove sendCommerceEvent
* Fix bug where custom data would clobber other fields when creating event in Android plugin
* Update iOS SDK to 1.40.2
* Update Android SDK to 5.0.15

4.2.4 - May 3, 2021

CORE-1898 correct iOS API signature for LATD
Fix alternate link domain issue - Thanks MaximBelov
Fix exist check - Thanks MaximBelov

4.2.3 - April 29, 2021

Update Android SDK to 5.0.8

4.2.2 - April 28, 2021

Update iOS SDK to 1.39.2
Update Android SDK to 5.0.7

# [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)
Expand Down
5 changes: 5 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Security Policy

## Reporting a Vulnerability
If you discover a potential security issue in this project we ask that you notify Branch Security directly via email to [email protected]
Please do not open GitHub issues or pull requests - this makes the problem immediately visible to everyone, including malicious actors.
33 changes: 16 additions & 17 deletions package.json
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": "4.2.2",
"version": "5.2.1",
"homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
"repository": {
"type": "git",
Expand Down Expand Up @@ -55,24 +55,23 @@
]
},
"dependencies": {
"fs": "0.0.1-security",
"glob": "^7.1.4",
"glob": "^8.0.3",
"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"
"node-version-compare": "^1.0.3",
"plist": "^3.0.5",
"shelljs": "^0.8.5",
"xcode": "^3.0.1",
"xml2js": "^0.4.23"
},
"devDependencies": {
"@commitlint/cli": "^8.3.5",
"@commitlint/config-conventional": "^8.3.4",
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.1.0",
"eslint-plugin-import": "^2.20.2",
"husky": "^4.2.5",
"lint-staged": "^10.1.7",
"prettier": "^2.0.5"
"fs": "0.0.1-security",
"@commitlint/cli": "^17.0.1",
"@commitlint/config-conventional": "^17.0.0",
"eslint": "^8.16.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.26.0",
"husky": "^8.0.1",
"lint-staged": "^12.4.2",
"prettier": "^2.6.2"
}
}
8 changes: 4 additions & 4 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2">
version="5.2.1">

<!-- Description -->
<name>branch-cordova-sdk</name>
Expand Down Expand Up @@ -63,7 +63,7 @@ SOFTWARE.
<!-- 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" />
<framework src="io.branch.sdk.android:library:5.0.7"/>
<framework src="io.branch.sdk.android:library:5.2.7"/>
</platform>

<!-- iOS -->
Expand All @@ -84,10 +84,10 @@ SOFTWARE.

<podspec>
<config>
<source url="https://github.com/CocoaPods/Specs.git"/>
<source url="https://cdn.cocoapods.org/"/>
</config>
<pods>
<pod name="Branch" spec="~> 1.39.2" />
<pod name="Branch" spec="~> 1.45.2" />
</pods>
</podspec>
</platform>
Expand Down
Loading

0 comments on commit 2774bf9

Please sign in to comment.