Skip to content

Commit 16c645c

Browse files
nonelsenonelse
committed
Merge pull request #131 from adjust/tvos_warnings
Tvos
2 parents 1a2c3f8 + 3dbdff3 commit 16c645c

File tree

56 files changed

+1635
-831
lines changed

Some content is hidden

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

56 files changed

+1635
-831
lines changed

‎Adjust.podspec‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
Pod::Spec.new do |s|
22
s.name = "Adjust"
3-
s.version = "4.3.0"
3+
s.version = "4.4.0"
44
s.summary = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
55
s.homepage = "http://adjust.com"
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.3.0" }
9-
s.platform = :ios, '5.0'
8+
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.4.0" }
9+
s.ios.deployment_target = '5.0'
10+
s.tvos.deployment_target = '9.0'
1011
s.framework = 'SystemConfiguration'
11-
s.weak_framework = 'AdSupport', 'iAd'
12+
s.ios.weak_framework = 'AdSupport', 'iAd'
13+
s.tvos.weak_framework = 'AdSupport'
1214
s.requires_arc = true
1315
s.default_subspec = 'Core'
1416

‎Adjust.xcodeproj/project.pbxproj‎

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
969952D21A01309200928462 /* ADJAttribution.m in Sources */ = {isa = PBXBuildFile; fileRef = 969952D11A01309200928462 /* ADJAttribution.m */; };
4747
96BCFBCD1AC99231005A65C5 /* Adjust.h in Headers */ = {isa = PBXBuildFile; fileRef = 96E5E34C18BBB48A008E7B30 /* Adjust.h */; settings = {ATTRIBUTES = (Public, ); }; };
4848
96BCFBCE1AC99235005A65C5 /* ADJEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 9609BC6819EEA55800E02303 /* ADJEvent.h */; settings = {ATTRIBUTES = (Public, ); }; };
49-
96BCFBCF1AC99239005A65C5 /* ADJLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 96E5E37318BBB48A008E7B30 /* ADJLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
5049
96BCFBD01AC9923F005A65C5 /* ADJConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 960A8BB71A029A8000F2BB95 /* ADJConfig.h */; settings = {ATTRIBUTES = (Public, ); }; };
5150
96BCFBD11AC99246005A65C5 /* ADJAttribution.h in Headers */ = {isa = PBXBuildFile; fileRef = 969952D01A01309200928462 /* ADJAttribution.h */; settings = {ATTRIBUTES = (Public, ); }; };
5251
96BCFBD21AC99332005A65C5 /* NSString+ADJAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 96CD2BDC1A13BFC600A40AFB /* NSString+ADJAdditions.h */; };
@@ -96,19 +95,19 @@
9695
/* End PBXBuildFile section */
9796

