[Final] universal purchases #183

aboedo · 2020-02-13T20:30:37Z

Adds support for tvOS and watchOS.

To do:

Platforms:

Cocoapods support

Other:

~~(watchOS only) Add a public method for the app to notify when it has become active, since didBecomeActive notification isn't available on watchOS.~~ edit: this was replaced by the correct call for when the extension has become active on watchOS thanks to @fnazarios
Update platform string for watch and tv, once backend support for them is added.
Swift Package Manager support: it compiles correctly on Xcode < 11.4, but 11.4 raises some linking issues. I've been trying to get around them but couldn't. Maybe the next beta will fix them.

HOLD

This PR is on hold until the khepri side is deployed.

Future changes

Carthage support (Mac version won't be supported until Carthage supports XCFrameworks)

vegaro · 2020-02-18T22:33:23Z

Package.swift

@@ -22,7 +22,7 @@ func resolveTargets() -> [Target] {
        .target(name: "Purchases",
                dependencies: [],
                path: ".",
-                sources: ["Purchases", "Purchases/Public", "Purchases/Caching"],
+                sources: ["Purchases", "Purchases/Public"],


I think this is a wrong conflict resolution

I'm honestly not sure what to do here.
in theory, sources is supposed to recursively add subfolders, so you should only really need ["Purchases"].
However, if I remove "Public", I get a compilation error, undefined symbol.
For the Caching folder, though, it works fine if you don't add it here.
Ideally I'd like to figure out why the reference to Public is needed, and if possible remove it.

vegaro · 2020-02-18T22:34:32Z

Purchases.podspec

@@ -17,6 +17,8 @@ Pod::Spec.new do |s|

  s.ios.deployment_target = '9.0'
  s.osx.deployment_target = '10.12'
+  s.watchos.deployment_target = '6.2'
+  s.tvos.deployment_target = '13.4'


don't we support older versions?

I was honestly not sure about this. Since there wasn't a test app and tvOS wasn't a part of the target device families, I didn't even know whether it compiled on tvOS before this.
I meant to test further on tvOS but I got distracted with other stuff.
I just tried a new tvOS app on 3.0.4 and it does compile and seems to work. I don't have a physical apple tv so I can't get much further than that, unfortunately.
I'll change the target to tvOS 9 since it's the first one that's compatible with StoreKit. Maybe we could sync up later about how best to test this?

chatted about this on slack. Since we currently don't specify the target, nothing stops you right now from using purchases-ios with tvOS 9+. It won't compile with anything before that because StoreKit wasn't included in tvOS until v9.
we're going to go with deployment_target = 9 to reflect this, so that at least we have an explicit value to reference.

vegaro · 2020-02-18T22:35:02Z

Purchases/Public/RCPurchases.h

@@ -399,6 +399,14 @@ NS_SWIFT_NAME(entitlements(_:)) RC_UNAVAILABLE("entitlements: has been replaced
 */
 - (void)invalidatePurchaserInfoCache;

+#if TARGET_OS_WATCH
+/**
+ Used to notify Purchses that the app has become active. WatchOS doesn't implement the ApplicationDidBecomeActive


typo "Purchses"

vegaro · 2020-02-18T22:41:16Z

Purchases/RCAttributionFetcher.m

@@ -46,7 +46,7 @@ - (nullable NSString *)advertisingIdentifier

 - (nullable NSString *)identifierForVendor
 {
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IOS


what about tv os? because TARGET_OS_IPHONE also includes Apple TVs right?

world's most confusing macros (the tv is iPhone but it isn't iOS?). Good catch, I'll update

vegaro · 2020-02-18T22:42:45Z

Purchases/Public/RCPurchasesErrorUtils.m

@@ -150,7 +150,7 @@ static RCPurchasesErrorCode RCPurchasesErrorCodeFromRCBackendErrorCode(RCBackend
    return RCUnknownError;
 }

-#if TARGET_OS_IPHONE
+#if TARGET_OS_IOS


what about tv os?

updated. This class actually merits more thought (maybe on a separate PR) because some of these error codes are now mac compatible

vegaro · 2020-02-18T22:43:37Z

Purchases/RCStoreKitWrapper.m

@@ -82,7 +82,7 @@ - (void)paymentQueue:(SKPaymentQueue *)queue removedTransactions:(NSArray<SKPaym
    }
 }

-#if TARGET_OS_IPHONE && !TARGET_OS_MACCATALYST
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST


same thing about Apple TV here

aboedo · 2020-02-19T20:29:01Z

backend support has been deployed, removing the [Hold]

aboedo · 2020-03-19T14:59:37Z

@fnazarios changes were integrated here, 4648bf7.
Thanks again for making the PR, and sorry that the rebase broke the diff! the feature/watch_os_app branch has been rebased so it now includes them. Let me know if I missed anything!

aboedo · 2020-03-23T15:35:39Z

@vegaro bump

vegaro · 2020-03-23T15:41:26Z

Purchases/RCCrossPlatformSupport.h

+
+#if TARGET_OS_IPHONE
+#import <UIKit/UIKit.h>
+#elif TARGET_OS_OSX


This used to be TARGET_OS_MAC

yeah, but the thing is that TARGET_OS_MAC = 1 on iOS. well, it's true for pretty much everything apple. this was working before because we were checking for iPhone first and this was the else variant, which would be true for everything.

TARGET_OS_WIN32 - Generated code will run under 32-bit Windows TARGET_OS_UNIX - Generated code will run under some Unix (not OSX) TARGET_OS_MAC - Generated code will run under Mac OS X variant TARGET_OS_OSX - Generated code will run under OS X devices TARGET_OS_IPHONE - Generated code for firmware, devices, or simulator TARGET_OS_IOS - Generated code will run under iOS TARGET_OS_TV - Generated code will run under Apple TV OS TARGET_OS_WATCH - Generated code will run under Apple Watch OS TARGET_OS_BRIDGE - Generated code will run under Bridge devices TARGET_OS_MACCATALYST - Generated code will run under macOS TARGET_OS_SIMULATOR - Generated code will run under a simulator

vegaro · 2020-03-23T15:41:57Z

Purchases/RCAttributionFetcher.m

@@ -56,7 +56,7 @@ - (nullable NSString *)identifierForVendor

 - (void)adClientAttributionDetailsWithCompletionBlock:(void (^)(NSDictionary<NSString *, NSObject *> * _Nullable attributionDetails, NSError * _Nullable error))completionHandler
 {
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IOS


TARGET_OS_TV won't enter here and it was before, is that expected

ADClient isn't available on apple tv https://developer.apple.com/documentation/iad/adclient?language=objc
(actually, the entire iAd isn't available on TV for whatever reason)

thinking about this more, maybe the ideal way to do this is to set up a couple of macros that define:
PLATFORM_INCLUDES_IAD and stuff like that so that the intention is very clear. thoughts?

vegaro · 2020-03-23T15:43:40Z

Package.swift

@@ -48,7 +49,7 @@ func resolveTargets() -> [Target] {
 let package = Package(
        name: "Purchases",
        platforms: [
-            .macOS(.v10_12), .iOS(.v9)
+            .macOS(.v10_12), .iOS(.v9), .watchOS("6.2"), .tvOS("13.4")


We have some tvOS apps already, will this change affect them?

I'm updating this one per the conversation we had a while back, I'd forgot to perform the update here.

I'm not sure they were able to use Purchases through SPM though - note that the TV platform wasn't defined for it before this PR

vegaro · 2020-03-23T15:44:20Z

Purchases.podspec

@@ -17,6 +17,8 @@ Pod::Spec.new do |s|

  s.ios.deployment_target = '9.0'
  s.osx.deployment_target = '10.12'
+  s.watchos.deployment_target = '6.2'
+  s.tvos.deployment_target = '9.0'


This one differs with the one in the Package.swift

this is the correct one, I'll update Package.swift

…n rule error in xcode 11.4 beta

…s compilation errors anyway

… "iOS" from watchOS until the backend supports the new platform.

…app became active.

…ingly

…of xcode 11.4 beta 3 warning

aboedo · 2020-03-24T15:24:13Z

Purchases.podspec

@@ -17,6 +17,8 @@ Pod::Spec.new do |s|

  s.ios.deployment_target = '9.0'
  s.osx.deployment_target = '10.12'
+  s.watchos.deployment_target = '6.2'
+  s.tvos.deployment_target = '9.0'


this is the correct one, I'll update Package.swift

aboedo · 2020-03-24T15:28:29Z

Purchases/RCAttributionFetcher.m

@@ -56,7 +56,7 @@ - (nullable NSString *)identifierForVendor

 - (void)adClientAttributionDetailsWithCompletionBlock:(void (^)(NSDictionary<NSString *, NSObject *> * _Nullable attributionDetails, NSError * _Nullable error))completionHandler
 {
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IOS


ADClient isn't available on apple tv https://developer.apple.com/documentation/iad/adclient?language=objc
(actually, the entire iAd isn't available on TV for whatever reason)

aboedo · 2020-03-24T15:33:25Z

Purchases/RCCrossPlatformSupport.h

+
+#if TARGET_OS_IPHONE
+#import <UIKit/UIKit.h>
+#elif TARGET_OS_OSX


yeah, but the thing is that TARGET_OS_MAC = 1 on iOS. well, it's true for pretty much everything apple. this was working before because we were checking for iPhone first and this was the else variant, which would be true for everything.

TARGET_OS_WIN32 - Generated code will run under 32-bit Windows TARGET_OS_UNIX - Generated code will run under some Unix (not OSX) TARGET_OS_MAC - Generated code will run under Mac OS X variant TARGET_OS_OSX - Generated code will run under OS X devices TARGET_OS_IPHONE - Generated code for firmware, devices, or simulator TARGET_OS_IOS - Generated code will run under iOS TARGET_OS_TV - Generated code will run under Apple TV OS TARGET_OS_WATCH - Generated code will run under Apple Watch OS TARGET_OS_BRIDGE - Generated code will run under Bridge devices TARGET_OS_MACCATALYST - Generated code will run under macOS TARGET_OS_SIMULATOR - Generated code will run under a simulator

aboedo · 2020-03-24T15:35:09Z

Purchases/RCCrossPlatformSupport.h

 #define PLATFORM_HEADER @"iOS"
-#elif TARGET_OS_MAC
+#elif TARGET_OS_OSX


here's where using MAC would be problematic - it'd always be true and we'd never go into the other cases

aboedo · 2020-03-24T15:35:56Z

Package.swift

@@ -48,7 +49,7 @@ func resolveTargets() -> [Target] {
 let package = Package(
        name: "Purchases",
        platforms: [
-            .macOS(.v10_12), .iOS(.v9)
+            .macOS(.v10_12), .iOS(.v9), .watchOS("6.2"), .tvOS("13.4")


I'm updating this one per the conversation we had a while back, I'd forgot to perform the update here.

aboedo · 2020-03-24T15:36:44Z

Package.swift

@@ -48,7 +49,7 @@ func resolveTargets() -> [Target] {
 let package = Package(
        name: "Purchases",
        platforms: [
-            .macOS(.v10_12), .iOS(.v9)
+            .macOS(.v10_12), .iOS(.v9), .watchOS("6.2"), .tvOS("13.4")


I'm not sure they were able to use Purchases through SPM though - note that the TV platform wasn't defined for it before this PR

vegaro

Feel free to merge after solving that question about PURCHASES_INITIATED_FROM_APP_STORE_AVAILABLE

Purchases/RCCrossPlatformSupport.h

aboedo self-assigned this Feb 13, 2020

aboedo changed the title ~~[WIP] universal purchases~~ [Final][Hold] universal purchases Feb 13, 2020

aboedo requested a review from vegaro February 17, 2020 19:10

aboedo mentioned this pull request Feb 17, 2020

[final][hold] add catalyst app #184

Merged

vegaro reviewed Feb 18, 2020

View reviewed changes

aboedo requested a review from vegaro February 19, 2020 18:02

aboedo changed the title ~~[Final][Hold] universal purchases~~ [Final] universal purchases Feb 19, 2020

aboedo mentioned this pull request Mar 5, 2020

Unable to compile in Xcode 11.4 Beta 2 #185

Closed

aboedo force-pushed the feature/universal_purchases branch 2 times, most recently from 01c0b85 to c81bc54 Compare March 16, 2020 21:48

aboedo force-pushed the feature/universal_purchases branch from c81bc54 to 0b26feb Compare March 19, 2020 14:28

aboedo force-pushed the feature/universal_purchases branch from 5424ae5 to da9298f Compare March 19, 2020 15:27

aboedo mentioned this pull request Mar 19, 2020

How to use the library in watch app? #207

Closed

vegaro reviewed Mar 23, 2020

View reviewed changes

aboedo added 13 commits March 24, 2020 12:24

added tvOS and watchOS to supported platforms

cbea6e3

added platform versions for watchOS and tvOS

680d9b3

fixed missing dots in platforms

a7ac41a

fixed compilation issues related to target platforms for watch os

0c8ec23

more fixes for APIs that are unavailable on watchOS

e6bf728

test removing other sources folders to prevent a duplicate compilatio…

40542e9

…n rule error in xcode 11.4 beta

reverted to including public in sources, because otherwise xcode give…

fc75aa1

…s compilation errors anyway

test removing sources to prevent compilation warnings in xcode 11.4

60eebfc

fixed deployment for cocoapods. Updated platforms to temporarily send…

8739ae7

… "iOS" from watchOS until the backend supports the new platform.

added comment and sent iOS as the platform for tvOS as well

a3b5422

added new method, watchAppDidBecomeActive, to be called when a watch …

a6c1246

…app became active.

added watchOS and tvOS to targeted device families

343c552

updated headers to the final version

b84108e

aboedo added 7 commits March 24, 2020 12:24

fix typo

c471970

updated tvOS deployment target to 9.0

a2a35e1

checked availability for different apis and updated the macros accord…

05795b0

…ingly

added TVOS to another macro check

f564e56

added explicit exclusion of Info.plist file in the target to get rid …

d86aefe

…of xcode 11.4 beta 3 warning

added MACROS did become active and resign active to watchOS

53a4342

re-added accidentally deleted lines and extra method from rebase

4596416

aboedo force-pushed the feature/universal_purchases branch from da9298f to 4596416 Compare March 24, 2020 15:24

updated tvOS version for SPM to .v9

90b0424

aboedo commented Mar 24, 2020

View reviewed changes

aboedo added 3 commits March 24, 2020 17:36

added new pre-processor macros for clarity

de2eb71

added macCatalyst to cases for app did become active notification

68fae24

fix imports

bcb7800

vegaro approved these changes Mar 24, 2020

View reviewed changes

Purchases/RCCrossPlatformSupport.h Outdated Show resolved Hide resolved

fix PURCHASES_INITIATED_FROM_APP_STORE_AVAILABLE pre-processor macro

6931ad7

aboedo merged commit 2d5c123 into master Mar 25, 2020

aboedo deleted the feature/universal_purchases branch March 27, 2020 22:46

aboedo mentioned this pull request Jul 13, 2021

Release: 3.12.0 #648

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Final] universal purchases #183

[Final] universal purchases #183

aboedo commented Feb 13, 2020 •

edited

Loading

vegaro Feb 18, 2020

aboedo Feb 19, 2020

vegaro Feb 18, 2020

aboedo Feb 19, 2020

aboedo Feb 19, 2020

vegaro Feb 18, 2020

vegaro Feb 18, 2020

aboedo Feb 19, 2020

vegaro Feb 18, 2020

aboedo Feb 19, 2020

vegaro Feb 18, 2020

aboedo Feb 19, 2020

aboedo commented Feb 19, 2020

aboedo commented Mar 19, 2020

aboedo commented Mar 23, 2020

vegaro Mar 23, 2020

aboedo Mar 24, 2020

vegaro Mar 23, 2020

aboedo Mar 24, 2020

aboedo Mar 24, 2020

vegaro Mar 23, 2020

aboedo Mar 24, 2020

aboedo Mar 24, 2020

vegaro Mar 23, 2020

aboedo Mar 24, 2020

aboedo Mar 24, 2020

aboedo Mar 24, 2020

aboedo Mar 24, 2020

aboedo Mar 24, 2020

aboedo Mar 24, 2020

aboedo Mar 24, 2020

vegaro left a comment

[Final] universal purchases #183

[Final] universal purchases #183

Conversation

aboedo commented Feb 13, 2020 • edited Loading

To do:

HOLD

Future changes

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aboedo commented Feb 19, 2020

aboedo commented Mar 19, 2020

aboedo commented Mar 23, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vegaro left a comment

Choose a reason for hiding this comment

aboedo commented Feb 13, 2020 •

edited

Loading