Skip to content

Merge staging into main for Core 3.5.0 #784

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
merged 75 commits into from
Jul 24, 2025
Merged

Merge staging into main for Core 3.5.0 #784

merged 75 commits into from
Jul 24, 2025

Conversation

spoorthipujariadobe and others added 30 commits March 31, 2025 22:06
* Fix ordered search type lookup in event history

* add failure test case for event history ordered lookup
* Added handling for insert and insertIfNotExists rule consequence

* remove keys look up in event history insert/insertIfNotExists consequence

* Dispatch event after insert event history consequence

* Tests for insert & insertIfNotExists rule consequence

* update API dump

* fix failing functional test

* fix formatting issues

* addressing code review comments

* change fnv1a32 to produce 0 hash for empty mask map

* fix typo in log

* Adding additional tests for invalid event history rules

* fix test json content
in API 35. i.e about 6 months ago. This method is automatically
treated as no-op on all Android versions since being removed Chromium 119.

Also, the in-app message HTML templates provided out of the box
for in AJO UI do not use WebSQL. Additionally this technology is not supported since 2010.

If the customer does not WebSQL in their webpages, this should not affect them.
…#748)

* Adding capability to get content height from html and setting it to webView frame

* Updating tests according to the changes

* Fixing the functional test

* Adding the fitToContent flag with default value true

* Changing the approach from evaluateJavascript to handleJavascriptMessage

* Addressing the PR comments

* Added support for maxWidth in InAppMessageSettings (#753)

* Add support for maxWidth in InAppMessageSettings

* Update API dump

* revert onHeightReceived if check for fitToContent

* Add comments to explain maxWidth default value

* additional cases and comment fixes in max width tests

* fix a few more comments in MessageScreenTests

* lint fixes

---------

Co-authored-by: Spoorthi Pujari <63024083+spoorthipujariadobe@users.noreply.github.com>
[MOB-22892] Code changes computing webView in accordance with content…
…tion

Change ExtensionApi getHistoricalEvents API to be on par with Core iOS
PravinPK and others added 21 commits June 11, 2025 13:26
Merge `dev` to `staging` to pick up #767 for Core 3.4.1
* Dispatch consequence in an event for schema type if its not eventHistory

* Add support for nested lists to map flattening logic

* disable list flattening for ~all_url for backward compatibility

* Add more tests and rename existing to maintain uniformity

* Separate list and array flattening as extension functions

* Unit tests for list and array flattening extension functions

* Add entire rule consequence in event dispatched as a result of event history insert

* Set newest and oldest occurance to null for event not found in event history
Workflows:
- Update workflows to use `gha-android-3.4.1`
- Set the staging-dir to match the build artifact directories for individual extensions
- Utilize branch ref option to direct snapshots branches

Gradle:
- Update to use AEP SDK Gradle Plugin 3.4.0
- Fetch from central sonatype snapshots instead of OSS.

Makefile:
- Switch the `ci-publish-main` and `ci-publish-snapshot` to
 trigger the publish command.
- Point workflows to gha-android-3.4.2 that
  fixes build issues
Fix message inset calculation for InAppMessages
* Dispatch consequence in an event for schema type if its not eventHistory

* Add support for nested lists to map flattening logic

* disable list flattening for ~all_url for backward compatibility

* Add more tests and rename existing to maintain uniformity

* Separate list and array flattening as extension functions

* Unit tests for list and array flattening extension functions

* Add entire rule consequence in event dispatched as a result of event history insert

* Set newest and oldest occurance to null for event not found in event history

* early escape from insert/insertIfNotExists if event hash is 0
Merge dev into staging for Core 3.5.0
@prudrabhat prudrabhat changed the title Merge staging into dev for Core 3.5.0 Merge staging into main for Core 3.5.0 Jul 23, 2025
Copy link
Contributor

@spoorthipujariadobe spoorthipujariadobe left a comment

Choose a reason for hiding this comment

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

LGTM!

@prudrabhat prudrabhat merged commit 0e92035 into main Jul 24, 2025
21 checks passed
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.

6 participants