9897
/* Begin PBXContainerItemProxy section */
99-
960FCF4E1A1B9ACF00282BD4 /* PBXContainerItemProxy */ = {
98+
963909661BCBFE5300A2E8A4 /* PBXContainerItemProxy */ = {
10099
isa = PBXContainerItemProxy;
101-
containerPortal = 960FCF491A1B9ACE00282BD4 /* example.xcodeproj */;
100+
containerPortal = 963909621BCBFE5200A2E8A4 /* AdjustExample-iOS.xcodeproj */;
102101
proxyType = 2;
103-
remoteGlobalIDString = 960FCF201A1B9ACE00282BD4;
104-
remoteInfo = example;
102+
remoteGlobalIDString = 9639093C1BCBFCF300A2E8A4;
103+
remoteInfo = "AdjustExample-iOS";
105104
};
106-
960FCF501A1B9ACF00282BD4 /* PBXContainerItemProxy */ = {
105+
963909CD1BCC0D8400A2E8A4 /* PBXContainerItemProxy */ = {
107106
isa = PBXContainerItemProxy;
108-
containerPortal = 960FCF491A1B9ACE00282BD4 /* example.xcodeproj */;
107+
containerPortal = 963909C91BCC0D8300A2E8A4 /* AdjustExample-tvOS.xcodeproj */;
109108
proxyType = 2;
110-
remoteGlobalIDString = 960FCF391A1B9ACE00282BD4;
111-
remoteInfo = exampleTests;
109+
remoteGlobalIDString = 963909B21BCC0D8300A2E8A4;
110+
remoteInfo = "AdjustExample-tvOS";
112111
};
113112
9679922318BBAE2800394606 /* PBXContainerItemProxy */ = {
114113
isa = PBXContainerItemProxy;
@@ -146,7 +145,6 @@
146145
9609BC6919EEA55800E02303 /* ADJEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJEvent.m; sourceTree = "<group>"; };
147146
960A8BB71A029A8000F2BB95 /* ADJConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJConfig.h; sourceTree = "<group>"; };
148147
960A8BB81A029A8000F2BB95 /* ADJConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJConfig.m; sourceTree = "<group>"; };
149-
960FCF491A1B9ACE00282BD4 /* example.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = example.xcodeproj; path = example/example.xcodeproj; sourceTree = "<group>"; };
150148
9620EA431B062D6F009673F1 /* ADJTestActivityPackage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJTestActivityPackage.h; sourceTree = "<group>"; };
151149
9620EA441B062D6F009673F1 /* ADJTestActivityPackage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJTestActivityPackage.m; sourceTree = "<group>"; };
152150
9620EA4C1B06401B009673F1 /* ADJTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJTest.h; sourceTree = "<group>"; };
@@ -155,6 +153,8 @@
155153
9620EA501B065177009673F1 /* ADJPackageFields.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJPackageFields.m; sourceTree = "<group>"; };
156154
96325E84190E5CD900A97911 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
157155
96325E86190E5CE400A97911 /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; };
156+
963909621BCBFE5200A2E8A4 /* AdjustExample-iOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "AdjustExample-iOS.xcodeproj"; path = "examples/AdjustExample-iOS/AdjustExample-iOS.xcodeproj"; sourceTree = "<group>"; };
157+
963909C91BCC0D8300A2E8A4 /* AdjustExample-tvOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "AdjustExample-tvOS.xcodeproj"; path = "examples/AdjustExample-tvOS/AdjustExample-tvOS.xcodeproj"; sourceTree = "<group>"; };
158158
9644B7EA19F148F3008576FC /* ADJDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJDeviceInfo.h; sourceTree = "<group>"; };
159159
965307F51A000DA400107FF9 /* ADJDeviceInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJDeviceInfo.m; sourceTree = "<group>"; };
160160
9657BF6E1A3B029000CD6853 /* ADJAttributionHandlerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJAttributionHandlerTests.m; sourceTree = "<group>"; };
@@ -250,19 +250,27 @@
250250
/* End PBXFrameworksBuildPhase section */
251251

252252
/* Begin PBXGroup section */
253-
960FCF4A1A1B9ACE00282BD4 /* Products */ = {
253+
963909631BCBFE5200A2E8A4 /* Products */ = {
254254
isa = PBXGroup;
255255
children = (
256-
960FCF4F1A1B9ACF00282BD4 /* example.app */,
257-
960FCF511A1B9ACF00282BD4 /* exampleTests.xctest */,
256+
963909671BCBFE5300A2E8A4 /* AdjustExample-iOS.app */,
257+
);
258+
name = Products;
259+
sourceTree = "<group>";
260+
};
261+
963909CA1BCC0D8300A2E8A4 /* Products */ = {
262+
isa = PBXGroup;
263+
children = (
264+
963909CE1BCC0D8400A2E8A4 /* AdjustExample-tvOS.app */,
258265
);
259266
name = Products;
260267
sourceTree = "<group>";
261268
};
262269
9679920418BBAE2800394606 = {
263270
isa = PBXGroup;
264271
children = (
265-
960FCF491A1B9ACE00282BD4 /* example.xcodeproj */,
272+
963909C91BCC0D8300A2E8A4 /* AdjustExample-tvOS.xcodeproj */,
273+
963909621BCBFE5200A2E8A4 /* AdjustExample-iOS.xcodeproj */,
266274
96E5E39A18BBB49E008E7B30 /* AdjustTests */,
267275
96E5E34B18BBB48A008E7B30 /* Adjust */,
268276
9679920F18BBAE2800394606 /* Frameworks */,
@@ -396,15 +404,13 @@
396404
96BCFBCD1AC99231005A65C5 /* Adjust.h in Headers */,
397405
96BCFBCE1AC99235005A65C5 /* ADJEvent.h in Headers */,
398406
96BCFBD11AC99246005A65C5 /* ADJAttribution.h in Headers */,
399-
96BCFBCF1AC99239005A65C5 /* ADJLogger.h in Headers */,
400407
96BCFBD01AC9923F005A65C5 /* ADJConfig.h in Headers */,
401408
96BCFBD91AC9934E005A65C5 /* ADJAdjustFactory.h in Headers */,
402409
96BCFBD81AC9934B005A65C5 /* ADJActivityState.h in Headers */,
403410
96BCFBD61AC99345005A65C5 /* ADJActivityKind.h in Headers */,
404411
96BCFBD71AC99348005A65C5 /* ADJActivityPackage.h in Headers */,
405412
96BCFBD51AC9933E005A65C5 /* ADJActivityHandler.h in Headers */,
406413
96854A5F1B1F278C002B2874 /* ADJTimerCycle.h in Headers */,
407-
96BCFBCF1AC99239005A65C5 /* ADJLogger.h in Headers */,
408414
96854A591B1F2779002B2874 /* ADJTimerOnce.h in Headers */,
409415
96BCFBDF1AC99368005A65C5 /* ADJDeviceInfo.h in Headers */,
410416
96BCFBDB1AC99355005A65C5 /* ADJPackageHandler.h in Headers */,
@@ -463,7 +469,7 @@
463469
9679920518BBAE2800394606 /* Project object */ = {
464470
isa = PBXProject;
465471
attributes = {
466-
LastUpgradeCheck = 0620;
472+
LastUpgradeCheck = 0710;
467473
ORGANIZATIONNAME = "adjust GmbH";
468474
TargetAttributes = {
469475
96BCFBE71AC99FBD005A65C5 = {
@@ -483,8 +489,12 @@
483489
projectDirPath = "";
484490
projectReferences = (
485491
{
486-
ProductGroup = 960FCF4A1A1B9ACE00282BD4 /* Products */;
487-
ProjectRef = 960FCF491A1B9ACE00282BD4 /* example.xcodeproj */;
492+
ProductGroup = 963909631BCBFE5200A2E8A4 /* Products */;
493+
ProjectRef = 963909621BCBFE5200A2E8A4 /* AdjustExample-iOS.xcodeproj */;
494+
},
495+
{
496+
ProductGroup = 963909CA1BCC0D8300A2E8A4 /* Products */;
497+
ProjectRef = 963909C91BCC0D8300A2E8A4 /* AdjustExample-tvOS.xcodeproj */;
488498
},
489499
);
490500
projectRoot = "";
@@ -497,18 +507,18 @@
497507
/* End PBXProject section */
498508

499509
/* Begin PBXReferenceProxy section */
500-
960FCF4F1A1B9ACF00282BD4 /* example.app */ = {
510+
963909671BCBFE5300A2E8A4 /* AdjustExample-iOS.app */ = {
501511
isa = PBXReferenceProxy;
502512
fileType = wrapper.application;
503-
path = example.app;
504-
remoteRef = 960FCF4E1A1B9ACF00282BD4 /* PBXContainerItemProxy */;
513+
path = "AdjustExample-iOS.app";
514+
remoteRef = 963909661BCBFE5300A2E8A4 /* PBXContainerItemProxy */;
505515
sourceTree = BUILT_PRODUCTS_DIR;
506516
};
507-
960FCF511A1B9ACF00282BD4 /* exampleTests.xctest */ = {
517+
963909CE1BCC0D8400A2E8A4 /* AdjustExample-tvOS.app */ = {
508518
isa = PBXReferenceProxy;
509-
fileType = wrapper.cfbundle;
510-
path = exampleTests.xctest;
511-
remoteRef = 960FCF501A1B9ACF00282BD4 /* PBXContainerItemProxy */;
519+
fileType = wrapper.application;
520+
path = "AdjustExample-tvOS.app";
521+
remoteRef = 963909CD1BCC0D8400A2E8A4 /* PBXContainerItemProxy */;
512522
sourceTree = BUILT_PRODUCTS_DIR;
513523
};
514524
/* End PBXReferenceProxy section */
@@ -640,10 +650,6 @@
640650
isa = XCBuildConfiguration;
641651
buildSettings = {
642652
ALWAYS_SEARCH_USER_PATHS = NO;
643-
ARCHS = (
644-
"$(ARCHS_STANDARD)",
645-
armv7s,
646-
);
647653
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
648654
CLANG_CXX_LIBRARY = "libc++";
649655
CLANG_ENABLE_MODULES = YES;
@@ -657,6 +663,7 @@
657663
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
658664
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
659665
COPY_PHASE_STRIP = NO;
666+
ENABLE_TESTABILITY = YES;
660667
GCC_C_LANGUAGE_STANDARD = gnu99;
661668
GCC_DYNAMIC_NO_PIC = NO;
662669
GCC_OPTIMIZATION_LEVEL = 0;
@@ -682,10 +689,6 @@
682689
isa = XCBuildConfiguration;
683690
buildSettings = {
684691
ALWAYS_SEARCH_USER_PATHS = NO;
685-
ARCHS = (
686-
"$(ARCHS_STANDARD)",
687-
armv7s,
688-
);
689692
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
690693
CLANG_CXX_LIBRARY = "libc++";
691694
CLANG_ENABLE_MODULES = YES;
@@ -758,7 +761,6 @@
758761
isa = XCBuildConfiguration;
759762
buildSettings = {
760763
FRAMEWORK_SEARCH_PATHS = (
761-
"$(SDKROOT)/Developer/Library/Frameworks",
762764
"$(inherited)",
763765
"$(DEVELOPER_FRAMEWORKS_DIR)",
764766
);
@@ -770,6 +772,7 @@
770772
);
771773
INFOPLIST_FILE = "AdjustTests/AdjustTests-Info.plist";
772774
OTHER_CFLAGS = "";
775+
PRODUCT_BUNDLE_IDENTIFIER = "adjust.${PRODUCT_NAME:rfc1034identifier}";
773776
PRODUCT_NAME = "$(TARGET_NAME)";
774777
WRAPPER_EXTENSION = xctest;
775778
};
@@ -779,14 +782,14 @@
779782
isa = XCBuildConfiguration;
780783
buildSettings = {
781784
FRAMEWORK_SEARCH_PATHS = (
782-
"$(SDKROOT)/Developer/Library/Frameworks",
783785
"$(inherited)",
784786
"$(DEVELOPER_FRAMEWORKS_DIR)",
785787
);
786788
GCC_PRECOMPILE_PREFIX_HEADER = YES;
787789
GCC_PREFIX_HEADER = "AdjustTests/Adjust-Prefix.pch";
788790
INFOPLIST_FILE = "AdjustTests/AdjustTests-Info.plist";
789791
OTHER_CFLAGS = "";
792+
PRODUCT_BUNDLE_IDENTIFIER = "adjust.${PRODUCT_NAME:rfc1034identifier}";
790793
PRODUCT_NAME = "$(TARGET_NAME)";
791794
WRAPPER_EXTENSION = xctest;
792795
};

‎Adjust/ADJAdditions/NSString+ADJAdditions.m‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,19 @@ - (NSString *)adjSha1 {
4242
}
4343

4444
-(NSString *)adjUrlEncode {
45+
#pragma clang diagnostic push
46+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
4547
return (NSString *)CFBridgingRelease(CFURLCreateStringByAddingPercentEscapes(
4648
NULL,
4749
(CFStringRef)self,
4850
NULL,
4951
(CFStringRef)@"!*'\"();:@&=+$,/?%#[]% ",
5052
CFStringConvertNSStringEncodingToEncoding(NSUTF8StringEncoding)));
53+
#pragma clang diagnostic pop
54+
55+
// Alternative:
56+
// return [self stringByAddingPercentEncodingWithAllowedCharacters:
57+
// [NSCharacterSet characterSetWithCharactersInString:@"!*'\"();:@&=+$,/?%#[]% "]];
5158
}
5259

5360
- (NSString *)adjRemoveColons {

‎Adjust/ADJAdditions/UIDevice+ADJAdditions.m‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818
#import <AdSupport/ASIdentifierManager.h>
1919
#endif
2020

21-
#if !ADJUST_NO_IAD
21+
#ifdef asdfg
22+
#endif
23+
#if !ADJUST_NO_IAD && !defined(TARGET_OS_TV)
2224
#import <iAd/iAd.h>
2325
#endif
24-
2526
@implementation UIDevice(ADJAdditions)
2627

2728
- (BOOL)adjTrackingEnabled {
@@ -100,9 +101,13 @@ - (NSString *)adjIdForAdvertisers {
100101
}
101102

102103
- (NSString *)adjFbAttributionId {
104+
#if ADJUST_NO_UIPASTEBOARD || defined (TARGET_OS_TV)
105+
return @"";
106+
#else
103107
NSString *result = [UIPasteboard pasteboardWithName:@"fb_app_attribution" create:NO].string;
104108
if (result == nil) return @"";
105109
return result;
110+
#endif
106111
}
107112

108113
- (NSString *)adjMacAddress {
@@ -184,7 +189,7 @@ - (NSString *)adjVendorId {
184189
}
185190

186191
- (void) adjSetIad:(ADJActivityHandler *) activityHandler{
187-
#if ADJUST_NO_IAD
192+
#if ADJUST_NO_IAD || defined (TARGET_OS_TV)
188193
return;
189194
#else
190195

‎Adjust/ADJUtil.m‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <sys/xattr.h>
1717

1818
static NSString * const kBaseUrl = @"https://app.adjust.com";
19-
static NSString * const kClientSdk = @"ios4.3.0";
19+
static NSString * const kClientSdk = @"ios4.4.0";
2020

2121
static NSString * const kDateFormat = @"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'Z";
2222
static NSDateFormatter *dateFormat;
@@ -28,7 +28,24 @@ + (void) initialize {
2828
dateFormat = [[NSDateFormatter alloc] init];
2929

3030
if ([NSCalendar instancesRespondToSelector:@selector(calendarWithIdentifier:)]) {
31-
dateFormat.calendar = [NSCalendar calendarWithIdentifier:NSGregorianCalendar];
31+
// http://stackoverflow.com/a/3339787
32+
NSString * calendarIdentifier;
33+
34+
#pragma clang diagnostic push
35+
#pragma clang diagnostic ignored "-Wtautological-pointer-compare"
36+
if (&NSCalendarIdentifierGregorian != NULL) {
37+
#pragma clang diagnostic pop
38+
calendarIdentifier = NSCalendarIdentifierGregorian;
39+
} else {
40+
#pragma clang diagnostic push
41+
#pragma clang diagnostic ignored "-Wunreachable-code"
42+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
43+
calendarIdentifier = NSGregorianCalendar;
44+
#pragma clang diagnostic pop
45+
}
46+
47+
48+
dateFormat.calendar = [NSCalendar calendarWithIdentifier:calendarIdentifier];
3249
}
3350

3451
dateFormat.locale = [NSLocale systemLocale];
@@ -52,8 +69,6 @@ + (void)excludeFromBackup:(NSString *)path {
5269

5370
#pragma clang diagnostic push
5471
#pragma clang diagnostic ignored "-Wunreachable-code"
55-
56-
#pragma clang diagnostic push
5772
#pragma clang diagnostic ignored "-Wtautological-pointer-compare"
5873
if (&NSURLIsExcludedFromBackupKey == nil) {
5974
u_int8_t attrValue = 1;
@@ -82,7 +97,6 @@ + (void)excludeFromBackup:(NSString *)path {
8297
}
8398
}
8499
#pragma clang diagnostic pop
85-
#pragma clang diagnostic pop
86100

87101
}
88102

@@ -254,9 +268,12 @@ + (void)sendNSURLConnectionRequest:(NSMutableURLRequest *)request
254268
NSError *responseError = nil;
255269
NSHTTPURLResponse *urlResponse = nil;
256270

271+
#pragma clang diagnostic push
272+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
257273
NSData *responseData = [NSURLConnection sendSynchronousRequest:request
258274
returningResponse:&urlResponse
259275
error:&responseError];
276+
#pragma clang diagnostic pop
260277

261278
NSDictionary * jsonResponse = [ADJUtil completionHandler:responseData
262279
response:(NSHTTPURLResponse *)urlResponse

‎AdjustTests/ADJActivityHandlerTests.m‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,10 @@ - (void)testAppWillOpenUrl
787787
NSURL* mixed = [NSURL URLWithString:@"AdjustTests://example.com/path/inApp?adjust_foo=bar&other=stuff&adjust_campaign=campaignValue&adjust_adgroup=adgroupValue&adjust_creative=creativeValue"];
788788
NSURL* emptyQueryString = [NSURL URLWithString:@"AdjustTests://"];
789789
NSURL* emptyString = [NSURL URLWithString:@""];
790+
#pragma clang diagnostic push
791+
#pragma clang diagnostic ignored "-Wnonnull"
790792
NSURL* nilString = [NSURL URLWithString:nil];
793+
#pragma clang diagnostic pop
791794
NSURL* nilUrl = nil;
792795
NSURL* single = [NSURL URLWithString:@"AdjustTests://example.com/path/inApp?adjust_foo"];
793796
NSURL* prefix = [NSURL URLWithString:@"AdjustTests://example.com/path/inApp?adjust_=bar"];
@@ -1445,7 +1448,10 @@ - (void)testTimer
14451448
ADJConfig * config = [ADJConfig configWithAppToken:@"123456789012" environment:ADJEnvironmentSandbox];
14461449

14471450
// create handler and start the first session
1451+
#pragma clang diagnostic push
1452+
#pragma clang diagnostic ignored "-Wunused-variable"
14481453
id<ADJActivityHandler> activityHandler = [ADJActivityHandler handlerWithConfig:config];
1454+
#pragma clang diagnostic pop
14491455

14501456
// it's necessary to sleep the activity for a while after each handler call
14511457
// to let the internal queue act

‎AdjustTests/ADJPackageFields.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ - (id) init {
1616

1717
// default values
1818
self.appToken = @"123456789012";
19-
self.clientSdk = @"ios4.3.0";
19+
self.clientSdk = @"ios4.4.0";
2020
self.suffix = @"";
2121
self.environment = @"sandbox";
2222

‎AdjustTests/ADJPackageHandlerMock.m‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ @interface ADJPackageHandlerMock()
2424
@implementation ADJPackageHandlerMock
2525

2626
- (id)init {
27+
#pragma clang diagnostic push
28+
#pragma clang diagnostic ignored "-Wobjc-designated-initializers"
2729
return [self initWithActivityHandler:nil startPaused:NO];
30+
#pragma clang diagnostic pop
2831
}
2932
- (id)initWithActivityHandler:(id<ADJActivityHandler>)activityHandler
3033
startPaused:(BOOL)startPaused

0 commit comments

Comments
 (0)