Skip to content

xrOS: fixed compilation by disabling debug overlay#2681

Merged
NachoSoto merged 2 commits into
mainfrom
xros-debug-overlay
Jun 22, 2023
Merged

xrOS: fixed compilation by disabling debug overlay#2681
NachoSoto merged 2 commits into
mainfrom
xros-debug-overlay

Conversation

@NachoSoto

Copy link
Copy Markdown
Contributor

We can look into making them work in the future, but for now this helps compile the SDK for xrOS.

@NachoSoto NachoSoto added pr:fix A bug fix xrOS labels Jun 21, 2023
@NachoSoto NachoSoto requested a review from a team June 21, 2023 21:35
@NachoSoto NachoSoto force-pushed the xros-debug-overlay branch from 2e046bb to 86812b6 Compare June 21, 2023 23:01
@codecov

codecov Bot commented Jun 22, 2023

Copy link
Copy Markdown

Codecov Report

Merging #2681 (2d6a553) into main (16f3437) will decrease coverage by 0.05%.
The diff coverage is n/a.

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

@@            Coverage Diff             @@
##             main    #2681      +/-   ##
==========================================
- Coverage   86.56%   86.52%   -0.05%     
==========================================
  Files         209      208       -1     
  Lines       14833    14801      -32     
==========================================
- Hits        12840    12806      -34     
- Misses       1993     1995       +2     
Impacted Files Coverage Δ
Sources/Support/DebugUI/DebugContentViews.swift 38.05% <ø> (ø)
Sources/Support/DebugUI/DebugView.swift 0.00% <ø> (ø)
Sources/Support/DebugUI/DebugViewController.swift 0.00% <ø> (ø)
Sources/Support/DebugUI/DebugViewModel.swift 35.93% <ø> (ø)
...s/Support/DebugUI/DebugViewSheetPresentation.swift 0.00% <ø> (ø)

... and 12 files with indirect coverage changes

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.

Hmm can it be xrOS after the previous line ((os(iOS) || os(macOS))? Same in the other places in this file

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think os(xrOS) is only available in swift(>=5.9) so that would mean this code would not compile in Xcode 14 (@NachoSoto correct me if I'm wrong)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

That’s correct, and short-circuiting doesn’t work in Xcode 13

@NachoSoto NachoSoto force-pushed the xros-debug-overlay branch from 2d6a553 to 653d6e5 Compare June 22, 2023 14:56
@NachoSoto NachoSoto force-pushed the xros-debug-overlay branch from 653d6e5 to c11dbcf Compare June 22, 2023 14:59
@NachoSoto NachoSoto enabled auto-merge (squash) June 22, 2023 14:59
NachoSoto added a commit that referenced this pull request Jun 22, 2023
### Dependencies:

- #2680
- #2681
- #2683

### Future changes:
- [x] Enable for `PurchaseTester`: #2685
- [ ] Build this target in `CI`
- [ ] Run tests on `xrOS`
@NachoSoto NachoSoto merged commit 76c440b into main Jun 22, 2023
@NachoSoto NachoSoto deleted the xros-debug-overlay branch June 22, 2023 15:42
NachoSoto pushed a commit that referenced this pull request Jun 22, 2023
**This is an automatic release.**

_This release is compatible with `Xcode 15 beta 2` and `visionOS beta
1`_

### New Features
* `xrOS`: added to list of supported platforms (#2682) via NachoSoto
(@NachoSoto)
### Bugfixes
* `xrOS`: fixed compilation by disabling debug overlay (#2681) via
NachoSoto (@NachoSoto)
* `xrOS`: added support for new `purchase(confirmIn:options:)` method
(#2683) via NachoSoto (@NachoSoto)
* `Xcode 15`: handle `Locale.currencyCode` deprecation (#2680) via
NachoSoto (@NachoSoto)
### Other Changes
* `PurchaseTester`: fixed release compilation (#2689) via NachoSoto
(@NachoSoto)
* `xrOS`: fixed runtime warning (#2691) via NachoSoto (@NachoSoto)
* `xrOS`: added support to `PurchaseTester` (#2685) via NachoSoto
(@NachoSoto)
* `Signature Verification`: new `Integration Tests` (#2642) via
NachoSoto (@NachoSoto)
* `ErrorUtils`: handle `PurchasesError` to avoid creating unknown errors
(#2686) via NachoSoto (@NachoSoto)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants