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.

Sign up for GitHub

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

Jump to bottom

Fixed Catalyst build with Xcode 15 beta 1 #2586

Merged
merged 1 commit into from
Jun 6, 2023
Merged

Fixed Catalyst build with Xcode 15 beta 1 #2586

merged 1 commit into from
Jun 6, 2023

Conversation

NachoSoto
Copy link
Contributor

Fixes this error:

Property cannot be more available than enclosing scope
Enclosing scope requires availability of application extensions for Mac Catalyst 13.1 or newer

@NachoSoto
Fixed Catalyst build with Xcode 15 beta 1
fc1381e 
Fixes this error:
> Property cannot be more available than enclosing scope
> Enclosing scope requires availability of application extensions for Mac Catalyst 13.1 or newer
@NachoSoto NachoSoto added pr:fix A bug fix iOS 17 labels Jun 6, 2023
@NachoSoto NachoSoto requested a review from a team June 6, 2023 04:18
@NachoSoto NachoSoto changed the title Fixed Catalyst build with Xcode 15 beta 1 Fixed Catalyst build with Xcode 15 beta 1 Jun 6, 2023
@codecov
Copy link

codecov bot commented Jun 6, 2023 •
edited
Loading

Codecov Report

Merging #2586 (fc1381e) into main (f04f99d) will increase coverage by 0.13%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #2586      +/-   ##
==========================================
+ Coverage   88.04%   88.17%   +0.13%     
==========================================
  Files         201      201              
  Lines       14024    14024              
==========================================
+ Hits        12347    12366      +19     
+ Misses       1677     1658      -19
Impacted Files Coverage Δ
...ndationExtensions/UIApplication+RCExtensions.swift 93.33% <ø> (ø)

... and 4 files with indirect coverage changes

tonidero
tonidero approved these changes Jun 6, 2023
View reviewed changes
Copy link
Contributor

@tonidero tonidero left a comment

Choose a reason for hiding this comment

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

Just a question, but looks good!

