`visionOS`: support for `Xcode 15 beta 6` by NachoSoto · Pull Request #2989 · RevenueCat/purchases-ios

NachoSoto · 2023-08-08T21:14:17Z

Context:

#if os(iOS) no longer evaluates to true when compiling for visionOS
Which means we need || os(xrOS).
But to support older Xcode we need #if swift(>=5.9) && os(xrOS).
But, fun fact, short-circuiting doesn’t work in Xcode 13.
And we still need that to run iOS <15 tests (FB12223404 / FB12805891)

💩

This works around that by defining our own VISION_OS flag.

Changes:

Added VISION_OS compile time flag to determine SDK
Replaced #if os(xrOS) with #if VISION_OS
Added flag to Package.swift (thanks @neonichu for helping with this)

MarkVillacampa

Nice one!

codecov · 2023-08-09T16:35:50Z

Codecov Report

Merging #2989 (5f381cd) into main (def42cc) will increase coverage by 0.14%.
Report is 2 commits behind head on main.
The diff coverage is 72.72%.

❗ Current head 5f381cd differs from pull request most recent head da56679. Consider uploading reports for the commit da56679 to get more accurate results

@@            Coverage Diff             @@
##             main    #2989      +/-   ##
==========================================
+ Coverage   86.56%   86.70%   +0.14%     
==========================================
  Files         218      218              
  Lines       15623    15617       -6     
==========================================
+ Hits        13524    13541      +17     
+ Misses       2099     2076      -23

Files Changed	Coverage Δ
...ndationExtensions/UIApplication+RCExtensions.swift	`93.33% <ø> (ø)`
Sources/Misc/Concurrency/Purchases+async.swift	`10.52% <ø> (ø)`
...ces/Purchasing/StoreKit1/PaymentQueueWrapper.swift	`41.66% <ø> (ø)`
...ources/Purchasing/StoreKit1/StoreKit1Wrapper.swift	`84.96% <ø> (ø)`
...hasing/StoreKit2/SK2BeginRefundRequestHelper.swift	`31.94% <ø> (ø)`
Sources/Support/DebugUI/DebugContentViews.swift	`38.05% <ø> (ø)`
Sources/Support/DebugUI/DebugView.swift	`0.00% <0.00%> (ø)`
Sources/Support/DebugUI/DebugViewController.swift	`0.00% <ø> (ø)`
Sources/Support/DebugUI/DebugViewModel.swift	`35.93% <ø> (ø)`
...s/Support/DebugUI/DebugViewSheetPresentation.swift	`0.00% <ø> (ø)`
... and 5 more

... and 4 files with indirect coverage changes

@NachoSoto

_This release is compatible with Xcode 15 beta 6 and visionOS beta 3_ ### Bugfixes * `visionOS`: support for `Xcode 15 beta 6` (#2989) via NachoSoto (@NachoSoto) * `CachingProductsManager`: avoid crash when caching different products with same identifier (#2979) via NachoSoto (@NachoSoto) * `PurchasesOrchestrator`: disambiguate transactions from the queue (#2890) via NachoSoto (@NachoSoto) ### Performance Improvements * `StoreKit2TransactionListener`: handle transactions asynchronously (#2910) via NachoSoto (@NachoSoto) ### Other Changes * `Atomic`: avoid race conditions modifying dictionaries (#2981) via NachoSoto (@NachoSoto) * `Logging`: avoid logging "updating offerings" when request is cached (#2904) via NachoSoto (@NachoSoto) * `StoreKit2TransactionListener`: converted into an `actor` (#2909) via NachoSoto (@NachoSoto) * `Integration Tests`: added more observer mode tests (#2905) via NachoSoto (@NachoSoto) * Created `PostedTransactionCache` (#2911) via NachoSoto (@NachoSoto) * `IntroEligibility`: changed products to `Set<String>` (#2976) via NachoSoto (@NachoSoto) * `AdServices`: Rename `postAdServicesTokenIfNeeded()` to `postAdServicesTokenOncePerInstallIfNeeded()` (#2968) via Josh Holtz (@joshdholtz) * `SK1StoreProduct`: changed `productType` warning to debug (#2957) via NachoSoto (@NachoSoto) * `PrivacyInfo.xcprivacy`: added `UserDefaults` to access API types (#2913) via NachoSoto (@NachoSoto) * `Integration Tests`: new test to verify that SK1 purchases don't leave SK2 unfinished transactions (#2906) via NachoSoto (@NachoSoto) * `Logging`: log entire cache key with verbose logs (#2888) via NachoSoto (@NachoSoto) * `StoreProduct`: added test covering warning log (#2897) via NachoSoto (@NachoSoto) * `CustomEntitlementComputation`: use custom API key (#2879) via Toni Rico (@tonidero) * `CachingProductsManager`: removed duplicate log and added tests (#2898) via NachoSoto (@NachoSoto) * `Xcode 15 beta 5`: fixed test compilation (#2885) via NachoSoto (@NachoSoto) --------- Co-authored-by: NachoSoto <ignaciosoto90@gmail.com>

