Skip to content

Commit e64ac19

Browse files
Update to iOS SDK 8.3.0 and Android SDK 5.16.2
1 parent 429d609 commit e64ac19

42 files changed

Lines changed: 2060 additions & 244 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/unity.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Build project
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
buildForAllSupportedPlatforms:
7+
name: Build for ${{ matrix.targetPlatform }}
8+
runs-on: ubuntu-latest
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
targetPlatform:
13+
- StandaloneOSX # Build a macOS standalone (Intel 64-bit).
14+
- StandaloneWindows # Build a Windows standalone.
15+
- StandaloneWindows64 # Build a Windows 64-bit standalone.
16+
- StandaloneLinux64 # Build a Linux 64-bit standalone.
17+
- iOS # Build an iOS player.
18+
- Android # Build an Android .apk standalone app.
19+
- WebGL # WebGL.
20+
steps:
21+
- uses: actions/checkout@v2
22+
with:
23+
fetch-depth: 0
24+
lfs: true
25+
- uses: actions/cache@v2
26+
with:
27+
path: Library
28+
key: Library-${{ matrix.targetPlatform }}
29+
restore-keys: Library-
30+
- uses: game-ci/unity-builder@v2
31+
env:
32+
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
33+
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
34+
UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
35+
with:
36+
targetPlatform: ${{ matrix.targetPlatform }}
37+
- uses: actions/upload-artifact@v2
38+
with:
39+
name: Build-${{ matrix.targetPlatform }}
40+
path: build/${{ matrix.targetPlatform }}
8.75 KB
Binary file not shown.

Assets/Plugins/iOS/mParticleUnity.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ void _SetUploadInterval(int uploadInterval);
99
void _LogEvent(const char *mpEvent);
1010
void _LogCommerceEvent(const char *commerceEventJSON);
1111
void _LogScreen(const char *screenName);
12+
void _SetATTStatus(int status, double timestamp)
1213

1314
void _LeaveBreadcrumb(const char *breadcrumbName);
1415

Assets/Plugins/iOS/mParticleUnity.m

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,10 @@ void _LogScreen(const char *screenName) {
198198
[[MParticle sharedInstance] logScreenEvent:event];
199199
}
200200

