Skip to content

Commit

Permalink
Merge pull request #387 from segmentio/pr/385
Browse files Browse the repository at this point in the history 
Update Kahuna integration and SDK
  • Loading branch information
@f2prateek
f2prateek committed Jul 29, 2015
2 parents e97bfd2 + d10c64b commit d288ab9
Show file tree
Hide file tree
Showing 7 changed files with 307 additions and 53 deletions.
24 changes: 20 additions & 4 deletions Analytics.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@
/* End PBXAggregateTarget section */

/* Begin PBXBuildFile section */
019892FF1B67121A00ED875F /* SEGKahunaDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 019892FE1B67121A00ED875F /* SEGKahunaDefines.h */; };
01FB19751B66881F000483CC /* SEGKahunaIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 01FB19741B66881F000483CC /* SEGKahunaIntegrationTests.m */; };
3208C0861A64F6B200D6014F /* AMPARCMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 3208C0811A64F6B200D6014F /* AMPARCMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
3208C0871A64F6B200D6014F /* AMPConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 3208C0821A64F6B200D6014F /* AMPConstants.h */; settings = {ATTRIBUTES = (Public, ); }; };
3208C0881A64F6B200D6014F /* AMPDeviceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 3208C0831A64F6B200D6014F /* AMPDeviceInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
3208C0891A64F6B200D6014F /* AMPLocationManagerDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3208C0841A64F6B200D6014F /* AMPLocationManagerDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
3208C08A1A64F6B200D6014F /* Amplitude.h in Headers */ = {isa = PBXBuildFile; fileRef = 3208C0851A64F6B200D6014F /* Amplitude.h */; settings = {ATTRIBUTES = (Public, ); }; };
320AFEE91A840DEB00929778 /* KahunaAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 320AFEE81A840DEB00929778 /* KahunaAnalytics.h */; settings = {ATTRIBUTES = (Public, ); }; };
32225231199AD6D200478B1A /* SEGReachability.h in Headers */ = {isa = PBXBuildFile; fileRef = 3222522F199AD6D200478B1A /* SEGReachability.h */; };
32225232199AD6D200478B1A /* SEGReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 32225230199AD6D200478B1A /* SEGReachability.m */; };
32225233199AD6D200478B1A /* SEGReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 32225230199AD6D200478B1A /* SEGReachability.m */; };
Expand Down Expand Up @@ -237,6 +238,7 @@
6E85F3901B2F922F00763913 /* CountlyDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E85F38F1B2F922F00763913 /* CountlyDB.h */; settings = {ATTRIBUTES = (Public, ); }; };
6E85F3921B2F974700763913 /* Localytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E85F3911B2F974700763913 /* Localytics.h */; settings = {ATTRIBUTES = (Public, ); }; };
6E85F3941B2F980B00763913 /* MPLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E85F3931B2F980B00763913 /* MPLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
6E865BE41B697BBB00F80367 /* Kahuna.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E865BE31B697BBB00F80367 /* Kahuna.h */; settings = {ATTRIBUTES = (Public, ); }; };
6E8F058C1B42321800305E99 /* SEGOptimizelyIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E8F058B1B42321800305E99 /* SEGOptimizelyIntegrationTests.m */; };
6E92C1E71B3DD5260049B5A8 /* SEGLocalyticsIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E92C1E61B3DD5260049B5A8 /* SEGLocalyticsIntegrationTests.m */; };
6E9F1EE71B605E7400E55D88 /* SEGApptimizeIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E9F1EE61B605E7400E55D88 /* SEGApptimizeIntegrationTests.m */; };
Expand Down Expand Up @@ -325,6 +327,8 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
019892FE1B67121A00ED875F /* SEGKahunaDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SEGKahunaDefines.h; sourceTree = "<group>"; };
01FB19741B66881F000483CC /* SEGKahunaIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SEGKahunaIntegrationTests.m; path = Integrations/Kahuna/SEGKahunaIntegrationTests.m; sourceTree = "<group>"; };
095FDFE35C86958DB4798F57 /* Pods-Analytics.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Analytics.release.xcconfig"; path = "Pods/Target Support Files/Pods-Analytics/Pods-Analytics.release.xcconfig"; sourceTree = "<group>"; };
23CD79ED9C3E478C83CB7A34 /* libPods-AnalyticsTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-AnalyticsTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
24AE4A015CBF4E95B18D10A7 /* libPods-iOS Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iOS Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -333,7 +337,6 @@
3208C0831A64F6B200D6014F /* AMPDeviceInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AMPDeviceInfo.h; path = "Pods/Amplitude-iOS/Amplitude/AMPDeviceInfo.h"; sourceTree = "<group>"; };
3208C0841A64F6B200D6014F /* AMPLocationManagerDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AMPLocationManagerDelegate.h; path = "Pods/Amplitude-iOS/Amplitude/AMPLocationManagerDelegate.h"; sourceTree = "<group>"; };
3208C0851A64F6B200D6014F /* Amplitude.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Amplitude.h; path = "Pods/Amplitude-iOS/Amplitude/Amplitude.h"; sourceTree = "<group>"; };
320AFEE81A840DEB00929778 /* KahunaAnalytics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = KahunaAnalytics.h; path = Pods/KahunaSDK/Kahuna/KahunaAnalytics.h; sourceTree = "<group>"; };
3222522F199AD6D200478B1A /* SEGReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SEGReachability.h; path = Helpers/SEGReachability.h; sourceTree = "<group>"; };
32225230199AD6D200478B1A /* SEGReachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SEGReachability.m; path = Helpers/SEGReachability.m; sourceTree = "<group>"; };
32385FD81A2DF0CA008E09B2 /* MPCategoryHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MPCategoryHelpers.h; path = Pods/Mixpanel/Mixpanel/MPCategoryHelpers.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -543,6 +546,7 @@
6E85F38F1B2F922F00763913 /* CountlyDB.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CountlyDB.h; path = Pods/Countly/CountlyDB.h; sourceTree = "<group>"; };
6E85F3911B2F974700763913 /* Localytics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Localytics.h; path = "Pods/Localytics/Localytics-iOS-3.3.0/Localytics.h"; sourceTree = "<group>"; };
6E85F3931B2F980B00763913 /* MPLogger.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MPLogger.h; path = Pods/Mixpanel/Mixpanel/MPLogger.h; sourceTree = "<group>"; };
6E865BE31B697BBB00F80367 /* Kahuna.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Kahuna.h; path = Pods/Kahuna/Kahuna.framework/Headers/Kahuna.h; sourceTree = "<group>"; };
6E8F058B1B42321800305E99 /* SEGOptimizelyIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SEGOptimizelyIntegrationTests.m; path = Integrations/Optimizely/SEGOptimizelyIntegrationTests.m; sourceTree = "<group>"; };
6E92C1E61B3DD5260049B5A8 /* SEGLocalyticsIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SEGLocalyticsIntegrationTests.m; path = Integrations/Localytics/SEGLocalyticsIntegrationTests.m; sourceTree = "<group>"; };
6E9F1EE61B605E7400E55D88 /* SEGApptimizeIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SEGApptimizeIntegrationTests.m; path = Integrations/Apptimize/SEGApptimizeIntegrationTests.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -682,6 +686,14 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
01FB19711B667B47000483CC /* Kahuna */ = {
isa = PBXGroup;
children = (
01FB19741B66881F000483CC /* SEGKahunaIntegrationTests.m */,
);
name = Kahuna;
sourceTree = "<group>";
};
3242C99C1946A3E100FBE441 /* iOS Tests */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -759,6 +771,7 @@
children = (
32F638191A8134A600C65643 /* SEGKahunaIntegration.h */,
32F6381A1A8134A600C65643 /* SEGKahunaIntegration.m */,
019892FE1B67121A00ED875F /* SEGKahunaDefines.h */,
);
name = Kahuna;
sourceTree = "<group>";
Expand Down Expand Up @@ -793,6 +806,7 @@
6E16FFF31B33AD0600B4F7FE /* Integrations */ = {
isa = PBXGroup;
children = (
01FB19711B667B47000483CC /* Kahuna */,
6EB4681F1B39CDBD00A0E4B9 /* Amplitude */,
6EF6652D1B585DC900DC7EA1 /* AppsFlyer */,
6E9F1EE51B605E4100E55D88 /* Apptimize */,
Expand Down Expand Up @@ -938,6 +952,7 @@
D3D35174186242B4005586E7 /* Headers */ = {
isa = PBXGroup;
children = (
6E865BE31B697BBB00F80367 /* Kahuna.h */,
6E2AFA401B55852400C8A14E /* MOInbox.h */,
6E2AFA411B55852400C8A14E /* MOInboxViewController.h */,
6E2AFA3C1B55850C00C8A14E /* MOEHelperConstants.h */,
Expand Down Expand Up @@ -1013,7 +1028,6 @@
325DCE2E1A8D875100D4142E /* BugsnagNotifier.h */,
325DCE2F1A8D875100D4142E /* BugsnagOSXNotifier.h */,
325DCE301A8D875100D4142E /* BugsnagSink.h */,
320AFEE81A840DEB00929778 /* KahunaAnalytics.h */,
3208C0811A64F6B200D6014F /* AMPARCMacros.h */,
3208C0821A64F6B200D6014F /* AMPConstants.h */,
3208C0831A64F6B200D6014F /* AMPDeviceInfo.h */,
Expand Down Expand Up @@ -1422,7 +1436,6 @@
6E165A1A1B54771A002C1C40 /* GAITrackedViewController.h in Headers */,
6E165A1B1B54771A002C1C40 /* GAITracker.h in Headers */,
6E85F3901B2F922F00763913 /* CountlyDB.h in Headers */,
320AFEE91A840DEB00929778 /* KahunaAnalytics.h in Headers */,
6E85F3711B2F792100763913 /* TSAppEventSourceImpl.h in Headers */,
32385FE31A2DF0FB008E09B2 /* MPUITableViewBinding.h in Headers */,
3252EA881999D6CC0056C32A /* Taplytics.h in Headers */,
Expand All @@ -1433,6 +1446,7 @@
32CEE41E19F5B6DB007758F2 /* TaplyticsOptions.h in Headers */,
32385FDF1A2DF0E7008E09B2 /* MPEventBinding.h in Headers */,
DAEB6FF11AC9EBCA003E7FB3 /* SEGApptimizeIntegration.h in Headers */,
6E865BE41B697BBB00F80367 /* Kahuna.h in Headers */,
32CCD99C1919A4F4007B63BA /* Analytics.h in Headers */,
EA25892317C6979D000CEF61 /* SEGAnalytics.h in Headers */,
D371F32E185942BB0053337D /* Crittercism.h in Headers */,
Expand Down Expand Up @@ -1596,6 +1610,7 @@
32430A761914186C004EFF59 /* SEGLocation.h in Headers */,
D331BD351860F5F0007CB22F /* TSLogLevel.h in Headers */,
D3EDB66218C315F100A88A7E /* SEGLocalyticsIntegration.h in Headers */,
019892FF1B67121A00ED875F /* SEGKahunaDefines.h in Headers */,
D331BD361860F5F0007CB22F /* TSPlatform.h in Headers */,
D3EDB65C18C315F100A88A7E /* SEGCrittercismIntegration.h in Headers */,
D3EDB66618C315F100A88A7E /* SEGSegmentioIntegration.h in Headers */,
Expand Down Expand Up @@ -1866,6 +1881,7 @@
3242C9A31946A3E100FBE441 /* iOS_Tests.m in Sources */,
3242C9B21946ADA900FBE441 /* SEGAnalyticsIntegration.m in Sources */,
32A69C241979CF4A00D69943 /* SEGOptimizelyIntegration.m in Sources */,
01FB19751B66881F000483CC /* SEGKahunaIntegrationTests.m in Sources */,
3242C9B71946AFCC00FBE441 /* SEGCountlyIntegration.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
2 changes: 2 additions & 0 deletions Analytics/Integrations/Kahuna/SEGKahunaIntegration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
@property (nonatomic, assign) BOOL valid;
@property (nonatomic, assign) BOOL initialized;
@property (nonatomic, copy) NSDictionary *settings;
@property Class kahunaClass;

@end

Expand All @@ -22,6 +23,7 @@
@property (nonatomic) NSDictionary *pushInfo;
@property (nonatomic) UIApplicationState applicationState;
@property (nonatomic) BOOL kahunaInitialized;
@property Class kahunaClass;

+ (instancetype)sharedInstance;
- (void)didFinishLaunching:(NSNotification *)userInfo;
Expand Down
Loading

0 comments on commit d288ab9

Please sign in to comment.