Skip to content

Conversation

@thomson-t
Copy link
Contributor

Instructions

  1. PR target branch should be against development
  2. PR title name should follow this format: https://github.com/mParticle/mparticle-workflows/blob/stable/.github/workflows/pr-title-check.yml
  3. PR branch prefix should follow this format: https://github.com/mParticle/mparticle-workflows/blob/stable/.github/workflows/pr-branch-check-name.yml

Summary

Merging development branch to main and fixing desugar build errors

Testing Plan

  • {explain how this has been tested, and what additional testing should be done}

Reference Issue

markvdouw and others added 4 commits November 10, 2022 09:16
* feat: sideloaded kit integration (#211)

* Sideloaded kit integration

* Testing sideloading integration

* Fix dependency version

* Changes due to comments

* Adding kitId in constructor due to change in architecture

* Implementing default functions from KitIntegration

* Adding minimal sideloading kit example and kit-base dependency

* Base updates for AGP

* Remove excessive logging

* Update deps to use BOM and add Rokt

* Add Rokt overlay placement post checkout

* Add Rokt close implementation

* Add event logging and auto close

* Migrate to toml version management

* Add lint baseline

* Add standard files

* Migrate missed plugins

* Add versions to toml file

* Add permissions

* Bump upload artifact version

* Add concurrency

* Remove main qualifier

* Use local reference

* Bump versions

* Change runner to recommended by reactivecircus

* Bump gradle version

* Update settings.gradle.kts

---------

Co-authored-by: markvdouw <v-mvanderouw@mparticle.com>
Copy link
Contributor

@jamesnrokt jamesnrokt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! 🙌
I forgot we had done the Rokt integration

@thomson-t thomson-t merged commit a3275e2 into main Nov 24, 2025
37 of 38 checks passed
@thomson-t thomson-t deleted the chore/merge-main branch November 24, 2025 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants