Nullability, subspecs, and compiler directive

mParticle · Mar 16, 2016 · 5fa3c2b · 5fa3c2b
1 parent b6f0601
commit 5fa3c2b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/mParticle-Apple-SDK.podspec b/mParticle-Apple-SDK.podspec
@@ -106,7 +106,7 @@ Pod::Spec.new do |s|
     s.subspec 'Crittercism' do |ss|
         ss.ios.dependency 'mParticle-Apple-SDK/Core-SDK'
         ss.ios.dependency 'mParticle-Apple-SDK/mParticle'
-        ss.ios.dependency 'CrittercismSDK', '5.5'
+        ss.ios.dependency 'CrittercismSDK', '5.4.0'
         ss.ios.prefix_header_contents = "#define MP_KIT_CRITTERCISM 1"
         ss.ios.deployment_target      = "7.0"
     end

diff --git a/mParticle-Apple-SDK/Kits/BranchMetrics/MPKitBranchMetrics.m b/mParticle-Apple-SDK/Kits/BranchMetrics/MPKitBranchMetrics.m
@@ -147,7 +147,7 @@ - (MPKitExecStatus *)logScreen:(MPEvent *)event {
     return execStatus;
 }
 
-- (nonnull MPKitExecStatus *)openURL:(nonnull NSURL *)url sourceApplication:(nonnull NSString *)sourceApplication annotation:(nullable id)annotation {
+- (nonnull MPKitExecStatus *)openURL:(nonnull NSURL *)url sourceApplication:(nullable NSString *)sourceApplication annotation:(nullable id)annotation {
     [branchInstance handleDeepLink:url];
 
     MPKitExecStatus *execStatus = [[MPKitExecStatus alloc] initWithSDKCode:@(MPKitInstanceBranchMetrics) returnCode:MPKitReturnCodeSuccess];

diff --git a/mParticle-Apple-SDK/Kits/MPKitContainer.mm b/mParticle-Apple-SDK/Kits/MPKitContainer.mm
@@ -1844,7 +1844,7 @@ - (void)removeAllKitConfigurations {
                                            @(MPKitInstanceLocalytics),
 #endif
 #if defined(MP_KIT_TUNE)
-                                           @(MPKitTune),
+                                           @(MPKitInstanceTune),
 #endif
 #if defined(MP_KIT_WOOTRIC)
                                            @(MPKitInstanceWootric),

diff --git a/mParticle-Apple-SDK/MPBackendController.mm b/mParticle-Apple-SDK/MPBackendController.mm
@@ -537,7 +537,7 @@ - (void)requestConfig:(void(^ _Nullable)(BOOL uploadBatch))completionHandler {
 
         MPResponseConfig *responseConfig = [[MPResponseConfig alloc] initWithConfiguration:configurationDictionary];
 
-        if (responseConfig.influencedOpenTimer) {
+        if (responseConfig.influencedOpenTimer && strongSelf) {
 #if TARGET_OS_IOS == 1
             strongSelf.notificationController.influencedOpenTimer = [responseConfig.influencedOpenTimer doubleValue];
 #endif

diff --git a/mParticle-Apple-SDK/Notifications/MPNotificationController.mm b/mParticle-Apple-SDK/Notifications/MPNotificationController.mm
@@ -30,8 +30,10 @@ @interface MPNotificationController() {
 
 @end
 
+#if TARGET_OS_IOS == 1
 static NSData *deviceToken = nil;
 static int64_t launchNotificationHash = 0;
+#endif
 
 @implementation MPNotificationController