Dogfood recent changes #1136
Merged
Dogfood recent changes #1136
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hotfix 1.12.1
Release 1.13.0
This reverts commit ead0f4b.
Downgrade to version 2.1.3 of testing framework
Co-Authored-By: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
…h-data-to-pointer-interaction-model RUMM-2784 [SR] Migrate to `PointerInteractionData` for sending touch information
…sure Replace `CodableValue` with `AnyCodable`
RUMM 2817 TLV Telemetry
…emock-sharing RUMM-2690 PassthroughContextMock sharing with Session Replay package
RUMM-2902 [SR] Add `DatadogSDKSessionReplay.podspec`
Fix develop build issues
- to reflect the lowest supported Xcode version (13.0)
Align `swift-tools-version` across all packages
Datadog ReportBranch report: ✅ |
ncreated
force-pushed
the
ncreated/merge-develop-into-dogfooding
branch
from
3d2c360 to
6abed76
Compare
- SR cannot use main `Package.swift` because it includes another definition of `DatadogSessionReplay`.
ncreated
commented
Jan 19, 2023
| swiftSettings: [ | ||
| .define("SPM_BUILD"), | ||
| .define("DD_SDK_ENABLE_EXPERIMENTAL_APIS"), | ||
| ] |
There was a problem hiding this comment.
It is not possible to add path: .. as SPM will complain that sources cannot be located in outside of package directory. Symbolic links to Sources and Tests workaround this limit.
maciejburda
approved these changes
Jan 19, 2023
maycmlee
reviewed
Jan 19, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What and why?
🐶 Merging
developintodogfooding, so the SDK version will be upgraded in mobile app and Shopist.DatadogCoreProxyin tests #1111PointerInteractionDatafor sending touch information #1087How?
Following recent change on
develop, I updated the location of SR module in dogfoodedPackage.swift.Because we're in the middle of V2 migration and
DatadogInternalmodule is not yet available as stand-alone package that SR could depend on, that change ☝️ broke our SR unit tests setup. Xcode was confused with resolving following:DatadogSessionReplay/Package.swiftdefining its ownDatadogSessionReplaymoduleDatadogSessionReplay/Package.swiftlinking to../Package.swiftwhich also definesDatadogSessionReplayDatadogSessionReplay/Package.swiftlinking to../TestUtilities/Package.swiftwhich links../Package.swiftthat definesDatadogSessionReplayTo avoid this confusion, this PR adds
DDPatchForSR/Package.swiftwhich is basically a copy of the mainPackage.swiftavailable ondevelop. Unlike the mainPackage.swiftondogfoodingbranch, it makes no mention ofDatadogSessionReplaymodule.That approach seeks at introducing minimal change (it will be erased once we reach V2):
bitrise.ymlmadeDatadogSessionReplay/Package.swiftand/TestUtilities/Package.swiftthat should not conflict withdevelopchanges any time soonTo make
DDPatchForSR/Package.swiftwork without introducing any changes in repository layout, two symbolic links were created:DDPatchForSR/Sources→/SourcesDDPatchForSR/Tests→/TestsEntire patch is done in this commit: c374b78
Other than this, just
develop→dogfoodingmerge.Review checklist
Custom CI job configuration (optional)