chore: merge main into workstation/6.0-Release

[denischilik]

Summary

Merges main into workstation/6.0-Release to bring the 6.0 release branch up to date before the final merge back to main.

What main brings in

• Device-based consent feature (MParticleOptions.Builder.deviceBasedConsentEnabled(), MParticle.getDeviceConsentState() / setDeviceConsentState()) and related core changes in upload/batch/config handling, plus a new instrumented UploadServiceTest.
• CI maintenance from main (actions/checkout pinned to v6.0.3, removal of cross-platform-tests.yml).

Conflict resolutions

• 33 kit submodules + release.yml: kept the 6.0 branch deletions (kits live in-tree now; Rokt release workflows replace release.yml).
• build.gradle: kept 6.0 versioning from the VERSION file; dropped main's 5.80.0-SNAPSHOT block.
• MParticleOptions.java: kept main's new consent APIs and kept the 6.0 removal of deprecated isAndroidIdDisabled() / androidIdDisabled().
• MParticleBaseClientImpl.java: kept the 6.0 domain-mapping warning condition (suppresses the false warning when the mapping equals the default URL).
• ApiVisibilityTest.kt: recounted the public API surface after the merge (66 base − 4 removed on 6.0 + 3 added on main = 65); verified by running the test.
• daily.yml / pull-request.yml: kept the 6.0 monorepo kit paths, split instrumented jobs, and VERSION-based versioning; adopted main's checkout@v6.0.3 pin; dropped submodules: recursive (no submodules on 6.0).
• CHANGELOG.md: rebuilt as an ordered union (6.0 sections, then main's 5.78.3–5.80.0 sections, then shared history); regenerated at release time anyway.

Test plan

• ./gradlew test passes locally (core + kit-base, debug and release variants)
• ApiVisibilityTest verified with recounted public method count
• trunk check clean on changed files
• CI instrumented tests (covers main's new UploadServiceTest and upload/consent core changes)

[cursor]

PR Summary

Medium Risk
Introduces consent override and upload-time DB pruning that affect event forwarding and local data retention; scope is large but covered by new tests—CI instrumented runs remain the main validation gap.

Overview
Syncs workstation/6.0-Release with main so the 6.0 line picks up recent core SDK and CI work ahead of merging back to main.

Core behavior from main: Adds device-based consent (deviceBasedConsentEnabled, device consent get/set on MParticle, getEffectiveConsentState for kits and batch uploads). Adds optional persistenceMaxAgeSeconds with age-based pruning of messages, uploads, and sessions during upload (90-day default, 24-hour sweep throttle). Hardens NetworkOptions / domain-mapping JSON (skip invalid mappings, legacy overridesSubdirectory default).

CI / repo hygiene: Deletes cross-platform-tests.yml, pins actions/checkout to v6.0.3, bumps Trunk to v1.3.1, and drops semantic PR title/branch workflow jobs from pull-request.yml while keeping 6.0’s in-tree kit paths and split instrumented jobs.

Tests & docs: New/expanded instrumented and unit coverage for persistence deletes and consent; WebView JS tests use 30s latch timeouts; ApiVisibilityTest expects 65 public MParticle methods; CHANGELOG.md and README sample versions updated for merged release notes.

^{Reviewed by Cursor Bugbot for commit 0c13ba1. Bugbot is set up for automated code reviews on this repo. Configure here.}

[BrandonStalnaker]

There's a few documentation related nits that you might want to fix or do a separate PR for but the actual code looks good. At lest in relation to the changes I fully understand.

[BrandonStalnaker]

I think we've got 2 Unreleased Sections #1

[BrandonStalnaker]

#2 Unreleased section

[BrandonStalnaker]

For the 6.0 branch shouldn't this be something like 6.0.0-rc.1

[BrandonStalnaker]

I think this is actually the sha for v6.0.3

[cursor]

Cursor Bugbot has reviewed your changes using default effort and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit d0df6b4. Configure here.}

[cursor]

MPID consent ignored with override

Medium Severity

When a device consent override is still stored but deviceBasedConsentEnabled is off, setConsentState updates MPID storage only. getEffectiveConsentState keeps returning the device override, so uploads, user-facing consent reads, and onConsentStateUpdated can see no change after an MPID consent update.

 

^{Reviewed by Cursor Bugbot for commit d0df6b4. Configure here.}

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud