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

[CF-106] Fetch AdServices Token #1519

Merged
merged 45 commits into from
May 2, 2022
Merged

[CF-106] Fetch AdServices Token #1519

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
f3131f9
Add new configuration option automaticAdServicesAttributionTokenColle…
Apr 20, 2022
d322c7c
Add postAdServicesTokenIfNeeded, call in same places as old iAD calls
Apr 20, 2022
dbcdc4c
Fetch and post ad services token
Apr 20, 2022
c557ba5
Fix incorrect available check
Apr 20, 2022
882a936
Pull discount string from attribution strings to StoreKitStrings
Apr 20, 2022
21aa633
Merge branch 'main' into ad-services
Apr 20, 2022
cc93cdb
fetching unit tests
Apr 20, 2022
9706097
formatting/renaming
Apr 20, 2022
c98031a
Remove code for fetching
Apr 20, 2022
03357e7
Use canImport
Apr 20, 2022
bcd58a2
Update availability checks, move to Deprecations.swift
Apr 21, 2022
5c957b7
Merge branch 'ad-services' of github.com:RevenueCat/purchases-ios int…
Apr 21, 2022
4c6332c
Remove some todos, fix formatting
Apr 21, 2022
4a952c4
fix lint
Apr 22, 2022
3811408
fix mockattributionfetcher
Apr 25, 2022
e02c0d2
API testers
Apr 25, 2022
81f2628
Merge branch 'ad-services-sdk' into ad-services
Apr 25, 2022
47ecfff
move rest of deprecations to deprecations.swift
Apr 25, 2022
d51c37f
Add comment about OS availability
Apr 25, 2022
f2014f8
Revert "move rest of deprecations to deprecations.swift"
Apr 25, 2022
8923389
Add explicit integer values for attribution networks
Apr 25, 2022
e5dea3a
Fix deprecation warning ...
Apr 25, 2022
10a073b
update fastlane
Apr 25, 2022
352de9e
Revert "Fix deprecation warning ..."
Apr 26, 2022
bae8e3c
skipping setting properties on de-init
Apr 26, 2022
d4a552a
Update docc and AttributionNetwork api tester
Apr 26, 2022
c181dc7
Remove iad code
Apr 26, 2022
f29aedb
deprecate attributionnetwork enum value
Apr 26, 2022
d6d3dc7
remove superfluous lint disable
Apr 27, 2022
67b3e7a
remove iad-associated unit tests
Apr 27, 2022
4d800ac
Merge branch 'ad-services-sdk' into ad-services
Apr 27, 2022
2b21373
fix more unit tests
Apr 27, 2022
61c28a3
Fix bad merges
Apr 27, 2022
26b02f7
remove PostAttributionDataOperation and AfficheClientProxy
Apr 27, 2022
a11742a
Make adServicesToken a var
Apr 28, 2022
6a7697b
use do catch, more details in error log
Apr 28, 2022
60db73b
formatting
Apr 28, 2022
1df28a0
Update Sources/Purchasing/Purchases.swift
Apr 28, 2022
3e3d383
linking optional
Apr 28, 2022
cc98cbe
directly return
Apr 28, 2022
839bc8d
`CustomerInfo`: moved deprecated property to `Deprecations` (#1549)
NachoSoto Apr 28, 2022
2c16386
make error not optional
Apr 28, 2022
42bbabc
Merge branch 'main' into ad-services
Apr 28, 2022
3de0061
Add AdServices.framework to APITesters
joshdholtz Apr 29, 2022
d9f757b
Don't link `AdServices.framework` on `watchOS` & `tvOS` (#1554)
NachoSoto Apr 29, 2022
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
4 changes: 4 additions & 0 deletions Tests/APITesters/ObjCAPITester/ObjCAPITester.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
2C396F5E281C64B700669657 /* AdServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C396F5D281C64B700669657 /* AdServices.framework */; };
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ I think we shouldn't do this. The fact that APITesters needs it is a sign that users will need to add it as well, which isn't good. I'm guessing the actual problem was this: #1554.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

