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

VPN-6742: update minimum iOS version to iOS 15 #10078

Merged
merged 3 commits into from
Dec 5, 2024
Merged

VPN-6742: update minimum iOS version to iOS 15 #10078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba90129
VPN-6742 update minimum iOS version to iOS 15
mcleinman Nov 26, 2024
0f262ae
small fix ups - not able to build locally, so relying on server
mcleinman Nov 26, 2024
bd13256
move swift
mcleinman Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
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
View file
Open in desktop
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
Loading