[Issue #125] Enable DatadogCore, DatadogLogs and DatadogTrace to compile on watchOS platform
#1946
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
[Issue #125] Enable DatadogCore and DatadogLogs to compile on watchOS platform
ncreated
changed the title
DatadogCore and DatadogLogs to compile on watchOS platform DatadogCore, DatadogLogs and DatadogTrace to compile on watchOS platform
mariedm
previously approved these changes
Jul 9, 2024
maxep
requested changes
Jul 10, 2024
Comment on lines
17
to
38
| #if canImport(UIKit) | ||
| import UIKit | ||
|
|
||
| #if canImport(WatchKit) | ||
| import WatchKit | ||
|
|
||
| extension WKInterfaceDevice: DeviceProtocol {} | ||
| #else | ||
| extension UIDevice: DeviceProtocol {} | ||
| #endif | ||
|
|
||
| public enum DeviceFactory { | ||
| /// Get the current device | ||
| public static var current: DeviceProtocol { | ||
| #if canImport(WatchKit) | ||
| WKInterfaceDevice.current() | ||
| #else | ||
| UIDevice.current | ||
| #endif | ||
| } | ||
| } | ||
| #endif |
There was a problem hiding this comment.
/blocking Looks like the compilation statement is wrong here, does it actually compile on watchOS? 🤔
There was a problem hiding this comment.
Actually, I think we should remove this file and only rely on DeviceInfo implementation, which is already based on compile statement for UIKit and macOS. We should add watchOS there IMO.
There was a problem hiding this comment.
@ncreated, if you agree, I can make the change 👍
There was a problem hiding this comment.
Sounds fair @maxep 👍. Feel free to push to this branch, otherwise I can have a look tomorrow 👍
maxep
force-pushed
the
jfiser-paylocity/enable-watchos-build
branch
from
6697b57
to
b5215ff
Compare
maxep
force-pushed
the
jfiser-paylocity/enable-watchos-build
branch
from
b5215ff
to
c9d219c
Compare
maxep
force-pushed
the
jfiser-paylocity/enable-watchos-build
branch
from
c9d219c
to
4d67a53
Compare
maxep
approved these changes
Jul 12, 2024
Closed
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 #1918 (external) to
develop.More context:
DatadogCore,DatadogLogsandDatadogTraceto work on watchOS.How?
The #1918 was first merged to internal branch. Here w run full CI and do last QA before merging it to
develop.Before release, we will update Supported Versions doc to also reflect the level of support for watchOS platform.
Review checklist
Custom CI job configuration (optional)