@bcapps

This is a small follow-up to #2989. Thanks @bcapps for reporting this.

@bcapps

This is a small follow-up to #2989. Thanks @bcapps for reporting this.

@neonichu

…3005) Fixes #2998. See #2989 for why this is needed in the first place. This is now fixed in SPM: swiftlang/swift-package-manager#6794, but we need a workaround for now. Since `.custom` doesn't work properly (it gets evaluated in Xcode even outside of that platform), this splits `Package.swift` based on Xcode version. Thanks @neonichu for helping with this.

@neonichu

### Context: `#if os(iOS)` no longer evaluates to `true` when compiling for `visionOS` Which means we need `|| os(xrOS)`. But to support older Xcode we need `#if swift(>=5.9) && os(xrOS)`. But, fun fact, short-circuiting doesn’t work in `Xcode 13`. And we still need that to run iOS <15 tests (`FB12223404` / `FB12805891`) 💩 This works around that by defining our own `VISION_OS` flag. ### Changes: - Added `VISION_OS` compile time flag to determine SDK - Replaced `#if os(xrOS)` with `#if VISION_OS` - Added flag to `Package.swift` (thanks @neonichu for helping with this)

@NachoSoto

_This release is compatible with Xcode 15 beta 6 and visionOS beta 3_ ### Bugfixes * `visionOS`: support for `Xcode 15 beta 6` (#2989) via NachoSoto (@NachoSoto) * `CachingProductsManager`: avoid crash when caching different products with same identifier (#2979) via NachoSoto (@NachoSoto) * `PurchasesOrchestrator`: disambiguate transactions from the queue (#2890) via NachoSoto (@NachoSoto) ### Performance Improvements * `StoreKit2TransactionListener`: handle transactions asynchronously (#2910) via NachoSoto (@NachoSoto) ### Other Changes * `Atomic`: avoid race conditions modifying dictionaries (#2981) via NachoSoto (@NachoSoto) * `Logging`: avoid logging "updating offerings" when request is cached (#2904) via NachoSoto (@NachoSoto) * `StoreKit2TransactionListener`: converted into an `actor` (#2909) via NachoSoto (@NachoSoto) * `Integration Tests`: added more observer mode tests (#2905) via NachoSoto (@NachoSoto) * Created `PostedTransactionCache` (#2911) via NachoSoto (@NachoSoto) * `IntroEligibility`: changed products to `Set<String>` (#2976) via NachoSoto (@NachoSoto) * `AdServices`: Rename `postAdServicesTokenIfNeeded()` to `postAdServicesTokenOncePerInstallIfNeeded()` (#2968) via Josh Holtz (@joshdholtz) * `SK1StoreProduct`: changed `productType` warning to debug (#2957) via NachoSoto (@NachoSoto) * `PrivacyInfo.xcprivacy`: added `UserDefaults` to access API types (#2913) via NachoSoto (@NachoSoto) * `Integration Tests`: new test to verify that SK1 purchases don't leave SK2 unfinished transactions (#2906) via NachoSoto (@NachoSoto) * `Logging`: log entire cache key with verbose logs (#2888) via NachoSoto (@NachoSoto) * `StoreProduct`: added test covering warning log (#2897) via NachoSoto (@NachoSoto) * `CustomEntitlementComputation`: use custom API key (#2879) via Toni Rico (@tonidero) * `CachingProductsManager`: removed duplicate log and added tests (#2898) via NachoSoto (@NachoSoto) * `Xcode 15 beta 5`: fixed test compilation (#2885) via NachoSoto (@NachoSoto) --------- Co-authored-by: NachoSoto <ignaciosoto90@gmail.com>

@bcapps

This is a small follow-up to #2989. Thanks @bcapps for reporting this.

@neonichu

…3005) Fixes #2998. See #2989 for why this is needed in the first place. This is now fixed in SPM: swiftlang/swift-package-manager#6794, but we need a workaround for now. Since `.custom` doesn't work properly (it gets evaluated in Xcode even outside of that platform), this splits `Package.swift` based on Xcode version. Thanks @neonichu for helping with this.

