-
Notifications
You must be signed in to change notification settings - Fork 70
chore: merge main into workstation/6.0-Release #734
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.
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
Merged
denischilik
merged 27 commits into
workstation/6.0-Release
from
chore/merge-main-into-6.0-release
Jul 17, 2026
Merged
Changes from all commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
cbb17d7
chore: Update submodules
mparticle-automation 892a778
chore: 5.78.3 (release)
mparticle-automation 08dab75
chore: Update submodules
mparticle-automation 6bfb6af
chore: 5.78.4 (release)
mparticle-automation 86d8d97
chore: Update submodules
mparticle-automation 83b24bf
chore: 5.78.5 (release)
mparticle-automation 20f723f
fix: increase MPLatch timeout from 5s to 30s (#695)
rmi22186 ca88322
feat: Add max persistence age override option [TRIAGE-608] (#699)
junias-rokt 5285149
feat: add customBaseURL CNAME support to NetworkOptions (#701)
jamesnrokt 59a4a9a
chore: Update submodules
mparticle-automation 3593cdc
chore: 5.79.0 (release)
mparticle-automation f4ceca7
chore: bump trunk-io/trunk-action from 1.2.4 to 1.3.1 (#705)
dependabot[bot] 491f169
Handle legacy persisted domain mappings safely (#703)
ankitsingh08 eff10ea
fix(ci): pin isolated-kit gradle version to prevent 6.0.0-rc.1 pull (…
jamesnrokt e435979
chore: Update submodules
mparticle-automation fa5bf5f
chore: 5.79.1 (release)
mparticle-automation 6cdacf2
ci: remove cross-platform-tests and semantic PR/branch checks (#712)
jamesnrokt d904edb
chore: bump actions/checkout from 6.0.2 to 6.0.3 (#720)
dependabot[bot] 976dd0d
chore: Update submodules
mparticle-automation cbaa623
chore: 5.79.2 (release)
mparticle-automation e92d352
feat: add device-based consent to override MPID-scoped consent (#726)
denischilik 6c2079e
chore: 5.80.0 (release)
mparticle-automation e6cc8db
Merge remote-tracking branch 'origin/main' into chore/merge-main-into…
denischilik 0b5056f
chore: normalize CHANGELOG list markers after merge
denischilik 5d88d15
ci: pin actions/checkout to commit SHA to satisfy security lint
denischilik d0df6b4
Merge remote-tracking branch 'origin/workstation/6.0-Release' into ch…
denischilik 0c13ba1
docs: remove duplicate Unreleased changelog section
denischilik File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,7 @@ You can grab the Core SDK via Maven Central. Please see the badge above and foll | |
|
|
||
| ```groovy | ||
| dependencies { | ||
| implementation 'com.mparticle:android-core:5.78.2' | ||
| implementation 'com.mparticle:android-core:5.80.0' | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For the 6.0 branch shouldn't this be something like |
||
| } | ||
| ``` | ||
|
|
||
|
|
@@ -31,8 +31,8 @@ Several integrations require additional client-side add-on libraries called "kit | |
| ```groovy | ||
| dependencies { | ||
| implementation ( | ||
| 'com.mparticle:android-example-kit:5.78.2', | ||
| 'com.mparticle:android-another-kit:5.78.2' | ||
| 'com.mparticle:android-example-kit:5.80.0', | ||
| 'com.mparticle:android-another-kit:5.80.0' | ||
| ) | ||
| } | ||
| ``` | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is actually the sha for v6.0.3