Skip to content

Commit 5cd12dd

Browse files
denischilikmparticle-automationrmi22186claudejunias-rokt
authored
chore: merge main into workstation/6.0-Release (#734)
* chore: Update submodules * chore: 5.78.3 (release) ## [5.78.3](v5.78.2...v5.78.3) (2026-03-11) ### Updates & Maintenance * bump actions/upload-artifact from 6 to 7 ([#649](#649)) ([0a188b1](0a188b1)) * Update submodules ([cbb17d7](cbb17d7)) * chore: Update submodules * chore: 5.78.4 (release) ## [5.78.4](v5.78.3...v5.78.4) (2026-03-23) ### Updates & Maintenance * Update submodules ([08dab75](08dab75)) * chore: Update submodules * chore: 5.78.5 (release) ## [5.78.5](v5.78.4...v5.78.5) (2026-03-25) ### Updates & Maintenance * Update submodules ([86d8d97](86d8d97)) * fix: increase MPLatch timeout from 5s to 30s (#695) * fix: increase MPLatch timeout from 5s to 30s The 5-second timeout is too short for WebView JS bridge tests running on newer GitHub Actions runner images (ubuntu24/20260309.50+). The MParticleJSInterfaceITest tests consistently fail because JS execution in the emulator WebView doesn't complete within 5 seconds on these environments. Increasing to 30 seconds provides sufficient margin while still catching genuine hangs via the workflow-level timeout-minutes: 15. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use explicit 30s timeout in JS bridge tests only Instead of increasing the global MPLatch timeout (used by 20+ test files), use an explicit 30-second await in MParticleJSInterfaceITest only. WebView JS execution needs more time on newer CI runner images, but other tests don't need the longer timeout. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: Add max persistence age override option [TRIAGE-608] (#699) * TRIAGE-608: Add max persistence age override option * TRIAGE-608: Update throttl ts on success + tests * TRIAGE-608: Make properties @VisibleForTesting * TRIAGE-608: Fix retry-on-failure throttle logic * feat: add customBaseURL CNAME support to NetworkOptions (#701) * feat: add customBaseURL CNAME support to NetworkOptions Adds NetworkOptions.Builder.setCustomBaseURL(String) which routes all mParticle endpoint traffic (config, events, identity, alias, audience) through a single HTTPS CNAME host. When set, customBaseURL takes priority over individual domain mappings and rewrites paths to match CDN routing: /config/v4/, /nativeevents/v2/, /identity/v1/, /nativeevents/v1/identity/, /nativeevents/v1/<key>/audience. Also adds R8 keep rules for MParticle$Internal and ConfigManager.getNetworkOptions() so kits can read customBaseURL after minification. The Rokt kit reads NetworkOptions.customBaseURL and forwards it to the Rokt SDK: mparticle-integrations/mparticle-android-integration-rokt#143 Mirrors iOS work from mparticle-apple-sdk#760. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: persist customBaseURL across NetworkOptions JSON round-trip NetworkOptions.toJson() and withNetworkOptions(String) did not include customBaseURL, so any value was silently dropped when UploadSettings serialized NetworkOptions to the upload database. Events and alias uploads read back NetworkOptions without customBaseURL and routed to the default mParticle endpoints instead of the partner CNAME. Also: - Extract the customBaseURL/DomainMapping host-resolution branch out of getUrl() into a private resolveHost() helper plus a small ResolvedHost value type, lowering getUrl()'s cyclomatic complexity. - Switch java.net.URL / java.net.MalformedURLException to imports. - Add two androidTest cases covering the round-trip. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * test(android-core): cover custom base URL upload storage --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: Thomson Thomas <thomson.thomas@rokt.com> * chore: Update submodules * chore: 5.79.0 (release) ## [5.79.0](v5.78.5...v5.79.0) (2026-05-14) ### Features * add customBaseURL CNAME support to NetworkOptions ([#701](#701)) ([5285149](5285149)), closes [mparticle-apple-sdk#760](mParticle/mparticle-apple-sdk#760) * Add max persistence age override option [TRIAGE-608] ([#699](#699)) ([ca88322](ca88322)) ### Bug Fixes * increase MPLatch timeout from 5s to 30s ([#695](#695)) ([20f723f](20f723f)) ### Updates & Maintenance * Update submodules ([59a4a9a](59a4a9a)) * chore: bump trunk-io/trunk-action from 1.2.4 to 1.3.1 (#705) Bumps [trunk-io/trunk-action](https://github.com/trunk-io/trunk-action) from 1.2.4 to 1.3.1. - [Release notes](https://github.com/trunk-io/trunk-action/releases) - [Commits](trunk-io/trunk-action@75699af...04ba50e) --- updated-dependencies: - dependency-name: trunk-io/trunk-action dependency-version: 1.3.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Handle legacy persisted domain mappings safely (#703) Co-authored-by: James Newman <james.newman@rokt.com> * fix(ci): pin isolated-kit gradle version to prevent 6.0.0-rc.1 pull (#714) The isolated urbanairship-kit lint/test steps in daily.yml and the kit-compatibility test in pull-request.yml run `./gradlew` from inside the kit dir without `-Pversion=...`. The kit's standalone build.gradle defaults `project.version = '+'`, so its `com.mparticle:android-kit-plugin` dependency resolves to the highest version on Maven Central — now `6.0.0-rc.1` (published 2026-05-22), which renamed/removed kit-base symbols and broke the kit's compile. Mirror the pattern already used in the Sonatype Release job: extract the SDK version via `./gradlew -q properties` and pass it as `-Pversion=...` to every standalone kit invocation, so it resolves the freshly-published mavenLocal artifact instead of the RC. Affected steps: - lint-checks → Run Isolated Kit Lint (urbanairship-kit) - kotlin-lint-checks → Run Isolated Kit Kotlin Lint (urbanairship-kit) - update-kits → Test Isolated Kits (urbanairship-kit) - kit-compatibility-test → Run Isolated Kit Compatibility Tests (urbanairship-kit) The companion defensive fix in mparticle-android-integration-urbanairship pins the kit's standalone `project.version` to `[5.0,6.0)`. Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: Update submodules * chore: 5.79.1 (release) ## [5.79.1](v5.79.0...v5.79.1) (2026-05-27) ### Bug Fixes * **ci:** pin isolated-kit gradle version to prevent 6.0.0-rc.1 pull ([#714](#714)) ([eff10ea](eff10ea)) ### Updates & Maintenance * bump trunk-io/trunk-action from 1.2.4 to 1.3.1 ([#705](#705)) ([f4ceca7](f4ceca7)) * Update submodules ([e435979](e435979)) * ci: remove cross-platform-tests and semantic PR/branch checks (#712) These checks have been failing on nearly every recent PR. The cross-platform tests are known broken, and the semantic PR title / branch name checks are no longer enforced. Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: bump actions/checkout from 6.0.2 to 6.0.3 (#720) Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.2 to 6.0.3. - [Release notes](https://github.com/actions/checkout/releases) - [Commits](actions/checkout@v6.0.2...v6.0.3) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 6.0.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: Update submodules * chore: 5.79.2 (release) ## [5.79.2](v5.79.1...v5.79.2) (2026-06-22) ### Updates & Maintenance * bump actions/checkout from 6.0.2 to 6.0.3 ([#720](#720)) ([d904edb](d904edb)) * remove cross-platform-tests and semantic PR/branch checks ([#712](#712)) ([6cdacf2](6cdacf2)) * Update submodules ([976dd0d](976dd0d)) * feat: add device-based consent to override MPID-scoped consent (#726) Enables Inspire-style flows where consent is collected before MPID changes at checkout, so kit forwarding rules and uploads keep the correct consent state. * chore: 5.80.0 (release) ## [5.80.0](v5.79.2...v5.80.0) (2026-06-25) ### Features * add device-based consent to override MPID-scoped consent ([#726](#726)) ([e92d352](e92d352)) * chore: normalize CHANGELOG list markers after merge * ci: pin actions/checkout to commit SHA to satisfy security lint * docs: remove duplicate Unreleased changelog section --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: mparticle-automation <developers@mparticle.com> Co-authored-by: Robert Ing <ring@mparticle.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: junias-rokt <junias.ngoyi@rokt.com> Co-authored-by: James Newman <james.newman@rokt.com> Co-authored-by: Thomson Thomas <thomson.thomas@rokt.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ankitsingh08 <ankit.tomar08@gmail.com>
1 parent 668bf22 commit 5cd12dd

28 files changed

Lines changed: 851 additions & 118 deletions

‎.github/workflows/cross-platform-tests.yml‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎.github/workflows/daily.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
GIT_COMMITTER_EMAIL: developers@mparticle.com
4646
steps:
4747
- name: "Clone branch"
48-
uses: actions/checkout@v6
48+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4949
with:
5050
token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
5151
repository: mparticle/mparticle-android-sdk
@@ -69,7 +69,7 @@ jobs:
6969
# needs: create-regression-branch
7070
# steps:
7171
# - name: "Checkout future release branch"
72-
# uses: actions/checkout@v6
72+
# uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
7373
# with:
7474
# repository: mparticle/mparticle-android-sdk
7575
# ref: regression/${{ github.run_number }}
@@ -102,7 +102,7 @@ jobs:
102102
# needs: create-regression-branch
103103
# steps:
104104
# - name: "Checkout Branch"
105-
# uses: actions/checkout@v6
105+
# uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
106106
# with:
107107
# repository: mparticle/mparticle-android-sdk
108108
# ref: regression/${{ github.run_number }}
@@ -192,7 +192,7 @@ jobs:
192192
needs: create-regression-branch
193193
steps:
194194
- name: "Checkout future release branch"
195-
uses: actions/checkout@v6
195+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
196196
with:
197197
repository: mparticle/mparticle-android-sdk
198198
ref: regression/${{ github.run_number }}
@@ -221,7 +221,7 @@ jobs:
221221
needs: create-regression-branch
222222
steps:
223223
- name: "Checkout Branch"
224-
uses: actions/checkout@v6
224+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
225225
with:
226226
ref: regression/${{ github.run_number }}
227227
- run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
@@ -264,7 +264,7 @@ jobs:
264264
needs: create-regression-branch
265265
steps:
266266
- name: "Checkout Branch"
267-
uses: actions/checkout@v6
267+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
268268
with:
269269
ref: regression/${{ github.run_number }}
270270
- run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
@@ -311,7 +311,7 @@ jobs:
311311
GIT_COMMITTER_EMAIL: developers@mparticle.com
312312
steps:
313313
- name: "Checkout future release branch"
314-
uses: actions/checkout@v6
314+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
315315
with:
316316
repository: mparticle/mparticle-android-sdk
317317
ref: regression/${{ github.run_number }}
@@ -346,7 +346,7 @@ jobs:
346346
GIT_COMMITTER_EMAIL: developers@mparticle.com
347347
steps:
348348
- name: "Checkout public main branch"
349-
uses: actions/checkout@v6
349+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
350350
with:
351351
fetch-depth: 0
352352
ref: main
@@ -377,7 +377,7 @@ jobs:
377377
GIT_COMMITTER_EMAIL: developers@mparticle.com
378378
steps:
379379
- name: "Checkout repo"
380-
uses: actions/checkout@v6
380+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
381381
with:
382382
token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
383383
fetch-depth: 0

‎.github/workflows/pull-request.yml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,14 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 #v5.0.0
22+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 #v5.0.0
2323
- name: Trunk Check
24-
uses: trunk-io/trunk-action@75699af9e26881e564e9d832ef7dc3af25ec031b # v1.2.4
24+
uses: trunk-io/trunk-action@04ba50e7658c81db7356da96657e6e77f220bfa3 # v1.3.1
2525
with:
2626
check-mode: pull_request
2727
pr-check-hadcoded-secrets:
2828
name: "Check PR for hardcoded secrets"
2929
uses: mParticle/mparticle-workflows/.github/workflows/security-hardcoded-secrets.yml@main
30-
pr-branch-check-name:
31-
name: "Check PR for semantic branch name"
32-
uses: mParticle/mparticle-workflows/.github/workflows/pr-branch-check-name.yml@main
33-
pr-title-check:
34-
name: "Check PR for semantic title"
35-
uses: mParticle/mparticle-workflows/.github/workflows/pr-title-check.yml@main
3630

3731
instrumented-core:
3832
uses: ./.github/workflows/instrumented-tests.yml
@@ -75,7 +69,7 @@ jobs:
7569
runs-on: ubuntu-latest
7670
steps:
7771
- name: "Checkout Branch"
78-
uses: actions/checkout@v6
72+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
7973
- name: "Install JDK 17"
8074
uses: actions/setup-java@v5
8175
with:
@@ -99,7 +93,7 @@ jobs:
9993
runs-on: macos-latest
10094
steps:
10195
- name: "Checkout Branch"
102-
uses: actions/checkout@v6
96+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
10397
- run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
10498
- run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
10599
- name: "Install JDK 17"
@@ -126,7 +120,7 @@ jobs:
126120
runs-on: macos-latest
127121
steps:
128122
- name: "Checkout Branch"
129-
uses: actions/checkout@v6
123+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
130124
- run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
131125
- run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
132126
- name: "Install JDK 17"
@@ -162,7 +156,7 @@ jobs:
162156
if: github.event_name == 'pull_request'
163157
steps:
164158
- name: "Checkout Branch"
165-
uses: actions/checkout@v6
159+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
166160
- run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
167161
- run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
168162
- name: "Install JDK 17"

‎CHANGELOG.md‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,65 @@
120120

121121
- Migrate Rokt contracts and facade ownership to rokt-kit ([#700](https://github.com/mParticle/mparticle-android-sdk/pull/700))
122122

123+
## [5.80.0](https://github.com/mParticle/mparticle-android-sdk/compare/v5.79.2...v5.80.0) (2026-06-25)
124+
125+
### Features
126+
127+
- add device-based consent to override MPID-scoped consent ([#726](https://github.com/mParticle/mparticle-android-sdk/issues/726)) ([e92d352](https://github.com/mParticle/mparticle-android-sdk/commit/e92d3522a350be90a1f15eb3b81d5e6f089f1aed))
128+
129+
## [5.79.2](https://github.com/mParticle/mparticle-android-sdk/compare/v5.79.1...v5.79.2) (2026-06-22)
130+
131+
### Updates & Maintenance
132+
133+
- bump actions/checkout from 6.0.2 to 6.0.3 ([#720](https://github.com/mParticle/mparticle-android-sdk/issues/720)) ([d904edb](https://github.com/mParticle/mparticle-android-sdk/commit/d904edb0a944a2ce813e7dc31c026f0b2f7ccecb))
134+
- remove cross-platform-tests and semantic PR/branch checks ([#712](https://github.com/mParticle/mparticle-android-sdk/issues/712)) ([6cdacf2](https://github.com/mParticle/mparticle-android-sdk/commit/6cdacf2926e02e2359352dbcf12b4e4bb66236fa))
135+
- Update submodules ([976dd0d](https://github.com/mParticle/mparticle-android-sdk/commit/976dd0d13d6aa27f805a6b06a73d923f1a207e80))
136+
137+
## [5.79.1](https://github.com/mParticle/mparticle-android-sdk/compare/v5.79.0...v5.79.1) (2026-05-27)
138+
139+
### Bug Fixes
140+
141+
- **ci:** pin isolated-kit gradle version to prevent 6.0.0-rc.1 pull ([#714](https://github.com/mParticle/mparticle-android-sdk/issues/714)) ([eff10ea](https://github.com/mParticle/mparticle-android-sdk/commit/eff10ead69167f0ea3df248b2bbed089397600cd))
142+
143+
### Updates & Maintenance
144+
145+
- bump trunk-io/trunk-action from 1.2.4 to 1.3.1 ([#705](https://github.com/mParticle/mparticle-android-sdk/issues/705)) ([f4ceca7](https://github.com/mParticle/mparticle-android-sdk/commit/f4ceca7de2c2ba01ea87c98698ef7bb84991b4ab))
146+
- Update submodules ([e435979](https://github.com/mParticle/mparticle-android-sdk/commit/e435979e1e966ef2b318bb29135852f9d55df55a))
147+
148+
## [5.79.0](https://github.com/mParticle/mparticle-android-sdk/compare/v5.78.5...v5.79.0) (2026-05-14)
149+
150+
### Features
151+
152+
- add customBaseURL CNAME support to NetworkOptions ([#701](https://github.com/mParticle/mparticle-android-sdk/issues/701)) ([5285149](https://github.com/mParticle/mparticle-android-sdk/commit/5285149118b58cbd5cf4fb90cb58627deb7538b9)), closes [mparticle-apple-sdk#760](https://github.com/mParticle/mparticle-apple-sdk/issues/760)
153+
- Add max persistence age override option [TRIAGE-608] ([#699](https://github.com/mParticle/mparticle-android-sdk/issues/699)) ([ca88322](https://github.com/mParticle/mparticle-android-sdk/commit/ca88322ac7ef8649ed111cf28afb81d99cdb271a))
154+
155+
### Bug Fixes
156+
157+
- increase MPLatch timeout from 5s to 30s ([#695](https://github.com/mParticle/mparticle-android-sdk/issues/695)) ([20f723f](https://github.com/mParticle/mparticle-android-sdk/commit/20f723f27cf296c879ceebc9d234edca039ab371))
158+
159+
### Updates & Maintenance
160+
161+
- Update submodules ([59a4a9a](https://github.com/mParticle/mparticle-android-sdk/commit/59a4a9a68e3addfaf5c4eea1afd396889721819d))
162+
163+
## [5.78.5](https://github.com/mParticle/mparticle-android-sdk/compare/v5.78.4...v5.78.5) (2026-03-25)
164+
165+
### Updates & Maintenance
166+
167+
- Update submodules ([86d8d97](https://github.com/mParticle/mparticle-android-sdk/commit/86d8d9748a0c7a796dd0b0be6722f92acef301ea))
168+
169+
## [5.78.4](https://github.com/mParticle/mparticle-android-sdk/compare/v5.78.3...v5.78.4) (2026-03-23)
170+
171+
### Updates & Maintenance
172+
173+
- Update submodules ([08dab75](https://github.com/mParticle/mparticle-android-sdk/commit/08dab75e3715733f6f5655fbf39fbce16a2e01a2))
174+
175+
## [5.78.3](https://github.com/mParticle/mparticle-android-sdk/compare/v5.78.2...v5.78.3) (2026-03-11)
176+
177+
### Updates & Maintenance
178+
179+
- bump actions/upload-artifact from 6 to 7 ([#649](https://github.com/mParticle/mparticle-android-sdk/issues/649)) ([0a188b1](https://github.com/mParticle/mparticle-android-sdk/commit/0a188b1f88efde471f8d6bff2aa8611b1b4bf956))
180+
- Update submodules ([cbb17d7](https://github.com/mParticle/mparticle-android-sdk/commit/cbb17d7e359d41d8d7577a9516cf7788c7288442))
181+
123182
## [5.78.2](https://github.com/mParticle/mparticle-android-sdk/compare/v5.78.1...v5.78.2) (2026-02-27)
124183

125184
### Bug Fixes

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ You can grab the Core SDK via Maven Central. Please see the badge above and foll
2020

2121
```groovy
2222
dependencies {
23-
implementation 'com.mparticle:android-core:5.78.2'
23+
implementation 'com.mparticle:android-core:5.80.0'
2424
}
2525
```
2626

@@ -31,8 +31,8 @@ Several integrations require additional client-side add-on libraries called "kit
3131
```groovy
3232
dependencies {
3333
implementation (
34-
'com.mparticle:android-example-kit:5.78.2',
35-
'com.mparticle:android-another-kit:5.78.2'
34+
'com.mparticle:android-example-kit:5.80.0',
35+
'com.mparticle:android-another-kit:5.80.0'
3636
)
3737
}
3838
```

0 commit comments

Comments
 (0)