agreed. promise i won't forget this before merging to main.

2DD77909270E23870079CBD4 /* RCAttributionNetworkAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = A5D614EC26EBE84F007DDB75 /* RCAttributionNetworkAPI.m */; };
2DD7790B270E23870079CBD4 /* RCCustomerInfoAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = A5D614F026EBE84F007DDB75 /* RCCustomerInfoAPI.m */; };
2DD7790C270E23870079CBD4 /* RCPurchasesErrorCodeAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = A5D614EE26EBE84F007DDB75 /* RCPurchasesErrorCodeAPI.m */; };
Expand Down Expand Up @@ -45,6 +46,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
2C396F5D281C64B700669657 /* AdServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdServices.framework; path = System/Library/Frameworks/AdServices.framework; sourceTree = SDKROOT; };
2DD778F5270E235B0079CBD4 /* ObjCAPITester.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ObjCAPITester.app; sourceTree = BUILT_PRODUCTS_DIR; };
5738F426278672070096D623 /* RCStoreProductDiscountAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCStoreProductDiscountAPI.h; sourceTree = "<group>"; };
5738F427278672070096D623 /* RCStoreProductDiscountAPI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCStoreProductDiscountAPI.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -95,6 +97,7 @@
buildActionMask = 2147483647;
files = (
575885A42748274E00CA2169 /* RevenueCat.framework in Frameworks */,
2C396F5E281C64B700669657 /* AdServices.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -165,6 +168,7 @@
A52A8A3A26EC2AEC00F06846 /* Frameworks */ = {
isa = PBXGroup;
children = (
2C396F5D281C64B700669657 /* AdServices.framework */,
575885A32748274E00CA2169 /* RevenueCat.framework */,
5758859F2748274600CA2169 /* RevenueCat.framework */,
57588593274826DF00CA2169 /* RevenueCat.framework */,
Expand Down
4 changes: 4 additions & 0 deletions Tests/APITesters/SwiftAPITester/SwiftAPITester.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
2C396F5C281C64AF00669657 /* AdServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C396F5B281C64AF00669657 /* AdServices.framework */; };
2DD778E4270E23460079CBD4 /* AttributionNetworkAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D614CA26EBE7EA007DDB75 /* AttributionNetworkAPI.swift */; };
2DD778E5270E23460079CBD4 /* IntroEligibilityAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D614CD26EBE7EA007DDB75 /* IntroEligibilityAPI.swift */; };
2DD778E6270E23460079CBD4 /* PurchasesAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D614CE26EBE7EA007DDB75 /* PurchasesAPI.swift */; };
Expand Down Expand Up @@ -45,6 +46,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
2C396F5B281C64AF00669657 /* AdServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdServices.framework; path = System/Library/Frameworks/AdServices.framework; sourceTree = SDKROOT; };
2DD778D0270E233F0079CBD4 /* SwiftAPITester.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftAPITester.app; sourceTree = BUILT_PRODUCTS_DIR; };
5738F40B27866DD00096D623 /* StoreProductDiscountAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreProductDiscountAPI.swift; sourceTree = "<group>"; };
5738F429278673A80096D623 /* SubscriptionPeriodAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionPeriodAPI.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -75,6 +77,7 @@
buildActionMask = 2147483647;
files = (
5758859C2748272A00CA2169 /* RevenueCat.framework in Frameworks */,
2C396F5C281C64AF00669657 /* AdServices.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -84,6 +87,7 @@
2D6F3871270E58DB002C9987 /* Frameworks */ = {
isa = PBXGroup;
children = (
2C396F5B281C64AF00669657 /* AdServices.framework */,
5758859B2748272A00CA2169 /* RevenueCat.framework */,
575885972748271100CA2169 /* RevenueCat.framework */,
);
Expand Down