201+
void _SetATTStatus(int status, double timestamp) {
202+
[[MParticle sharedInstance] setATTStatus:status withATTStatusTimestampMillis:timestamp];
203+
}
204+
201205
void _LeaveBreadcrumb(const char *breadcrumbName) {
202206
NSString *breadcrumbNameString = stringWithCString(breadcrumbName);
203207
[[MParticle sharedInstance] leaveBreadcrumb:breadcrumbNameString];
@@ -472,11 +476,11 @@ void _Upload() {
472476
char* _User_GetUserIdentities(const char *mpid) {
473477
@try {
474478
NSString *mpidString = [[NSString alloc] initWithCString:mpid encoding:NSUTF8StringEncoding];
475-
NSDictionary *userIdentities = [[[MParticle sharedInstance].identity getUser:(@([mpidString longLongValue]))] userIdentities];
479+
NSDictionary *identities = [[[MParticle sharedInstance].identity getUser:(@([mpidString longLongValue]))] identities];
476480
NSError *error;
477481
NSDictionary *userIdentityStrings = [NSMutableDictionary new];
478-
for (id key in userIdentities) {
479-
[userIdentityStrings setValue:userIdentities[key] forKey:[key stringValue]];
482+
for (id key in identities) {
483+
[userIdentityStrings setValue:identities[key] forKey:[key stringValue]];
480484
}
481485
NSData *jsonData = nil;
482486
@try {
@@ -530,7 +534,7 @@ + (MPIdentityApiRequest *) MPIdentityApiRequest:(NSDictionary *)identityRequestD
530534
if ([[identityRequestDict allKeys] containsObject:@"UserIdentities"]) {
531535
NSDictionary *identities = identityRequestDict[@"UserIdentities"];
532536
for (id key in identities) {
533-
[identityRequest setUserIdentity:identities[key] identityType:(MPUserIdentity)[key integerValue]];
537+
[identityRequest setIdentity:identities[key] identityType:(MPIdentity)[key integerValue]];
534538
}
535539
}
536540
if ([[identityRequestDict allKeys]containsObject:@"UserAliasUUID"]) {

Assets/Plugins/iOS/mParticle_Apple_SDK.framework/Headers/FilteredMParticleUser.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
//
44

55
#import <Foundation/Foundation.h>
6-
#import "MPCart.h"
76

87
@class MParticleUser;
98
@class MPKitConfiguration;

Assets/Plugins/iOS/mParticle_Apple_SDK.framework/Headers/MPBaseEvent.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
NS_ASSUME_NONNULL_BEGIN
55

6-
@interface MPBaseEvent : NSObject <NSCopying>
6+
@interface MPBaseEvent : NSObject <NSCopying>
7+
8+
- (NSString *) print;
79

810
/**
911
The timestamp when the event was created. Is non null but can be set by the client
@@ -37,6 +39,12 @@ NS_ASSUME_NONNULL_BEGIN
3739
*/
3840
@property (nonatomic, strong, readonly, nullable) NSMutableDictionary<NSString *, __kindof NSArray<NSString *> *> *customFlags;
3941

42+
/**
43+
Whether the SDK should automatically begin a session if one does not already exist (defaults to YES).
44+
This should typically be set to NO if the app is launched from a background notification.
45+
*/
46+
@property (nonatomic) BOOL shouldBeginSession;
47+
4048
/**
4149
A Dictionary representation of this instance for uploading the event
4250
Must be overridden by a subclass
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#import <Foundation/Foundation.h>
2+
3+
NS_ASSUME_NONNULL_BEGIN
4+
5+
/**
6+
* Record of consent under the CCPA.
7+
*/
8+
@interface MPCCPAConsent : NSObject <NSCopying>
9+
10+
/**
11+
* Whether the user consented to data collection
12+
This should be set to false if the user has opted out of data sharing under the CCPA.
13+
*/
14+
@property (nonatomic, assign) BOOL consented;
15+
/**
16+
* The data collection document to which the user consented or did not consent
17+
*/
18+
@property (nonatomic, copy, nullable) NSString *document;
19+
/**
20+
* Timestamp when the user was prompted for consent
21+
*/
22+
@property (nonatomic, copy) NSDate *timestamp;
23+
/**
24+
* Where the consent prompt took place. This can be a physical or digital location (e.g. URL)
25+
*/
26+
@property (nonatomic, copy, nullable) NSString *location;
27+
/**
28+
* The device ID associated with this consent record
29+
*/
30+
@property (nonatomic, copy, nullable) NSString *hardwareId;
31+
32+
@end
33+
34+
NS_ASSUME_NONNULL_END

Assets/Plugins/iOS/mParticle_Apple_SDK.framework/Headers/MPCart.h

Lines changed: 0 additions & 104 deletions
This file was deleted.

Assets/Plugins/iOS/mParticle_Apple_SDK.framework/Headers/MPCommerce.h

Lines changed: 0 additions & 92 deletions
This file was deleted.

Assets/Plugins/iOS/mParticle_Apple_SDK.framework/Headers/MPConsentState.h

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
NS_ASSUME_NONNULL_BEGIN
44

55
@class MPGDPRConsent;
6+
@class MPCCPAConsent;
67

78
/**
89
* ConsentState represents the set of purposes and regulations for which a user
910
* has consented for data collection.
1011
*/
1112
@interface MPConsentState : NSObject
1213

14+
#pragma mark GDPR
15+
1316
/**
1417
* Retrieve the current GDPR consent state for this user.
1518
*
@@ -38,6 +41,23 @@ NS_ASSUME_NONNULL_BEGIN
3841
*/
3942
- (void)setGDPRConsentState:(nullable NSDictionary<NSString *, MPGDPRConsent *> *)consentState;
4043

44+
#pragma mark CCPA
45+
46+
/**
47+
* Retrieve the current CCPA consent state for this user.
48+
*/
49+
- (nullable MPCCPAConsent *)ccpaConsentState;
50+
51+
/**
52+
* Set the CCPA consent state.
53+
*/
54+
- (void)setCCPAConsentState:(MPCCPAConsent *)consent;
55+
56+
/**
57+
* Remove the CCPA consent state for this builder.
58+
*/
59+
- (void)removeCCPAConsentState;
60+
4161
@end
4262

4363
NS_ASSUME_NONNULL_END

0 commit comments

Comments
 (0)