Skip to content

Staging -> Main (3.0.4)#66

Merged
addb merged 7 commits intomainfrom
staging
Mar 31, 2022
Merged

Staging -> Main (3.0.4)#66
addb merged 7 commits intomainfrom
staging

Conversation

@addb
Copy link
Copy Markdown
Collaborator

@addb addb commented Mar 30, 2022

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.

emdobrin and others added 7 commits March 11, 2022 19:13
Downmerge main to dev after script updates
* Coverage fix

* Reset cocoapods cache

* Enable coverage collection

* Update targets to ios 10

* Set a simulator that exists

* Remove overwritten settings, podfile update

* Conform to TestableExtension

* Revert simulator change

* Fixes after merge conflicts
…eturn nil string and not return unexpected error when aid vid values are not found. (#62)

* [MOB-15980] Fixed getTrackingIdentifier and getVisitorIdentifier to return nil string and not return unexpected error when aid vid values are not found.

* [MOB-15980] Update Xcode version to 12.0.1 in Circle CI config, since 11.2.1 Xcode is no longer supported by Circle CI.

* [MOB-15980] Fix unit tests

* [MOB-15980] Return unexpected error when identifer values are not a valid string

* [MOB-15980] Simplify logic
Bump up version for v3.0.4 release
@addb addb requested review from emdobrin and kevinlind March 30, 2022 20:06
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 31, 2022

Codecov Report

Merging #66 (ca349ce) into main (81f91a0) will increase coverage by 0.28%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main      #66      +/-   ##
==========================================
+ Coverage   89.93%   90.21%   +0.28%     
==========================================
  Files          13       14       +1     
  Lines        1082     1113      +31     
==========================================
+ Hits          973     1004      +31     
  Misses        109      109              

Copy link
Copy Markdown
Contributor

@emdobrin emdobrin left a comment

Choose a reason for hiding this comment

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

@addb changes look good. Could you please also include a draft of the release notes in the description of this PR?

@addb addb merged commit 2173614 into main Mar 31, 2022
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