Skip to content

Commit 587c28d

Browse files
uerceguerceg
authored
Merge pull request #323 from adjust/v4122
Version 4.12.2
2 parents c785f3a + 9e1a9d7 commit 587c28d

File tree

116 files changed

+4008
-156
lines changed

Some content is hidden

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

116 files changed

+4008
-156
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.12.1"
3+
s.version = "4.12.2"
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.12.1" }
8+
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.12.2" }
99
s.ios.deployment_target = '6.0'
1010
s.tvos.deployment_target = '9.0'
1111
s.framework = 'SystemConfiguration'

‎Adjust.xcodeproj/project.pbxproj‎

Lines changed: 118 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,20 @@
281281
/* End PBXBuildFile section */
282282

283283
/* Begin PBXContainerItemProxy section */
284+
6F08421C2007766800568A31 /* PBXContainerItemProxy */ = {
285+
isa = PBXContainerItemProxy;
286+
containerPortal = 6F0842182007766700568A31 /* AdjustTestLibrary.xcodeproj */;
287+
proxyType = 2;
288+
remoteGlobalIDString = 6F08420C2007766700568A31;
289+
remoteInfo = AdjustTestLibrary;
290+
};
291+
6F084244200776A100568A31 /* PBXContainerItemProxy */ = {
292+
isa = PBXContainerItemProxy;
293+
containerPortal = 6F084240200776A000568A31 /* AdjustTestApp.xcodeproj */;
294+
proxyType = 2;
295+
remoteGlobalIDString = 6F0842272007769F00568A31;
296+
remoteInfo = AdjustTestApp;
297+
};
284298
9679922318BBAE2800394606 /* PBXContainerItemProxy */ = {
285299
isa = PBXContainerItemProxy;
286300
containerPortal = 9679920518BBAE2800394606 /* Project object */;
@@ -376,6 +390,8 @@
376390
/* End PBXCopyFilesBuildPhase section */
377391

378392
/* Begin PBXFileReference section */
393+
6F0842182007766700568A31 /* AdjustTestLibrary.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = AdjustTestLibrary.xcodeproj; path = AdjustTestLibrary/AdjustTestLibrary.xcodeproj; sourceTree = "<group>"; };
394+
6F084240200776A000568A31 /* AdjustTestApp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = AdjustTestApp.xcodeproj; path = AdjustTestApp/AdjustTestApp.xcodeproj; sourceTree = "<group>"; };
379395
6FCC84F71F278CF300D6A0ED /* ADJReachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJReachability.m; sourceTree = "<group>"; };
380396
6FCC84F81F278CF300D6A0ED /* ADJReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJReachability.h; sourceTree = "<group>"; };
381397
6FCC85021F27944600D6A0ED /* ADJReachability.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ADJReachability.h; sourceTree = "<group>"; };
@@ -726,6 +742,76 @@
726742
/* End PBXFrameworksBuildPhase section */
727743

728744
/* Begin PBXGroup section */
745+
6F0841FB2007749C00568A31 /* AdjustUnitTests */ = {
746+
isa = PBXGroup;
747+
children = (
748+
9D7431E71EB9F9B700969F14 /* AdjustExampleTests */,
749+
96E5E39B18BBB49E008E7B30 /* Adjust-Prefix.pch */,
750+
96E5E39C18BBB49E008E7B30 /* AdjustTests-Info.plist */,
751+
96E5E39D18BBB49E008E7B30 /* ADJActivityHandlerMock.h */,
752+
96E5E39E18BBB49E008E7B30 /* ADJActivityHandlerMock.m */,
753+
96E5E39F18BBB49E008E7B30 /* ADJActivityHandlerTests.m */,
754+
96E5E3A018BBB49E008E7B30 /* ADJLoggerMock.h */,
755+
96E5E3A118BBB49E008E7B30 /* ADJLoggerMock.m */,
756+
96E5E3A218BBB49E008E7B30 /* ADJPackageHandlerMock.h */,
757+
96E5E3A318BBB49E008E7B30 /* ADJPackageHandlerMock.m */,
758+
96E5E3A418BBB49E008E7B30 /* ADJPackageHandlerTests.m */,
759+
96E5E3A518BBB49E008E7B30 /* ADJRequestHandlerMock.h */,
760+
96E5E3A618BBB49E008E7B30 /* ADJRequestHandlerMock.m */,
761+
96A2D2371CEF3B2D00C39DE0 /* ADJRequestHandlerTests.m */,
762+
96E5E3A818BBB49E008E7B30 /* ADJTestsUtil.h */,
763+
96E5E3A918BBB49E008E7B30 /* ADJTestsUtil.m */,
764+
96E5E3AA18BBB49E008E7B30 /* InfoPlist.strings */,
765+
96E5E3AC18BBB49E008E7B30 /* NSURLConnection+NSURLConnectionSynchronousLoadingMocking.h */,
766+
96E5E3AD18BBB49E008E7B30 /* NSURLConnection+NSURLConnectionSynchronousLoadingMocking.m */,
767+
96ED00371A38A4CD00209110 /* ADJAttributionHandlerMock.h */,
768+
96ED00381A38A4CD00209110 /* ADJAttributionHandlerMock.m */,
769+
96ED003C1A38A98C00209110 /* ADJAttributionChangedDelegate.h */,
770+
96ED003D1A38A98C00209110 /* ADJAttributionChangedDelegate.m */,
771+
9657BF6E1A3B029000CD6853 /* ADJAttributionHandlerTests.m */,
772+
9620EA431B062D6F009673F1 /* ADJTestActivityPackage.h */,
773+
9620EA441B062D6F009673F1 /* ADJTestActivityPackage.m */,
774+
9620EA4C1B06401B009673F1 /* ADJTest.h */,
775+
9620EA4D1B06401B009673F1 /* ADJTest.m */,
776+
9620EA4F1B065177009673F1 /* ADJPackageFields.h */,
777+
9620EA501B065177009673F1 /* ADJPackageFields.m */,
778+
96FDD75C1C566C38009C402E /* NSURLSession+NSURLDataWithRequestMocking.h */,
779+
96FDD75D1C566C38009C402E /* NSURLSession+NSURLDataWithRequestMocking.m */,
780+
96ED74FD1CD81B3E00C073B8 /* ADJSdkClickHandlerMock.h */,
781+
96ED74FE1CD81B3E00C073B8 /* ADJSdkClickHandlerMock.m */,
782+
967D06981CE2272500ECFCE3 /* ADJSessionState.h */,
783+
967D06991CE2272500ECFCE3 /* ADJSessionState.m */,
784+
96E7689F1CE6267D005D811C /* ADJDeeplinkDelegate.h */,
785+
96E768A01CE6267D005D811C /* ADJDeeplinkDelegate.m */,
786+
96E768A81CE6281F005D811C /* ADJTrackingDelegate.h */,
787+
96E768A91CE6281F005D811C /* ADJTrackingDelegate.m */,
788+
96A2D2251CEE0E6200C39DE0 /* ADJSdkClickHandlerTests.m */,
789+
96FC6E4D1D256B81004482D8 /* ADJActivityHandlerConstructorState.h */,
790+
96FC6E4E1D256B81004482D8 /* ADJActivityHandlerConstructorState.m */,
791+
96FC6E561D258272004482D8 /* ADJEndSessionState.h */,
792+
96FC6E571D258272004482D8 /* ADJEndSessionState.m */,
793+
9D0C7D3D1D79B3FE009DDF4E /* ADJInitState.h */,
794+
9D0C7D3E1D79B3FE009DDF4E /* ADJInitState.m */,
795+
);
796+
path = AdjustUnitTests;
797+
sourceTree = "<group>";
798+
};
799+
6F0842192007766700568A31 /* Products */ = {
800+
isa = PBXGroup;
801+
children = (
802+
6F08421D2007766800568A31 /* libAdjustTestLibrary.a */,
803+
);
804+
name = Products;
805+
sourceTree = "<group>";
806+
};
807+
6F084241200776A000568A31 /* Products */ = {
808+
isa = PBXGroup;
809+
children = (
810+
6F084245200776A100568A31 /* AdjustTestApp.app */,
811+
);
812+
name = Products;
813+
sourceTree = "<group>";
814+
};
729815
9648C5E41CD1765E00A3B049 /* AdjustBridge */ = {
730816
isa = PBXGroup;
731817
children = (
@@ -881,53 +967,9 @@
881967
96E5E39A18BBB49E008E7B30 /* AdjustTests */ = {
882968
isa = PBXGroup;
883969
children = (
884-
9D7431E71EB9F9B700969F14 /* AdjustExampleTests */,
885-
96E5E39B18BBB49E008E7B30 /* Adjust-Prefix.pch */,
886-
96E5E39C18BBB49E008E7B30 /* AdjustTests-Info.plist */,
887-
96E5E39D18BBB49E008E7B30 /* ADJActivityHandlerMock.h */,
888-
96E5E39E18BBB49E008E7B30 /* ADJActivityHandlerMock.m */,
889-
96E5E39F18BBB49E008E7B30 /* ADJActivityHandlerTests.m */,
890-
96E5E3A018BBB49E008E7B30 /* ADJLoggerMock.h */,
891-
96E5E3A118BBB49E008E7B30 /* ADJLoggerMock.m */,
892-
96E5E3A218BBB49E008E7B30 /* ADJPackageHandlerMock.h */,
893-
96E5E3A318BBB49E008E7B30 /* ADJPackageHandlerMock.m */,
894-
96E5E3A418BBB49E008E7B30 /* ADJPackageHandlerTests.m */,
895-
96E5E3A518BBB49E008E7B30 /* ADJRequestHandlerMock.h */,
896-
96E5E3A618BBB49E008E7B30 /* ADJRequestHandlerMock.m */,
897-
96A2D2371CEF3B2D00C39DE0 /* ADJRequestHandlerTests.m */,
898-
96E5E3A818BBB49E008E7B30 /* ADJTestsUtil.h */,
899-
96E5E3A918BBB49E008E7B30 /* ADJTestsUtil.m */,
900-
96E5E3AA18BBB49E008E7B30 /* InfoPlist.strings */,
901-
96E5E3AC18BBB49E008E7B30 /* NSURLConnection+NSURLConnectionSynchronousLoadingMocking.h */,
902-
96E5E3AD18BBB49E008E7B30 /* NSURLConnection+NSURLConnectionSynchronousLoadingMocking.m */,
903-
96ED00371A38A4CD00209110 /* ADJAttributionHandlerMock.h */,
904-
96ED00381A38A4CD00209110 /* ADJAttributionHandlerMock.m */,
905-
96ED003C1A38A98C00209110 /* ADJAttributionChangedDelegate.h */,
906-
96ED003D1A38A98C00209110 /* ADJAttributionChangedDelegate.m */,
907-
9657BF6E1A3B029000CD6853 /* ADJAttributionHandlerTests.m */,
908-
9620EA431B062D6F009673F1 /* ADJTestActivityPackage.h */,
909-
9620EA441B062D6F009673F1 /* ADJTestActivityPackage.m */,
910-
9620EA4C1B06401B009673F1 /* ADJTest.h */,
911-
9620EA4D1B06401B009673F1 /* ADJTest.m */,
912-
9620EA4F1B065177009673F1 /* ADJPackageFields.h */,
913-
9620EA501B065177009673F1 /* ADJPackageFields.m */,
914-
96FDD75C1C566C38009C402E /* NSURLSession+NSURLDataWithRequestMocking.h */,
915-
96FDD75D1C566C38009C402E /* NSURLSession+NSURLDataWithRequestMocking.m */,
916-
96ED74FD1CD81B3E00C073B8 /* ADJSdkClickHandlerMock.h */,
917-
96ED74FE1CD81B3E00C073B8 /* ADJSdkClickHandlerMock.m */,
918-
967D06981CE2272500ECFCE3 /* ADJSessionState.h */,
919-
967D06991CE2272500ECFCE3 /* ADJSessionState.m */,
920-
96E7689F1CE6267D005D811C /* ADJDeeplinkDelegate.h */,
921-
96E768A01CE6267D005D811C /* ADJDeeplinkDelegate.m */,
922-
96E768A81CE6281F005D811C /* ADJTrackingDelegate.h */,
923-
96E768A91CE6281F005D811C /* ADJTrackingDelegate.m */,
924-
96A2D2251CEE0E6200C39DE0 /* ADJSdkClickHandlerTests.m */,
925-
96FC6E4D1D256B81004482D8 /* ADJActivityHandlerConstructorState.h */,
926-
96FC6E4E1D256B81004482D8 /* ADJActivityHandlerConstructorState.m */,
927-
96FC6E561D258272004482D8 /* ADJEndSessionState.h */,
928-
96FC6E571D258272004482D8 /* ADJEndSessionState.m */,
929-
9D0C7D3D1D79B3FE009DDF4E /* ADJInitState.h */,
930-
9D0C7D3E1D79B3FE009DDF4E /* ADJInitState.m */,
970+
6F084240200776A000568A31 /* AdjustTestApp.xcodeproj */,
971+
6F0842182007766700568A31 /* AdjustTestLibrary.xcodeproj */,
972+
6F0841FB2007749C00568A31 /* AdjustUnitTests */,
931973
);
932974
path = AdjustTests;
933975
sourceTree = "<group>";
@@ -999,8 +1041,7 @@
9991041
9D7431F91EB9F9B700969F14 /* Info.plist */,
10001042
9D7431E81EB9F9B700969F14 /* Supporting Files */,
10011043
);
1002-
name = AdjustExampleTests;
1003-
path = ../AdjustExampleTests;
1044+
path = AdjustExampleTests;
10041045
sourceTree = "<group>";
10051046
};
10061047
9D7431E81EB9F9B700969F14 /* Supporting Files */ = {
@@ -1492,6 +1533,14 @@
14921533
ProductGroup = 9D449DCC1E6ED24400E7E80B /* Products */;
14931534
ProjectRef = 9D449DCB1E6ED24400E7E80B /* AdjustExample-WebView.xcodeproj */;
14941535
},
1536+
{
1537+
ProductGroup = 6F084241200776A000568A31 /* Products */;
1538+
ProjectRef = 6F084240200776A000568A31 /* AdjustTestApp.xcodeproj */;
1539+
},
1540+
{
1541+
ProductGroup = 6F0842192007766700568A31 /* Products */;
1542+
ProjectRef = 6F0842182007766700568A31 /* AdjustTestLibrary.xcodeproj */;
1543+
},
14951544
);
14961545
projectRoot = "";
14971546
targets = (
@@ -1507,6 +1556,20 @@
15071556
/* End PBXProject section */
15081557

15091558
/* Begin PBXReferenceProxy section */
1559+
6F08421D2007766800568A31 /* libAdjustTestLibrary.a */ = {
1560+
isa = PBXReferenceProxy;
1561+
fileType = archive.ar;
1562+
path = libAdjustTestLibrary.a;
1563+
remoteRef = 6F08421C2007766800568A31 /* PBXContainerItemProxy */;
1564+
sourceTree = BUILT_PRODUCTS_DIR;
1565+
};
1566+
6F084245200776A100568A31 /* AdjustTestApp.app */ = {
1567+
isa = PBXReferenceProxy;
1568+
fileType = wrapper.application;
1569+
path = AdjustTestApp.app;
1570+
remoteRef = 6F084244200776A100568A31 /* PBXContainerItemProxy */;
1571+
sourceTree = BUILT_PRODUCTS_DIR;
1572+
};
15101573
9D449DB21E6ED22900E7E80B /* AdjustExample-iOS.app */ = {
15111574
isa = PBXReferenceProxy;
15121575
fileType = wrapper.application;
@@ -2026,7 +2089,7 @@
20262089
"$(DEVELOPER_FRAMEWORKS_DIR)",
20272090
);
20282091
GCC_PRECOMPILE_PREFIX_HEADER = YES;
2029-
GCC_PREFIX_HEADER = "AdjustTests/Adjust-Prefix.pch";
2092+
GCC_PREFIX_HEADER = "AdjustTests/AdjustUnitTests/Adjust-Prefix.pch";
20302093
GCC_WARN_SIGN_COMPARE = YES;
20312094
ONLY_ACTIVE_ARCH = NO;
20322095
OTHER_LDFLAGS = "-ObjC";
@@ -2050,7 +2113,7 @@
20502113
"$(DEVELOPER_FRAMEWORKS_DIR)",
20512114
);
20522115
GCC_PRECOMPILE_PREFIX_HEADER = YES;
2053-
GCC_PREFIX_HEADER = "AdjustTests/Adjust-Prefix.pch";
2116+
GCC_PREFIX_HEADER = "AdjustTests/AdjustUnitTests/Adjust-Prefix.pch";
20542117
GCC_WARN_SIGN_COMPARE = YES;
20552118
OTHER_LDFLAGS = "-ObjC";
20562119
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2068,12 +2131,12 @@
20682131
"$(DEVELOPER_FRAMEWORKS_DIR)",
20692132
);
20702133
GCC_PRECOMPILE_PREFIX_HEADER = YES;
2071-
GCC_PREFIX_HEADER = "AdjustTests/Adjust-Prefix.pch";
2134+
GCC_PREFIX_HEADER = "AdjustTests/AdjustUnitTests/Adjust-Prefix.pch";
20722135
GCC_PREPROCESSOR_DEFINITIONS = (
20732136
"DEBUG=1",
20742137
"$(inherited)",
20752138
);
2076-
INFOPLIST_FILE = "AdjustTests/AdjustTests-Info.plist";
2139+
INFOPLIST_FILE = "AdjustTests/AdjustUnitTests/AdjustTests-Info.plist";
20772140
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
20782141
ONLY_ACTIVE_ARCH = NO;
20792142
OTHER_CFLAGS = "";
@@ -2092,8 +2155,8 @@
20922155
"$(DEVELOPER_FRAMEWORKS_DIR)",
20932156
);
20942157
GCC_PRECOMPILE_PREFIX_HEADER = YES;
2095-
GCC_PREFIX_HEADER = "AdjustTests/Adjust-Prefix.pch";
2096-
INFOPLIST_FILE = "AdjustTests/AdjustTests-Info.plist";
2158+
GCC_PREFIX_HEADER = "AdjustTests/AdjustUnitTests/Adjust-Prefix.pch";
2159+
INFOPLIST_FILE = "AdjustTests/AdjustUnitTests/AdjustTests-Info.plist";
20972160
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
20982161
OTHER_CFLAGS = "";
20992162
PRODUCT_BUNDLE_IDENTIFIER = "adjust.${PRODUCT_NAME:rfc1034identifier}";

‎Adjust/ADJActivityHandler.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
@property (nonatomic, copy) NSData *deviceTokenData;
4242
@property (nonatomic, copy) NSNumber *enabled;
4343
@property (nonatomic, assign) BOOL offline;
44+
@property (nonatomic, copy) NSString *basePath;
4445

4546
- (id)init;
4647

@@ -89,8 +90,10 @@
8990
- (void)removeSessionPartnerParameter:(NSString *)key;
9091
- (void)resetSessionCallbackParameters;
9192
- (void)resetSessionPartnerParameters;
93+
- (NSString *)getBasePath;
9294

93-
- (void)teardown:(BOOL)deleteState;
95+
- (void)teardown;
96+
+ (void)deleteState;
9497
@end
9598

9699
@interface ADJActivityHandler : NSObject <ADJActivityHandler>

0 commit comments

Comments
 (0)