Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Extend app launch handler to macCatalyst and visionOS #2033

Merged
merged 1 commit into from
Sep 3, 2024

Conversation

ncreated
Copy link
Member

@ncreated ncreated commented Sep 3, 2024

What and why?

QA and merge #1888 by @Hengyu

How?

Using internal branch to merge #1888

  • I did small refactoring to avoid code duplication.
  • Also changed TARGET_OS_MAC to TARGET_OS_OSX, following this from TargetConditionals.h:
TARGET_OS_MAC                - Generated code will run on a variant of macOS
  TARGET_OS_OSX                - Generated code will run on macOS
  TARGET_OS_IPHONE             - Generated code will run on a variant of iOS (firmware, devices, simulator)
    TARGET_OS_IOS                - Generated code will run on iOS
      TARGET_OS_MACCATALYST        - Generated code will run on macOS
    TARGET_OS_TV                 - Generated code will run on tvOS
    TARGET_OS_WATCH              - Generated code will run on watchOS
    TARGET_OS_VISION             - Generated code will run on visionOS
    TARGET_OS_BRIDGE             - Generated code will run on bridge devices
  TARGET_OS_SIMULATOR          - Generated code will run on an iOS, tvOS, watchOS, or visionOS simulator
  TARGET_OS_DRIVERKIT          - Generated code will run on macOS, iOS, tvOS, watchOS, or visionOS

+--------------------------------------------------------------------------------------+
|                                    TARGET_OS_MAC                                     |
| +-----+ +------------------------------------------------------------+ +-----------+ |
| |     | |                  TARGET_OS_IPHONE                          | |           | |
| |     | | +-----------------+ +----+ +-------+ +--------+ +--------+ | |           | |
| |     | | |       IOS       | |    | |       | |        | |        | | |           | |
| | OSX | | | +-------------+ | | TV | | WATCH | | BRIDGE | | VISION | | | DRIVERKIT | |
| |     | | | | MACCATALYST | | |    | |       | |        | |        | | |           | |
| |     | | | +-------------+ | |    | |       | |        | |        | | |           | |
| |     | | +-----------------+ +----+ +-------+ +--------+ +--------+ | |           | |
| +-----+ +------------------------------------------------------------+ +-----------+ |
+--------------------------------------------------------------------------------------+

Review checklist

  • Feature or bugfix MUST have appropriate tests (unit, integration)
  • Make sure each commit and the PR mention the Issue number or JIRA reference
  • Add CHANGELOG entry for user facing changes

@datadog-datadog-prod-us1
Copy link

datadog-datadog-prod-us1 bot commented Sep 3, 2024

Datadog Report

Branch report: ncreated/merge-hengyu-enhance-macro-usage-
Commit report: d4df1c5
Test service: dd-sdk-ios

✅ 0 Failed, 1869 Passed, 0 Skipped, 1m 17.36s Total Time
🔻 Test Sessions change in coverage: 2 decreased, 6 no change

🔻 Code Coverage Decreases vs Default Branch (2)

  • test DatadogCoreTests iOS 72.68% (-0.07%) - Details
  • test DatadogTraceTests iOS 54.32% (-0.02%) - Details

@ncreated ncreated self-assigned this Sep 3, 2024
@ncreated ncreated marked this pull request as ready for review September 3, 2024 12:38
@ncreated ncreated requested review from a team as code owners September 3, 2024 12:38
Copy link
Member

@maxep maxep left a comment

Choose a reason for hiding this comment

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

👍

@ncreated ncreated force-pushed the ncreated/merge-hengyu-enhance-macro-usage- branch from d9235cf to efcad02 Compare September 3, 2024 13:48
@ncreated
Copy link
Member Author

ncreated commented Sep 3, 2024

/merge

@dd-devflow
Copy link

dd-devflow bot commented Sep 3, 2024

🚂 MergeQueue: pull request added to the queue

The median merge time in develop is 0s.

Use /merge -c to cancel this operation!

@ncreated
Copy link
Member Author

ncreated commented Sep 3, 2024

/remove

@dd-devflow
Copy link

dd-devflow bot commented Sep 3, 2024

🚂 Devflow: /remove

@dd-devflow
Copy link

dd-devflow bot commented Sep 3, 2024

⚠️ MergeQueue: This merge request build was cancelled

This merge request build was cancelled

If you need support, contact us on Slack #devflow!

@ncreated ncreated force-pushed the ncreated/merge-hengyu-enhance-macro-usage- branch from efcad02 to d4df1c5 Compare September 3, 2024 13:53
@ncreated ncreated merged commit 8d26db6 into develop Sep 3, 2024
15 checks passed
@ncreated ncreated deleted the ncreated/merge-hengyu-enhance-macro-usage- branch September 3, 2024 14:25
@mariedm mariedm mentioned this pull request Sep 11, 2024
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants