Skip to content

[DEV] Merge Feature/datasetIdOverride to dev#46

Merged
kevinlind merged 8 commits intodevfrom
feature/datasetIdOverride
Jul 11, 2020
Merged

[DEV] Merge Feature/datasetIdOverride to dev#46
kevinlind merged 8 commits intodevfrom
feature/datasetIdOverride

Conversation

@kevinlind
Copy link
Copy Markdown
Contributor

@kevinlind kevinlind commented Jul 11, 2020 •
edited
Loading

Description

Merge multiple dataset feature branch into dev branch.

  • Feature adds support for using multiple datasets with the AEP extension
  • Sets dataset ID from schema to ExEdge request to override default dataset defined in ExEdge configuration/config ID
  • updates demo app with generated XDM classes from two datasets, MobileSDKCommerceSchema and MobileSDKLifecycleSchema

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.

emdobrin and others added 7 commits May 29, 2020 17:30
@emdobrin
[AMSDK-9837] Support multi-datasets for ExperiencePlatformEvents, tes…
22dc8bc 
…ts and doc updates
@emdobrin
[AMSDK-9837] Fixed typo, unit test names and guards - review
9af39fd
@emdobrin
Merge pull request #31 from emdobrin/AMSDK-9837
07b82de 
[AMSDK-9837] Support multi-datasets for ExperiencePlatformEvents
@kevinlind
Merge branch 'dev' into feature/datasetIdOverrideRemote
ca785da
@kevinlind
Merge pull request #42 from kevinlind/feature/datasetIdOverrideRemote
e2218b6 
[Dev] Merge dev to feature/datasetIdOverride
@kevinlind
[amsdk-9924] Update xdmlibs for multiple datasets.
433b48e 
Remove existing xdmlibs and replace with MobileSDKCommerceSchema v1.0 and MobileSDKLifecycleSchema v1.0.
MobileSDKCommerceSchema contains the Commerce mixin.
MobileSDKLifecycleSchema contains the Device, Environment, PlaceContext, and Application mixins.
@kevinlind
Merge pull request #44 from kevinlind/amsdk-9924
c2e092b 
[AMSDK-9924] Update xdmlibs for multiple datasets.
@kevinlind kevinlind requested a review from emdobrin July 11, 2020 00:04
@emdobrin
Copy link
Copy Markdown
Contributor

emdobrin commented Jul 11, 2020

Can you update with latest dev changes to pass the build?

@kevinlind
Copy link
Copy Markdown
Contributor Author

kevinlind commented Jul 11, 2020

@emdobrin I've created PR #47 to merge dev into feature/datasetIdOverride so this branch is updated before merging back to dev. It's a limitation of CircleCI that it doesn't create a merged branch of the PR, but instead just builds the source branch.

@kevinlind
Merge pull request #47 from adobe/dev
f5b6724 
Merge dev branch into feature/datasetIdOverride branch
@kevinlind kevinlind merged commit 4097e40 into dev Jul 11, 2020
@emdobrin emdobrin deleted the feature/datasetIdOverride branch January 18, 2021 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@emdobrin emdobrin emdobrin 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

@kevinlind @emdobrin