Sources/FoundationExtensions/UIApplication+RCExtensions.swift
@@ -18,6 +18,7 @@ import UIKit
extension UIApplication {

@available(iOS 13.0, *)
@available(macCatalystApplicationExtension 13.1, *)
Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm should this also be available in macCatalyst (not an application extension)?

Copy link
Contributor Author

@NachoSoto NachoSoto Jun 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

iOS already satisfies that requirement implicitly (iOS is basically macCatayst too unless you add a specific @available for it).
Which means that this is available for macCatalyst 13.0.

I have no idea why Apple changed the requirement here in Xcode 15, but either way this property is only used from places that require iOS 15, which is why everything else compiles.

@NachoSoto NachoSoto merged commit f7d6db2 into main Jun 6, 2023
@NachoSoto NachoSoto deleted the catalyst-xcode-15 branch June 6, 2023 14:41
This was referenced Jun 13, 2023
Closed
Merged
NachoSoto pushed a commit that referenced this pull request Jun 13, 2023
@RCGitBot
[AUTOMATIC] Release/4.22.0 (#2637)
aafdba1 
**This is an automatic release.**

### New Features
* New `DebugViewController`: UIKit counterpart for SwiftUI's
`debugRevenueCatOverlay` (#2631) via NachoSoto (@NachoSoto)
* Created `PaywallExtensions`: `StoreView` and `SubscriptionStoreView`
overloads for `Offering` (#2593) via NachoSoto (@NachoSoto)
* Introduced `debugRevenueCatOverlay()`: new SwiftUI debug overlay
(#2567) via NachoSoto (@NachoSoto)
### Bugfixes
* Removed `preventPurchasePopupCallFromTriggeringCacheRefresh`, update
caches on `willEnterForeground` (#2623) via NachoSoto (@NachoSoto)
* Fixed `Catalyst` build with `Xcode 15 beta 1` (#2586) via NachoSoto
(@NachoSoto)
### Dependency Updates
* Bump danger from 9.3.0 to 9.3.1 (#2592) via dependabot[bot]
(@dependabot[bot])
### Other Changes
* `StoreTransaction`: added new `Storefront` to API testers (#2634) via
NachoSoto (@NachoSoto)
* `DebugView`: added snapshot tests (#2630) via NachoSoto (@NachoSoto)
* `verifyNoUnfinishedTransactions`/`verifyUnfinishedTransaction`: added
missing `#file` parameter (#2625) via NachoSoto (@NachoSoto)
* `PostReceiptDataOperation`: clean up cache key (#2628) via NachoSoto
(@NachoSoto)
* `PurchasesOrchestrator`: also get `Storefront` from SK1 (#2629) via
NachoSoto (@NachoSoto)
* `CI`: disable iOS 17 for now (#2627) via NachoSoto (@NachoSoto)
* `Tests`: fixed crash on iOS 13 (#2624) via NachoSoto (@NachoSoto)
* `StoreTransaction`: read `Storefront` from `StoreKit.Transaction`
(#2611) via NachoSoto (@NachoSoto)
* `StoreKitConfigTestCase`/`BaseStoreKitIntegrationTests`: also clear
transactions after every test (#2616) via NachoSoto (@NachoSoto)
* `ErrorCode.networkError`: improved description (#2610) via NachoSoto
(@NachoSoto)
* `PurchaseTester`: make CI job always point to current version (#2622)
via NachoSoto (@NachoSoto)
* Improved `finishAllUnfinishedTransactions` (#2615) via NachoSoto
(@NachoSoto)
* `StoreKitConfigTestCase`: improved `waitForStoreKitTestIfNeeded`
(#2614) via NachoSoto (@NachoSoto)
* `StoreKitConfigTestCase`: set `continueAfterFailure` to `false`
(#2617) via NachoSoto (@NachoSoto)
* `PaywallExtensions`: fixed compilation (#2613) via NachoSoto
(@NachoSoto)
* `CI`: added `iOS 17` job (#2591) via NachoSoto (@NachoSoto)
* `Encodable.jsonEncodedData`: fixed tests on iOS 17 due to inconsistent
key ordering (#2607) via NachoSoto (@NachoSoto)
* `debugRevenueCatOverlay`: added ability to display new
`SubscriptionStoreView` (#2595) via NachoSoto (@NachoSoto)
* Refactor: extracted all log strings (#2600) via NachoSoto (@NachoSoto)
* Changed tests to work around `URL` decoding differences in `iOS 17`
(#2605) via NachoSoto (@NachoSoto)
* Removed unnecessary `Strings.trimmedOrError` (#2601) via NachoSoto
(@NachoSoto)
* Fixed test compilation with `Xcode 15` (#2602) via NachoSoto
(@NachoSoto)
* Tests: added `iOS 17` snapshots (#2603) via NachoSoto (@NachoSoto)
* `StoreProductDiscount`: added `description` (#2604) via NachoSoto
(@NachoSoto)
* `debugRevenueCatOverlay` improvements (#2594) via NachoSoto
(@NachoSoto)
* `Xcode 15`: fixed all documentation warnings (#2596) via NachoSoto
(@NachoSoto)
* `StoreKitObserverModeIntegrationTests`: fixed and disabled SK2
`testPurchaseInDevicePostsReceipt` (#2589) via NachoSoto (@NachoSoto)
* `StoreKit2TransactionListener`: added log when receiving
`Transactions.Updates` (#2588) via NachoSoto (@NachoSoto)
* `Dictionary.MergeStrategy`: simplify implementation (#2587) via
NachoSoto (@NachoSoto)
* `Configuration.Builder`: fixed doc reference (#2583) via NachoSoto
(@NachoSoto)
* `APITesters`: available since iOS 11 (#2581) via NachoSoto
(@NachoSoto)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tonidero tonidero tonidero approved these changes

Assignees
No one assigned
Labels
iOS 17 pr:fix A bug fix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@NachoSoto @tonidero