Skip to content

Commit 25b02b4

Browse files
BrandonStalnakerpeterjenkins
BrandonStalnaker
authored and
peterjenkins
committed
Update for tvOS
1 parent ff25422 commit 25b02b4

File tree

3 files changed

+82
-11
lines changed

3 files changed

+82
-11
lines changed

‎mParticle_Optimizely.xcodeproj/project.pbxproj‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,21 @@
3232
D316BD75217F716200688E56 /* OptimizelySDKShared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD6A217F716200688E56 /* OptimizelySDKShared.framework */; };
3333
D316BD76217F716200688E56 /* OptimizelySDKCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD6B217F716200688E56 /* OptimizelySDKCore.framework */; };
3434
D316BD77217F716200688E56 /* OptimizelySDKCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD6B217F716200688E56 /* OptimizelySDKCore.framework */; };
35+
D33B9161219F231800C3D936 /* mParticle_Apple_SDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD63217F710400688E56 /* mParticle_Apple_SDK.framework */; };
36+
D33B9162219F231900C3D936 /* mParticle_Apple_SDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD63217F710400688E56 /* mParticle_Apple_SDK.framework */; };
37+
D33B9163219F234600C3D936 /* OptimizelySDKTVOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD78217F73F700688E56 /* OptimizelySDKTVOS.framework */; };
38+
D33B9164219F234700C3D936 /* OptimizelySDKTVOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD78217F73F700688E56 /* OptimizelySDKTVOS.framework */; };
39+
D33B9165219F236700C3D936 /* OptimizelySDKShared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD6A217F716200688E56 /* OptimizelySDKShared.framework */; };
40+
D33B9166219F236700C3D936 /* OptimizelySDKShared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD6A217F716200688E56 /* OptimizelySDKShared.framework */; };
41+
D33B9167219F2F9A00C3D936 /* OptimizelySDKEventDispatcher.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD68217F716200688E56 /* OptimizelySDKEventDispatcher.framework */; };
42+
D33B9168219F2F9B00C3D936 /* OptimizelySDKEventDispatcher.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD68217F716200688E56 /* OptimizelySDKEventDispatcher.framework */; };
43+
D33B9169219F2FA400C3D936 /* OptimizelySDKDatafileManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD69217F716200688E56 /* OptimizelySDKDatafileManager.framework */; };
44+
D33B916A219F2FA500C3D936 /* OptimizelySDKDatafileManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD69217F716200688E56 /* OptimizelySDKDatafileManager.framework */; };
45+
D33B916B219F2FAA00C3D936 /* OptimizelySDKCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD6B217F716200688E56 /* OptimizelySDKCore.framework */; };
46+
D33B916C219F2FAB00C3D936 /* OptimizelySDKCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD6B217F716200688E56 /* OptimizelySDKCore.framework */; };
47+
D33B916D219F2FBA00C3D936 /* OptimizelySDKUserProfileService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD66217F716200688E56 /* OptimizelySDKUserProfileService.framework */; };
48+
D33B916E219F2FBA00C3D936 /* OptimizelySDKUserProfileService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D316BD66217F716200688E56 /* OptimizelySDKUserProfileService.framework */; };
49+
D33B916F219F2FD500C3D936 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3085199219B645B00D1C15A /* OCMock.framework */; };
3550
/* End PBXBuildFile section */
3651