### Changes: - Added `visionOS` to list of deployment targets in `Podspec` - ~~Updated `Swift` version to 5.7 (see https://swiftversion.net), Xcode 14.0 is required, and that's Swift 5.7. We no longer support 5.5~~ (done in a previous PR already) - Added `visionOS` CocoaPods lint check to `build_visionos` - Added `VISION_OS` to Podspec (see #2989) - ~~Changed `visionOS` CI job to use `Xcode 15 beta 8` (see https://discuss.circleci.com/t/xcode-15-rc-released-important-notice-for-visionos-sdk-users/49278)~~ (no longer needed) Fixes https://community.revenuecat.com/sdks-51/how-to-support-visionos-via-cocoapods-3499

NachoSoto added pr:fix A bug fix iOS 17 xrOS labels Aug 8, 2023

NachoSoto requested a review from a team August 8, 2023 21:14

visionOS: support for Xcode 15 beta 6

bd4a4f5

NachoSoto closed this Aug 8, 2023

NachoSoto force-pushed the visionos-beta-3 branch from 81e07d1 to def42cc Compare August 8, 2023 22:44

NachoSoto reopened this Aug 8, 2023

NachoSoto marked this pull request as ready for review August 8, 2023 22:45

NachoSoto changed the title ~~visionOS: support for Xcode 15 beta 6~~ visionOS: support for Xcode 15 beta 6 Aug 8, 2023

Using VISION_OS

b30f26e

NachoSoto force-pushed the visionos-beta-3 branch 3 times, most recently from 735f9b1 to bee593d Compare August 9, 2023 00:28

Fixed SPM

b1c44c8

NachoSoto force-pushed the visionos-beta-3 branch from bee593d to b1c44c8 Compare August 9, 2023 00:46

MarkVillacampa approved these changes Aug 9, 2023

View reviewed changes

[move] Family on PurchaseTester

5f381cd

NachoSoto enabled auto-merge (squash) August 9, 2023 16:28

NachoSoto disabled auto-merge August 9, 2023 16:33

[move] more VISION_OS checks

da56679

NachoSoto enabled auto-merge (squash) August 9, 2023 17:00

NachoSoto disabled auto-merge August 9, 2023 17:02

NachoSoto enabled auto-merge (squash) August 9, 2023 17:14

NachoSoto merged commit dab5035 into main Aug 9, 2023

NachoSoto deleted the visionos-beta-3 branch August 9, 2023 18:19

RCGitBot mentioned this pull request Aug 9, 2023

[AUTOMATIC] Release/4.25.3 #2994

Merged

finnvoor mentioned this pull request Aug 10, 2023

RevenueCat fails to build with Xcode 15 Beta 6 #2998

Closed

NachoSoto mentioned this pull request Aug 10, 2023

Custom Entitlement Computation: fixed visionOS build #2999

Merged

NachoSoto added a commit that referenced this pull request Aug 10, 2023

Custom Entitlement Computation: fixed visionOS build

c309ef3

This is a small follow-up to #2989. Thanks @bcapps for reporting this.

NachoSoto added a commit that referenced this pull request Aug 11, 2023

Custom Entitlement Computation: fixed visionOS build (#2999)

3964e46

This is a small follow-up to #2989. Thanks @bcapps for reporting this.

NachoSoto mentioned this pull request Aug 11, 2023

Xcode 15: fix non-visionOS build by replacing .custom platform #3005

Merged

MarkVillacampa pushed a commit that referenced this pull request Sep 6, 2023

Custom Entitlement Computation: fixed visionOS build (#2999)

b6b5217

This is a small follow-up to #2989. Thanks @bcapps for reporting this.

NachoSoto mentioned this pull request Jan 30, 2024

CocoaPods: enabled visionOS #3262

Merged

ajpallares mentioned this pull request Jul 18, 2025

Tuist: fix compilation of RevenueCat and RevenueCatUI projects in visionOS #5399

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`visionOS`: support for `Xcode 15 beta 6`#2989

`visionOS`: support for `Xcode 15 beta 6`#2989
NachoSoto merged 5 commits into
mainfrom
visionos-beta-3

NachoSoto commented Aug 8, 2023 •

edited

Loading

Uh oh!

MarkVillacampa left a comment

Uh oh!

codecov Bot commented Aug 9, 2023 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

NachoSoto commented Aug 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Context:

Changes:

Uh oh!

MarkVillacampa left a comment

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented Aug 9, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

NachoSoto commented Aug 8, 2023 •

edited

Loading

codecov Bot commented Aug 9, 2023 •

edited

Loading