Skip to content

Merge Dev to Staging for v1.2.0 release#222

Merged
emdobrin merged 12 commits intostagingfrom
dev
Dec 21, 2021
Merged

Merge Dev to Staging for v1.2.0 release#222
emdobrin merged 12 commits intostagingfrom
dev

Conversation

@kevinlind
Copy link
Copy Markdown
Contributor

Description

Merge to Staging branch for v1.2.0 release
Changes include:

  • Add ImplementationDetails to each ExperienceEvent request to Edge Network
  • Change to use SwiftLint from CocoaPods distribution in order to use specific version
  • Fix build archive step to include debug symbols
  • Conform generic network errors to EdgeEventError type

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.

kevinlind and others added 9 commits September 1, 2021 11:58
Merge to Main for v1.1.2 release
Merge to Main for v1.1.2 release
Downmerge Main to Dev after v1.1.2 release
Conform generic network errors to EdgeEventError type
* Update build scripts to fix the build archive step.

* Updated script to run swiftlint and updated makefile

* fix the swiftlint path in githook

* Fix swift lint script for all the targets
* Update Pods

* Add ImplementationDetails and attach to each outgoing Experience Event

* Add unit tests for ImplementationDetails.swift

* Alphabetize files in project navigator

* Add EdgeHitProcessor unit tests for ImplementationDetails

* Update Edge functional tests to check for ImplementationDetails in request

* If Core version or wrapper type is not found in Event Hub shared state, use 'unknown' in Implementation Details

* Fix capitalization to 'implementationDetails'

* Clean up ImplementationDetails code by extracting logic to parse wrapper name in separate function.

* Remove unneeded imports of AEPCore and AEPServices

* Set ImplementationDetails in EdgeState.bootupIfNeeded before starting hit queue.

* Add WrapperType extension to return desired type name used for ImplementationDetails.

* fix typeo

* Consolidate common code in ImplementationDetailsTest

* Set required forward slash outside of getWrapperName function.

* Protect access to EdgeState.implementationDetails as it is accessed across multiple threads.
@kevinlind kevinlind requested review from addb and emdobrin December 21, 2021 18:06
@codecov
Copy link
Copy Markdown

codecov bot commented Dec 21, 2021

Codecov Report

Merging #222 (d1da0d6) into staging (756f392) will increase coverage by 0.15%.
The diff coverage is 97.10%.

❗ Current head d1da0d6 differs from pull request most recent head f142427. Consider uploading reports for the commit f142427 to get more accurate results

@@             Coverage Diff             @@
##           staging     #222      +/-   ##
===========================================
+ Coverage    94.30%   94.45%   +0.15%     
===========================================
  Files           26       27       +1     
  Lines          913      973      +60     
===========================================
+ Hits           861      919      +58     
- Misses          52       54       +2     

@github-pages github-pages bot temporarily deployed to github-pages December 21, 2021 19:35 Inactive
- AEPCore (>= 3.1.0)
- AEPServices (>= 3.1.0)
- AEPCore (3.2.4):
- AEPCore (3.3.1):
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

will need to update both samples and main pods to 3.3.2 before main

@emdobrin
Copy link
Copy Markdown
Contributor

looks good @kevinlind, we can get this merged and update the dependencies in a separate PR once available.

@emdobrin emdobrin merged commit 581e715 into staging Dec 21, 2021
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.

3 participants