3752
/* Begin PBXContainerItemProxy section */
@@ -91,14 +106,29 @@
91106
isa = PBXFrameworksBuildPhase;
92107
buildActionMask = 2147483647;
93108
files = (
109+
D33B9161219F231800C3D936 /* mParticle_Apple_SDK.framework in Frameworks */,
110+
D33B9165219F236700C3D936 /* OptimizelySDKShared.framework in Frameworks */,
111+
D33B916B219F2FAA00C3D936 /* OptimizelySDKCore.framework in Frameworks */,
112+
D33B9169219F2FA400C3D936 /* OptimizelySDKDatafileManager.framework in Frameworks */,
113+
D33B9163219F234600C3D936 /* OptimizelySDKTVOS.framework in Frameworks */,
114+
D33B916D219F2FBA00C3D936 /* OptimizelySDKUserProfileService.framework in Frameworks */,
115+
D33B9167219F2F9A00C3D936 /* OptimizelySDKEventDispatcher.framework in Frameworks */,
94116
);
95117
runOnlyForDeploymentPostprocessing = 0;
96118
};
97119
D3085183219B2CEC00D1C15A /* Frameworks */ = {
98120
isa = PBXFrameworksBuildPhase;
99121
buildActionMask = 2147483647;
100122
files = (
123+
D33B9168219F2F9B00C3D936 /* OptimizelySDKEventDispatcher.framework in Frameworks */,
124+
D33B9166219F236700C3D936 /* OptimizelySDKShared.framework in Frameworks */,
125+
D33B9162219F231900C3D936 /* mParticle_Apple_SDK.framework in Frameworks */,
126+
D33B916C219F2FAB00C3D936 /* OptimizelySDKCore.framework in Frameworks */,
127+
D33B916F219F2FD500C3D936 /* OCMock.framework in Frameworks */,
128+
D33B9164219F234700C3D936 /* OptimizelySDKTVOS.framework in Frameworks */,
101129
D3085187219B2CED00D1C15A /* mParticle_Optimizely_tvOS.framework in Frameworks */,
130+
D33B916E219F2FBA00C3D936 /* OptimizelySDKUserProfileService.framework in Frameworks */,
131+
D33B916A219F2FA500C3D936 /* OptimizelySDKDatafileManager.framework in Frameworks */,
102132
);
103133
runOnlyForDeploymentPostprocessing = 0;
104134
};
@@ -450,6 +480,10 @@
450480
DYLIB_COMPATIBILITY_VERSION = 1;
451481
DYLIB_CURRENT_VERSION = 1;
452482
DYLIB_INSTALL_NAME_BASE = "@rpath";
483+
FRAMEWORK_SEARCH_PATHS = (
484+
"$(inherited)",
485+
"$(PROJECT_DIR)/Carthage/Build/tvOS",
486+
);
453487
INFOPLIST_FILE = mParticle_Optimizely_tvOS/Info.plist;
454488
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
455489
LD_RUNPATH_SEARCH_PATHS = (
@@ -476,6 +510,10 @@
476510
DYLIB_COMPATIBILITY_VERSION = 1;
477511
DYLIB_CURRENT_VERSION = 1;
478512
DYLIB_INSTALL_NAME_BASE = "@rpath";
513+
FRAMEWORK_SEARCH_PATHS = (
514+
"$(inherited)",
515+
"$(PROJECT_DIR)/Carthage/Build/tvOS",
516+
);
479517
INFOPLIST_FILE = mParticle_Optimizely_tvOS/Info.plist;
480518
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
481519
LD_RUNPATH_SEARCH_PATHS = (
@@ -497,6 +535,11 @@
497535
buildSettings = {
498536
CODE_SIGN_STYLE = Automatic;
499537
DEVELOPMENT_TEAM = DLD43Y3TRP;
538+
FRAMEWORK_SEARCH_PATHS = (
539+
"$(inherited)",
540+
"$(PROJECT_DIR)/Carthage/Build/iOS",
541+
"$(PROJECT_DIR)/Carthage/Build/tvOS",
542+
);
500543
INFOPLIST_FILE = mParticle_Optimizely_tvOSTests/Info.plist;
501544
LD_RUNPATH_SEARCH_PATHS = (
502545
"$(inherited)",
@@ -516,6 +559,11 @@
516559
buildSettings = {
517560
CODE_SIGN_STYLE = Automatic;
518561
DEVELOPMENT_TEAM = DLD43Y3TRP;
562+
FRAMEWORK_SEARCH_PATHS = (
563+
"$(inherited)",
564+
"$(PROJECT_DIR)/Carthage/Build/iOS",
565+
"$(PROJECT_DIR)/Carthage/Build/tvOS",
566+
);
519567
INFOPLIST_FILE = mParticle_Optimizely_tvOSTests/Info.plist;
520568
LD_RUNPATH_SEARCH_PATHS = (
521569
"$(inherited)",

‎mParticle_Optimizely/MPKitOptimizely.m‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@
3333
#import "OptimizelySDKTVOS.h"
3434
#endif
3535

36+
#if defined(__has_include) && __has_include(<OptimizelySDKShared/OptimizelySDKShared.h>)
37+
#import <OptimizelySDKShared/OptimizelySDKShared.h>
38+
#else
39+
#import "OptimizelySDKShared.h"
40+
#endif
41+
3642
#endif
3743

3844
#if defined(__has_include) && __has_include(<OptimizelySDKDatafileManager/OPTLYDatafileManager.h>)
@@ -41,6 +47,8 @@
4147
#import "OPTLYDatafileManager.h"
4248
#endif
4349

50+
51+
4452
NSString *const optimizelyCustomEventName = @"Optimizely.EventName";
4553
NSString *const optimizelyTrackedValue = @"Optimizely.Value";
4654
NSString *const optimizelyCustomUserId = @"Optimizely.UserId";

‎mParticle_Optimizely_tvOSTests/mParticle_Optimizely_tvOSTests.m‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,26 @@
1-
//
2-
// mParticle_Optimizely_tvOSTests.m
3-
// mParticle_Optimizely_tvOSTests
4-
//
5-
// Created by Brandon Stalnaker on 11/13/18.
6-
// Copyright © 2018 mparticle. All rights reserved.
7-
//
8-
91
#import <XCTest/XCTest.h>
2+
#import "MPKitOptimizely.h"
3+
#import <OCMock/OCMock.h>
4+
#if TARGET_OS_IOS == 1
5+
#import <OptimizelySDKiOS/OptimizelySDKiOS.h>
6+
#elif TARGET_OS_TV == 1
7+
#import <OptimizelySDKTVOS/OptimizelySDKTVOS.h>
8+
#endif
9+
#if defined(__has_include) && __has_include(<mParticle_Apple_SDK/mParticle.h>)
10+
#import <mParticle_Apple_SDK/mParticle.h>
11+
#else
12+
#import "mParticle.h"
13+
#endif
14+
15+
static NSString *const oiAPIKey = @"projectId";
16+
static NSString *const oiEventInterval = @"eventInterval";
17+
static NSString *const oiDataFileInterval = @"eventInterval";
18+
static NSString *const oiuserIdKey = @"userIdField";
19+
20+
static NSString *const oiuserIdCustomerIDValue = @"customerId";
21+
static NSString *const oiuserIdEmailValue = @"email";
22+
static NSString *const oiuserIdMPIDValue = @"mpid";
23+
static NSString *const oiuserIdDeviceStampValue = @"deviceApplicationStamp";
1024

1125
@interface mParticle_Optimizely_tvOSTests : XCTestCase
1226

@@ -24,9 +38,10 @@ - (void)tearDown {
2438
[super tearDown];
2539
}
2640

27-
- (void)testExample {
28-
// This is an example of a functional test case.
29-
// Use XCTAssert and related functions to verify your tests produce the correct results.
41+
- (void)testStarted {
42+
MPKitOptimizely *exampleKit = [[MPKitOptimizely alloc] init];
43+
[exampleKit didFinishLaunchingWithConfiguration:@{oiAPIKey:@"12345", oiEventInterval:@12345}];
44+
XCTAssertTrue(exampleKit.started);
3045
}
3146

3247
@end

0 commit comments

Comments
 (0)