Skip to content

Commit

Permalink
VPN-6742: update minimum iOS version to iOS 15 (#10078)
Browse files Browse the repository at this point in the history
* VPN-6742 update minimum iOS version to iOS 15

* small fix ups - not able to build locally, so relying on server

* move swift
  • Loading branch information
mcleinman authored Dec 5, 2024
1 parent ab8d095 commit 83c25e3
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 448 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ if(APPLE)
set(CMAKE_XCODE_ATTRIBUTE_GROUP_ID_IOS ${BUILD_IOS_GROUP_IDENTIFIER})

if(IOS)
set(CMAKE_OSX_DEPLOYMENT_TARGET 14.0)
set(CMAKE_OSX_DEPLOYMENT_TARGET 15.0)
else()
set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0)
endif()
Expand Down
10 changes: 0 additions & 10 deletions src/platforms/ios/iosiaphandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,15 @@ class IOSIAPHandler final : public PurchaseIAPHandler {
void nativeRegisterProducts() override;

public slots:
void productRegistered(void* product);
void processCompletedTransactions(const QStringList& ids);
void processCompletedTransactions(const QStringList& ids,
const QString transactionIdentifier);
void noSubscriptionFoundError();

protected:
void nativeStartSubscription(ProductsHandler::Product* product) override;
void nativeRestoreSubscription() override;

private:
void* m_delegate = nullptr;
int discountToDays(void* discount);
// This is a void (and cast to InAppPurchaseHandler as needed) as the
// InAppPurchaseHandler needs to store Product, which is only available in iOS
// 15+. So the entire class must be marked as only available in iOS 15. But we
// can't mark this variable as only available in iOS 15+ here. Hence, we have
// this variable as a `void`, and cast it to InAppPurchaseHandler as needed.
void* swiftIAPHandler = nullptr;
};

#endif // IOSIAPHANDLER_H
Loading

0 comments on commit 83c25e3

Please sign in to comment.