Skip to content

staging to main#140

Merged
akhiljain1907 merged 50 commits intomainfrom
staging
Apr 28, 2025
Merged

staging to main#140
akhiljain1907 merged 50 commits intomainfrom
staging

Conversation

@akhiljain1907
Copy link
Copy Markdown
Contributor

@akhiljain1907 akhiljain1907 commented Apr 28, 2025

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have signed the Adobe Open Source CLA.
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

akhiljain1907 and others added 30 commits September 24, 2024 23:07
@akhiljain1907
added trackDisplayedProposition public api to support display event f…
52e0f4b 
…ired for multiple propositions

moved generateInteractionXDM and trackWithData method from Offers class to public Optimize extension
added relevant OptimizePuiblicApiTests to validate code functioning for multiple propositions
@akhiljain1907
Synced with 5.0.2 branch | updated test cases.
97adcf0
@akhiljain1907
minor formatting change
2cf3997
@akhiljain1907
minor code formatting
54f37f8
@akhiljain1907
added test cases for updateProposition api callback and verified for …
4600bf8 
…timeout
@akhiljain1907
minor change and formatting
6022eb5
@akhiljain1907
mapped aepError values in OptimizeError class on basis of status and …
6392765 
…changed default value of aepError to unexpected
@akhiljain1907
updated updateProposition api to return [DecisionScope: OptimizePropo…
87bd3d1 
…sition]? instead of [DecisionScope]? in callback and code review changes
@akhiljain1907
removed createErrorResponseEvent(_ error: AEPError) as now we will ha…
3345a87 
…ve AEPOptimizeError as argument and minor changes
@akhiljain1907
added updateProposition api without callback for backward compatibili…
c7dd5d6 
…ty and code optimization
@akhiljain1907
minor formatting change for code optimization
13293fc
@akhiljain1907
Minor formatting
ebd0f32
@akhiljain1907
Merge branch 'dev-v5.0.2' into MOB-21131
559535f
@akhiljain1907
formatting fix
58e84f2
@akhiljain1907
Merge branch 'MOB-20807' into MOB-21131
0dd2361
@akhiljain1907
Merge branch 'dev-v5.0.2' into MOB-21131
15c3eff
@akhiljain1907
added processing of listeners asynchronously inside serial queue
4eef8f2
@akhiljain1907
used threadSafeDictionary and fixed a few failing tests
b9f4d27
@akhiljain1907
fixed more failing tests and lint errors
12ec8c4
@akhiljain1907
fixed indentation
fb4dc89
@akhiljain1907
lint fix
ed87cd7
@akhiljain1907
indentation fix
22e85c2
@akhiljain1907
lint indentation check fix
9fbe77f
@akhiljain1907
pushing podfile.lock for latest version of core
c73c866
@akhiljain1907
minor code refinements in tests
19d564a
@akhiljain1907
Updating version to 5.3.1.
08c4337
@akhiljain1907
Merge pull request #1 from akhiljain1907/version-5.3.1-update
7dc6559 
Updating version to 5.3.1
@akhiljain1907
using weak self in closure inside processUpdateProposition
51f1f82
@akhiljain1907
Merge branch 'main' into fix/raceCondition
6747c9b
@akhiljain1907
Merge branch 'main' into MOB-21131
3c5d5a0
akhiljain1907 and others added 20 commits March 28, 2025 18:29
@akhiljain1907
fixed extension version after resolving merge conflict
7c2fe38
@akhiljain1907
Merge pull request #126 from akhiljain1907/fix/raceCondition
a2597ef 
[MOB-22537] - added processing of listeners asynchronously inside serial queue
@akhiljain1907
modified trackDisplayedPropositions api to accept list of Offers to s…
9a8026d 
…upport tracking based on Offers.
@akhiljain1907
made UI changes to support batch tracking
6575a7a
@akhiljain1907
moved generateInteractionXDM and trackWithDataMethods to a internal c…
8563deb 
…lass OptimizeTrackingUtils
@akhiljain1907
removed extra offer data from items array and fixed testapp's build e…
10a7a42 
…rror
@akhiljain1907
fix lint - removed redundant internal keyword
a079f5d
@akhiljain1907
code review comments and optimizations
34a1f06
@akhiljain1907
obejctive C api compatibility and test app changes
b0bafa1
@akhiljain1907
minor lint fix
81be776
@akhiljain1907
Merge pull request #112 from akhiljain1907/MOB-21131
4043d69 
[MOB-21131] Display Proposition api to support multiple propositions.
@akhiljain1907
fixed flaky test and a failing test on dev-5.3.1 branch
aa136dc
@akhiljain1907
Revert "fixed flaky test and a failing test on dev-5.3.1 branch"
8f94086 
This reverts commit aa136dc.
@akhiljain1907
fixed a failing test on dev-5.3.1 with race condition changes and rem…
19f8efd 
…oved assertions from a unit test due to flaky behaviour
@akhiljain1907
Merge pull request #136 from akhiljain1907/MOB-21131
d7890f4 
Fixed failing tests and flaky behaviour
@akhiljain1907
fixed flaky behaviour for tests
7bcf58c
@akhiljain1907
Merge pull request #137 from akhiljain1907/MOB-21131
49edd2e 
fixed flaky behaviour for tests
@akhiljain1907
Updating version to 5.4.0.
692712b
@akhiljain1907
Merge pull request #138 from adobe/version-5.4.0-update
d6e1228 
Updating version to 5.4.0
@akhiljain1907
Merge pull request #139 from adobe/dev-v5.4.0
b6efc4d 
dev-v5.4.0 to Staging
@akhiljain1907 akhiljain1907 merged commit 163d685 into main Apr 28, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ishwetansh ishwetansh ishwetansh approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@akhiljain1907 @ishwetansh