Skip to content

Commit 69891bd

Browse files
uerceguerceg
authored
Merge pull request #433 from adjust/v4220
Version 4.22.0
2 parents 8c1f10b + fa721bc commit 69891bd

File tree

78 files changed

+1653
-1117
lines changed

Some content is hidden

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

78 files changed

+1653
-1117
lines changed

‎Adjust.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Pod::Spec.new do |s|
22
s.name = "Adjust"
3-
s.version = "4.21.3"
3+
s.version = "4.22.0"
44
s.summary = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
55
s.homepage = "https://github.com/adjust/ios_sdk"
66
s.license = { :type => 'MIT', :file => 'MIT-LICENSE' }
77
s.author = { "Christian Wellenbrock" => "[email protected]" }
8-
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.21.3" }
8+
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.22.0" }
99
s.ios.deployment_target = '6.0'
1010
s.tvos.deployment_target = '9.0'
1111
s.framework = 'SystemConfiguration'

‎Adjust.xcodeproj/project.pbxproj‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,16 @@
216216
9D0E2EB9210B575600133B4F /* WKWebViewJavascriptBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D0E2E68210B575600133B4F /* WKWebViewJavascriptBridge.h */; settings = {ATTRIBUTES = (Public, ); }; };
217217
9D0E2EBA210B575600133B4F /* AdjustBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D0E2E69210B575600133B4F /* AdjustBridge.h */; settings = {ATTRIBUTES = (Public, ); }; };
218218
9D0E2EBB210B575600133B4F /* AdjustBridgeRegister.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D0E2E6A210B575600133B4F /* AdjustBridgeRegister.m */; };
219+
9D2F23E22447CE5C00B7CA90 /* ADJSubscription.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D2F23E02447CE5C00B7CA90 /* ADJSubscription.h */; settings = {ATTRIBUTES = (Public, ); }; };
220+
9D2F23E32447CE5C00B7CA90 /* ADJSubscription.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D2F23E12447CE5C00B7CA90 /* ADJSubscription.m */; };
221+
9D2F23F82447DCE800B7CA90 /* ADJSubscription.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D2F23F62447DCE800B7CA90 /* ADJSubscription.m */; };
222+
9D2F23F92447DCE800B7CA90 /* ADJSubscription.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D2F23F72447DCE800B7CA90 /* ADJSubscription.h */; settings = {ATTRIBUTES = (Public, ); }; };
223+
9D2F23FC2447DD2500B7CA90 /* ADJSubscription.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D2F23FA2447DD2500B7CA90 /* ADJSubscription.h */; settings = {ATTRIBUTES = (Public, ); }; };
224+
9D2F23FD2447DD2500B7CA90 /* ADJSubscription.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D2F23FB2447DD2500B7CA90 /* ADJSubscription.m */; };
225+
9D2F24002447DD3700B7CA90 /* ADJSubscription.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D2F23FE2447DD3600B7CA90 /* ADJSubscription.h */; settings = {ATTRIBUTES = (Public, ); }; };
226+
9D2F24012447DD3700B7CA90 /* ADJSubscription.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D2F23FF2447DD3700B7CA90 /* ADJSubscription.m */; };
227+
9D2F24042447DD6000B7CA90 /* ADJSubscription.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D2F24022447DD6000B7CA90 /* ADJSubscription.m */; };
228+
9D2F24052447DD6000B7CA90 /* ADJSubscription.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D2F24032447DD6000B7CA90 /* ADJSubscription.h */; settings = {ATTRIBUTES = (Public, ); }; };
219229
9D363AC31BDA50FA00B47FE9 /* ADJLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 96E5E37318BBB48A008E7B30 /* ADJLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
220230
9D7431EA1EB9F9B700969F14 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D7431E91EB9F9B700969F14 /* main.m */; };
221231
9D7431ED1EB9F9B700969F14 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D7431EC1EB9F9B700969F14 /* AppDelegate.m */; };
@@ -806,6 +816,16 @@
806816
9D0E2E68210B575600133B4F /* WKWebViewJavascriptBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewJavascriptBridge.h; sourceTree = "<group>"; };
807817
9D0E2E69210B575600133B4F /* AdjustBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdjustBridge.h; sourceTree = "<group>"; };
808818
9D0E2E6A210B575600133B4F /* AdjustBridgeRegister.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdjustBridgeRegister.m; sourceTree = "<group>"; };
819+
9D2F23E02447CE5C00B7CA90 /* ADJSubscription.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ADJSubscription.h; sourceTree = "<group>"; };
820+
9D2F23E12447CE5C00B7CA90 /* ADJSubscription.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ADJSubscription.m; sourceTree = "<group>"; };
821+
9D2F23F62447DCE800B7CA90 /* ADJSubscription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJSubscription.m; sourceTree = "<group>"; };
822+
9D2F23F72447DCE800B7CA90 /* ADJSubscription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJSubscription.h; sourceTree = "<group>"; };
823+
9D2F23FA2447DD2500B7CA90 /* ADJSubscription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJSubscription.h; sourceTree = "<group>"; };
824+
9D2F23FB2447DD2500B7CA90 /* ADJSubscription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJSubscription.m; sourceTree = "<group>"; };
825+
9D2F23FE2447DD3600B7CA90 /* ADJSubscription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJSubscription.h; sourceTree = "<group>"; };
826+
9D2F23FF2447DD3700B7CA90 /* ADJSubscription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJSubscription.m; sourceTree = "<group>"; };
827+
9D2F24022447DD6000B7CA90 /* ADJSubscription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJSubscription.m; sourceTree = "<group>"; };
828+
9D2F24032447DD6000B7CA90 /* ADJSubscription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJSubscription.h; sourceTree = "<group>"; };
809829
9D449DB31E6ED23400E7E80B /* AdjustExample-iWatch.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "AdjustExample-iWatch.xcodeproj"; path = "examples/AdjustExample-iWatch/AdjustExample-iWatch.xcodeproj"; sourceTree = "<group>"; };
810830
9D449DBF1E6ED23900E7E80B /* AdjustExample-Swift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "AdjustExample-Swift.xcodeproj"; path = "examples/AdjustExample-Swift/AdjustExample-Swift.xcodeproj"; sourceTree = "<group>"; };
811831
9D449DC51E6ED24000E7E80B /* AdjustExample-tvOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "AdjustExample-tvOS.xcodeproj"; path = "examples/AdjustExample-tvOS/AdjustExample-tvOS.xcodeproj"; sourceTree = "<group>"; };
@@ -1334,6 +1354,8 @@
13341354
6FCC84F71F278CF300D6A0ED /* ADJReachability.m */,
13351355
9DD0E9AC1F44690B00B2A759 /* ADJUserDefaults.h */,
13361356
9DD0E9AD1F44690B00B2A759 /* ADJUserDefaults.m */,
1357+
9D2F23E02447CE5C00B7CA90 /* ADJSubscription.h */,
1358+
9D2F23E12447CE5C00B7CA90 /* ADJSubscription.m */,
13371359
);
13381360
path = Adjust;
13391361
sourceTree = "<group>";
@@ -1434,6 +1456,8 @@
14341456
9D0E2E58210B575600133B4F /* ADJTimerCycle.h */,
14351457
9D0E2E59210B575600133B4F /* ADJActivityHandler.m */,
14361458
9D0E2E5A210B575600133B4F /* ADJReachability.m */,
1459+
9D2F24032447DD6000B7CA90 /* ADJSubscription.h */,
1460+
9D2F24022447DD6000B7CA90 /* ADJSubscription.m */,
14371461
);
14381462
path = Adjust;
14391463
sourceTree = SOURCE_ROOT;
@@ -1638,6 +1662,8 @@
16381662
9DEAF0F2210072BC005CAEDB /* ADJTimerCycle.h */,
16391663
9DEAF0F3210072BC005CAEDB /* ADJActivityHandler.m */,
16401664
9DEAF0F4210072BC005CAEDB /* ADJReachability.m */,
1665+
9D2F23FA2447DD2500B7CA90 /* ADJSubscription.h */,
1666+
9D2F23FB2447DD2500B7CA90 /* ADJSubscription.m */,
16411667
);
16421668
path = Adjust;
16431669
sourceTree = SOURCE_ROOT;
@@ -1717,6 +1743,8 @@
17171743
96B671131D788F4A0090A023 /* ADJSessionParameters.m */,
17181744
6FCC85021F27944600D6A0ED /* ADJReachability.h */,
17191745
6FCC85031F27944600D6A0ED /* ADJReachability.m */,
1746+
9D2F23F72447DCE800B7CA90 /* ADJSubscription.h */,
1747+
9D2F23F62447DCE800B7CA90 /* ADJSubscription.m */,
17201748
);
17211749
path = Adjust;
17221750
sourceTree = SOURCE_ROOT;
@@ -1816,6 +1844,8 @@
18161844
96B671171D788F7A0090A023 /* ADJSessionParameters.m */,
18171845
6FCC85071F27948700D6A0ED /* ADJReachability.h */,
18181846
6FCC85061F27948700D6A0ED /* ADJReachability.m */,
1847+
9D2F23FE2447DD3600B7CA90 /* ADJSubscription.h */,
1848+
9D2F23FF2447DD3700B7CA90 /* ADJSubscription.m */,
18191849
);
18201850
path = Adjust;
18211851
sourceTree = SOURCE_ROOT;
@@ -1845,6 +1875,7 @@
18451875
96BCFBD01AC9923F005A65C5 /* ADJConfig.h in Headers */,
18461876
9D363AC31BDA50FA00B47FE9 /* ADJLogger.h in Headers */,
18471877
96BCFBD11AC99246005A65C5 /* ADJAttribution.h in Headers */,
1878+
9D2F23E22447CE5C00B7CA90 /* ADJSubscription.h in Headers */,
18481879
9601CAE81C74BAAE00670879 /* ADJEventFailure.h in Headers */,
18491880
9601CAE41C74B70600670879 /* ADJEventSuccess.h in Headers */,
18501881
6FCC85011F278CF300D6A0ED /* ADJReachability.h in Headers */,
@@ -1890,6 +1921,7 @@
18901921
9D0E2E6B210B575600133B4F /* ADJConfig.h in Headers */,
18911922
9D0E2E8F210B575600133B4F /* ADJEvent.h in Headers */,
18921923
9D0E2E73210B575600133B4F /* ADJAttribution.h in Headers */,
1924+
9D2F24052447DD6000B7CA90 /* ADJSubscription.h in Headers */,
18931925
9D0E2EA2210B575600133B4F /* ADJEventFailure.h in Headers */,
18941926
9D0E2EA1210B575600133B4F /* ADJEventSuccess.h in Headers */,
18951927
9D0E2E9E210B575600133B4F /* ADJSessionFailure.h in Headers */,
@@ -1931,6 +1963,7 @@
19311963
9DEAF0F9210072BC005CAEDB /* Adjust.h in Headers */,
19321964
9DEAF0F5210072BC005CAEDB /* ADJConfig.h in Headers */,
19331965
9DEAF119210072BC005CAEDB /* ADJEvent.h in Headers */,
1966+
9D2F23FC2447DD2500B7CA90 /* ADJSubscription.h in Headers */,
19341967
9DEAF0FD210072BC005CAEDB /* ADJAttribution.h in Headers */,
19351968
9DEAF12E210072BC005CAEDB /* ADJSessionSuccess.h in Headers */,
19361969
9DEAF128210072BC005CAEDB /* ADJSessionFailure.h in Headers */,
@@ -1973,6 +2006,7 @@
19732006
9DF9C91F1D6F3CA5008E362F /* ADJConfig.h in Headers */,
19742007
9DF9C92B1D6F3CA5008E362F /* ADJLogger.h in Headers */,
19752008
9DF9C9191D6F3CA5008E362F /* ADJAttribution.h in Headers */,
2009+
9D2F23F92447DCE800B7CA90 /* ADJSubscription.h in Headers */,
19762010
9DF9C9251D6F3CA5008E362F /* ADJEventFailure.h in Headers */,
19772011
9DF9C9271D6F3CA5008E362F /* ADJEventSuccess.h in Headers */,
19782012
9DF9C9371D6F3CA5008E362F /* ADJSessionFailure.h in Headers */,
@@ -2014,6 +2048,7 @@
20142048
9DFB06701D7470C0006D48FC /* ADJConfig.h in Headers */,
20152049
9DFB067C1D7470C0006D48FC /* ADJLogger.h in Headers */,
20162050
9DFB066A1D7470C0006D48FC /* ADJAttribution.h in Headers */,
2051+
9D2F24002447DD3700B7CA90 /* ADJSubscription.h in Headers */,
20172052
9DFB06761D7470C0006D48FC /* ADJEventFailure.h in Headers */,
20182053
9DFB06781D7470C0006D48FC /* ADJEventSuccess.h in Headers */,
20192054
9DFB06881D7470C0006D48FC /* ADJSessionFailure.h in Headers */,
@@ -2197,7 +2232,7 @@
21972232
9679920518BBAE2800394606 /* Project object */ = {
21982233
isa = PBXProject;
21992234
attributes = {
2200-
LastUpgradeCheck = 1140;
2235+
LastUpgradeCheck = 1150;
22012236
ORGANIZATIONNAME = "adjust GmbH";
22022237
TargetAttributes = {
22032238
9615158E1CD2CB2C0022D336 = {
@@ -2528,6 +2563,7 @@
25282563
96E5E39418BBB48A008E7B30 /* ADJPackageBuilder.m in Sources */,
25292564
6FCC85001F278CF300D6A0ED /* ADJReachability.m in Sources */,
25302565
96E5E39618BBB48A008E7B30 /* ADJRequestHandler.m in Sources */,
2566+
9D2F23E32447CE5C00B7CA90 /* ADJSubscription.m in Sources */,
25312567
96E5E39918BBB48A008E7B30 /* ADJUtil.m in Sources */,
25322568
9609BC6A19EEA55800E02303 /* ADJEvent.m in Sources */,
25332569
965307F61A000DA400107FF9 /* ADJDeviceInfo.m in Sources */,
@@ -2614,6 +2650,7 @@
26142650
9D0E2E6D210B575600133B4F /* ADJTimerOnce.m in Sources */,
26152651
9D0E2E77210B575600133B4F /* ADJEvent.m in Sources */,
26162652
9D0E2E8D210B575600133B4F /* ADJConfig.m in Sources */,
2653+
9D2F24042447DD6000B7CA90 /* ADJSubscription.m in Sources */,
26172654
9D0E2E6E210B575600133B4F /* ADJAttributionHandler.m in Sources */,
26182655
9D0E2E87210B575600133B4F /* ADJBackoffStrategy.m in Sources */,
26192656
9D0E2EBB210B575600133B4F /* AdjustBridgeRegister.m in Sources */,
@@ -2657,6 +2694,7 @@
26572694
9DEAF10A210072BC005CAEDB /* ADJSessionFailure.m in Sources */,
26582695
9DEAF121210072BC005CAEDB /* UIDevice+ADJAdditions.m in Sources */,
26592696
9DEAF105210072BC005CAEDB /* ADJSessionSuccess.m in Sources */,
2697+
9D2F23FD2447DD2500B7CA90 /* ADJSubscription.m in Sources */,
26602698
9DEAF124210072BC005CAEDB /* ADJSystemProfile.m in Sources */,
26612699
9DEAF0FB210072BC005CAEDB /* ADJRequestHandler.m in Sources */,
26622700
9DEAF11B210072BC005CAEDB /* ADJActivityKind.m in Sources */,
@@ -2697,6 +2735,7 @@
26972735
9DF9C92E1D6F3CA5008E362F /* ADJPackageBuilder.m in Sources */,
26982736
9DF9C9301D6F3CA5008E362F /* ADJPackageHandler.m in Sources */,
26992737
6FCC85051F27946100D6A0ED /* ADJReachability.m in Sources */,
2738+
9D2F23F82447DCE800B7CA90 /* ADJSubscription.m in Sources */,
27002739
9DF9C9321D6F3CA5008E362F /* ADJRequestHandler.m in Sources */,
27012740
9DF9C9461D6F3CA5008E362F /* ADJUtil.m in Sources */,
27022741
9DF9C9241D6F3CA5008E362F /* ADJEvent.m in Sources */,
@@ -2737,6 +2776,7 @@
27372776
9DFB067F1D7470C0006D48FC /* ADJPackageBuilder.m in Sources */,
27382777
9DFB06811D7470C0006D48FC /* ADJPackageHandler.m in Sources */,
27392778
6FCC85091F27949000D6A0ED /* ADJReachability.m in Sources */,
2779+
9D2F24012447DD3700B7CA90 /* ADJSubscription.m in Sources */,
27402780
9DFB06831D7470C0006D48FC /* ADJRequestHandler.m in Sources */,
27412781
9DFB06971D7470C0006D48FC /* ADJUtil.m in Sources */,
27422782
9DFB06751D7470C0006D48FC /* ADJEvent.m in Sources */,

‎Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdk.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1140"
3+
LastUpgradeVersion = "1150"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkIm.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1140"
3+
LastUpgradeVersion = "1150"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkTv.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1140"
3+
LastUpgradeVersion = "1150"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkWebBridge.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1140"
3+
LastUpgradeVersion = "1150"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Adjust/ADJActivityHandler.h‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@
4444
@property (nonatomic, copy) NSData *deviceTokenData;
4545
@property (nonatomic, copy) NSNumber *enabled;
4646
@property (nonatomic, assign) BOOL offline;
47-
@property (nonatomic, copy) NSString *basePath;
48-
@property (nonatomic, copy) NSString *gdprPath;
47+
@property (nonatomic, copy) NSString *extraPath;
4948

5049
- (id)init;
5150

@@ -97,8 +96,7 @@
9796
- (void)resetSessionPartnerParameters;
9897
- (void)trackAdRevenue:(NSString *)soruce payload:(NSData *)payload;
9998
- (void)disableThirdPartySharing;
100-
- (NSString *)getBasePath;
101-
- (NSString *)getGdprPath;
99+
- (void)trackSubscription:(ADJSubscription *)subscription;
102100

103101
- (ADJDeviceInfo *)deviceInfo;
104102
- (ADJActivityState *)activityState;
@@ -111,8 +109,8 @@
111109

112110
@interface ADJActivityHandler : NSObject <ADJActivityHandler>
113111

114-
+ (id<ADJActivityHandler>)handlerWithConfig:(ADJConfig *)adjustConfig
115-
savedPreLaunch:(ADJSavedPreLaunch *)savedPreLaunch;
112+
- (id)initWithConfig:(ADJConfig *)adjustConfig
113+
savedPreLaunch:(ADJSavedPreLaunch *)savedPreLaunch;
116114

117115
- (void)addSessionCallbackParameterI:(ADJActivityHandler *)selfI
118116
key:(NSString *)key

0 commit comments

Comments
 (0)