Skip to content

Commit 0411234

Browse files
alda-optimizelyalda-optimizely
authored
Merge pull request #39 from optimizely/alda/datafileManager
Alda/datafile manager
2 parents c59e28d + da6029f commit 0411234

File tree

13 files changed

+45
-51
lines changed

13 files changed

+45
-51
lines changed

‎OptimizelySDKCore/OptimizelySDKCore.xcodeproj/project.pbxproj

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,16 @@
218218
EA87A02B1DE31453002E9EF7 /* OPTLYUserProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = EA87A0281DE31453002E9EF7 /* OPTLYUserProfile.h */; settings = {ATTRIBUTES = (Public, ); }; };
219219
EA87A02C1DE31453002E9EF7 /* OPTLYUserProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = EA87A0291DE31453002E9EF7 /* OPTLYUserProfile.m */; };
220220
EA87A02D1DE31453002E9EF7 /* OPTLYUserProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = EA87A0291DE31453002E9EF7 /* OPTLYUserProfile.m */; };
221+
EA8FD0DB1DE9798E00D950AD /* OPTLYHTTPRequestManager.h in Headers */ = {isa = PBXBuildFile; fileRef = EA8FD0D71DE9798E00D950AD /* OPTLYHTTPRequestManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
222+
EA8FD0DC1DE9798E00D950AD /* OPTLYHTTPRequestManager.h in Headers */ = {isa = PBXBuildFile; fileRef = EA8FD0D71DE9798E00D950AD /* OPTLYHTTPRequestManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
223+
EA8FD0DD1DE9798E00D950AD /* OPTLYHTTPRequestManager.m in Sources */ = {isa = PBXBuildFile; fileRef = EA8FD0D81DE9798E00D950AD /* OPTLYHTTPRequestManager.m */; };
224+
EA8FD0DE1DE9798E00D950AD /* OPTLYHTTPRequestManager.m in Sources */ = {isa = PBXBuildFile; fileRef = EA8FD0D81DE9798E00D950AD /* OPTLYHTTPRequestManager.m */; };
225+
EA8FD0DF1DE9798E00D950AD /* OPTLYNetworkService.h in Headers */ = {isa = PBXBuildFile; fileRef = EA8FD0D91DE9798E00D950AD /* OPTLYNetworkService.h */; settings = {ATTRIBUTES = (Public, ); }; };
226+
EA8FD0E01DE9798E00D950AD /* OPTLYNetworkService.h in Headers */ = {isa = PBXBuildFile; fileRef = EA8FD0D91DE9798E00D950AD /* OPTLYNetworkService.h */; settings = {ATTRIBUTES = (Public, ); }; };
227+
EA8FD0E11DE9798E00D950AD /* OPTLYNetworkService.m in Sources */ = {isa = PBXBuildFile; fileRef = EA8FD0DA1DE9798E00D950AD /* OPTLYNetworkService.m */; };
228+
EA8FD0E21DE9798E00D950AD /* OPTLYNetworkService.m in Sources */ = {isa = PBXBuildFile; fileRef = EA8FD0DA1DE9798E00D950AD /* OPTLYNetworkService.m */; };
229+
EA8FD0EA1DE97DD700D950AD /* OPTLYHTTPRequestManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = EA8FD0E71DE97DC000D950AD /* OPTLYHTTPRequestManagerTest.m */; };
230+
EA8FD0EB1DE97DD900D950AD /* OPTLYHTTPRequestManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = EA8FD0E71DE97DC000D950AD /* OPTLYHTTPRequestManagerTest.m */; };
221231
/* End PBXBuildFile section */
222232

223233
/* Begin PBXContainerItemProxy section */
@@ -369,6 +379,11 @@
369379
EA5249631DC7B69A00AF6685 /* OPTLYEventDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYEventDispatcher.m; sourceTree = "<group>"; };
370380
EA87A0281DE31453002E9EF7 /* OPTLYUserProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OPTLYUserProfile.h; path = OptimizelySDKCore/OPTLYUserProfile.h; sourceTree = "<group>"; };
371381
EA87A0291DE31453002E9EF7 /* OPTLYUserProfile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OPTLYUserProfile.m; path = OptimizelySDKCore/OPTLYUserProfile.m; sourceTree = "<group>"; };
382+
EA8FD0D71DE9798E00D950AD /* OPTLYHTTPRequestManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPTLYHTTPRequestManager.h; sourceTree = "<group>"; };
383+
EA8FD0D81DE9798E00D950AD /* OPTLYHTTPRequestManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYHTTPRequestManager.m; sourceTree = "<group>"; };
384+
EA8FD0D91DE9798E00D950AD /* OPTLYNetworkService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPTLYNetworkService.h; sourceTree = "<group>"; };
385+
EA8FD0DA1DE9798E00D950AD /* OPTLYNetworkService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYNetworkService.m; sourceTree = "<group>"; };
386+
EA8FD0E71DE97DC000D950AD /* OPTLYHTTPRequestManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYHTTPRequestManagerTest.m; sourceTree = "<group>"; };
372387
F5B1C4BBC7682A657C92ABD3 /* Pods_OptimizelySDKCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OptimizelySDKCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
373388
F6CC17F155793CF43AB7A3D9 /* Pods-OptimizelySDKCoreTVOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OptimizelySDKCoreTVOS.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-OptimizelySDKCoreTVOS/Pods-OptimizelySDKCoreTVOS.debug.xcconfig"; sourceTree = "<group>"; };
374389
/* End PBXFileReference section */
@@ -632,6 +647,7 @@
632647
EA5249611DC7B64C00AF6685 /* EventDispatcher */,
633648
EA87A0271DE3142A002E9EF7 /* UserProfile */,
634649
EA2FA8451DC5E1A300B1D81B /* Loggers */,
650+
EA8FD0C81DE978E400D950AD /* Network */,
635651
EA2FA83D1DC5E0E900B1D81B /* Utilities */,
636652
);
637653
path = OptimizelySDKCore;
@@ -650,6 +666,7 @@
650666
EA2FAB8B1DC6FDFA00B1D81B /* OPTLYErrorHandlerTest.m */,
651667
EA2FAB8C1DC6FDFA00B1D81B /* OPTLYEventBuilderTest.m */,
652668
EA2FAB8D1DC6FDFA00B1D81B /* OPTLYEventDispatcherTest.m */,
669+
EA8FD0E71DE97DC000D950AD /* OPTLYHTTPRequestManagerTest.m */,
653670
EA2FAB8F1DC6FDFA00B1D81B /* OPTLYLoggerTest.m */,
654671
EA2FAB901DC6FDFA00B1D81B /* OPTLYProjectConfigTest.m */,
655672
EA2FAB911DC6FDFA00B1D81B /* OPTLYTestHelper.h */,
@@ -680,6 +697,17 @@
680697
path = ..;
681698
sourceTree = "<group>";
682699
};
700+
EA8FD0C81DE978E400D950AD /* Network */ = {
701+
isa = PBXGroup;
702+
children = (
703+
EA8FD0D71DE9798E00D950AD /* OPTLYHTTPRequestManager.h */,
704+
EA8FD0D81DE9798E00D950AD /* OPTLYHTTPRequestManager.m */,
705+
EA8FD0D91DE9798E00D950AD /* OPTLYNetworkService.h */,
706+
EA8FD0DA1DE9798E00D950AD /* OPTLYNetworkService.m */,
707+
);
708+
name = Network;
709+
sourceTree = "<group>";
710+
};
683711
/* End PBXGroup section */
684712

685713
/* Begin PBXHeadersBuildPhase section */
@@ -705,6 +733,8 @@
705733
EA2C242D1DE6A2470063ADA0 /* OPTLYProjectConfigBuilder.h in Headers */,
706734
EA87A02A1DE31453002E9EF7 /* OPTLYUserProfile.h in Headers */,
707735
EA064BC71DD3FC8800DF7537 /* OPTLYQueue.h in Headers */,
736+
EA8FD0DB1DE9798E00D950AD /* OPTLYHTTPRequestManager.h in Headers */,
737+
EA8FD0DF1DE9798E00D950AD /* OPTLYNetworkService.h in Headers */,
708738
EA2FAB791DC6F5F400B1D81B /* OPTLYMacros.h in Headers */,
709739
EA2FAAF41DC6F57200B1D81B /* OPTLYEventTicket.h in Headers */,
710740
EA2FAB121DC6F57200B1D81B /* OPTLYTrafficAllocation.h in Headers */,
@@ -754,6 +784,8 @@
754784
EA87A02B1DE31453002E9EF7 /* OPTLYUserProfile.h in Headers */,
755785
EA064BC81DD3FC8800DF7537 /* OPTLYQueue.h in Headers */,
756786
EA2C242E1DE6A2470063ADA0 /* OPTLYProjectConfigBuilder.h in Headers */,
787+
EA8FD0DC1DE9798E00D950AD /* OPTLYHTTPRequestManager.h in Headers */,
788+
EA8FD0E01DE9798E00D950AD /* OPTLYNetworkService.h in Headers */,
757789
EA2FAC7B1DC70EBC00B1D81B /* murmur3.h in Headers */,
758790
EA2FAB7A1DC6F5F400B1D81B /* OPTLYMacros.h in Headers */,
759791
EA2FAA951DC6F57100B1D81B /* OPTLYBaseCondition.h in Headers */,
@@ -1133,6 +1165,7 @@
11331165
EA2FAC161DC6FFC600B1D81B /* OPTLYEventLayerState.m in Sources */,
11341166
EA5249651DC7B69A00AF6685 /* OPTLYEventDispatcher.m in Sources */,
11351167
EA2C242F1DE6A2470063ADA0 /* OPTLYProjectConfigBuilder.m in Sources */,
1168+
EA8FD0E11DE9798E00D950AD /* OPTLYNetworkService.m in Sources */,
11361169
EA2FAC171DC6FFC600B1D81B /* OPTLYEventMetric.m in Sources */,
11371170
EA2FAC181DC6FFC600B1D81B /* OPTLYEventParameterKeys.m in Sources */,
11381171
EA2FAC191DC6FFC600B1D81B /* OPTLYEventRelatedEvent.m in Sources */,
@@ -1148,6 +1181,7 @@
11481181
EA87A02C1DE31453002E9EF7 /* OPTLYUserProfile.m in Sources */,
11491182
EA2FAC221DC6FFC600B1D81B /* OPTLYErrorHandlerMessages.m in Sources */,
11501183
EA2FAC241DC6FFC600B1D81B /* OPTLYEventBuilder.m in Sources */,
1184+
EA8FD0DD1DE9798E00D950AD /* OPTLYHTTPRequestManager.m in Sources */,
11511185
EA2FAC251DC6FFC600B1D81B /* OPTLYLogger.m in Sources */,
11521186
5ECBBE691DDE6A800028FF6B /* OPTLYVariable.m in Sources */,
11531187
EA2FAC261DC6FFC600B1D81B /* OPTLYLoggerMessages.m in Sources */,
@@ -1169,6 +1203,7 @@
11691203
EA2FABBD1DC6FDFA00B1D81B /* OPTLYLoggerTest.m in Sources */,
11701204
EA064BCE1DD3FCD700DF7537 /* OPTLYQueueTest.m in Sources */,
11711205
EA2FABB41DC6FDFA00B1D81B /* OPTLYEventBuilderTest.m in Sources */,
1206+
EA8FD0EA1DE97DD700D950AD /* OPTLYHTTPRequestManagerTest.m in Sources */,
11721207
EA2FABB71DC6FDFA00B1D81B /* OPTLYEventDispatcherTest.m in Sources */,
11731208
EA2FABA51DC6FDFA00B1D81B /* OPTLYAudienceTest.m in Sources */,
11741209
EA2FABB11DC6FDFA00B1D81B /* OPTLYErrorHandlerTest.m in Sources */,
@@ -1201,6 +1236,7 @@
12011236
EA2FABF11DC6FFA100B1D81B /* OPTLYEventLayerState.m in Sources */,
12021237
EA5249F21DC7FACF00AF6685 /* OPTLYEventDispatcher.m in Sources */,
12031238
EA2C24301DE6A2470063ADA0 /* OPTLYProjectConfigBuilder.m in Sources */,
1239+
EA8FD0E21DE9798E00D950AD /* OPTLYNetworkService.m in Sources */,
12041240
EA2FABF21DC6FFA100B1D81B /* OPTLYEventMetric.m in Sources */,
12051241
EA2FABF31DC6FFA100B1D81B /* OPTLYEventParameterKeys.m in Sources */,
12061242
EA2FABF41DC6FFA100B1D81B /* OPTLYEventRelatedEvent.m in Sources */,
@@ -1216,6 +1252,7 @@
12161252
EA87A02D1DE31453002E9EF7 /* OPTLYUserProfile.m in Sources */,
12171253
EA2FABFD1DC6FFA100B1D81B /* OPTLYErrorHandlerMessages.m in Sources */,
12181254
EA2FABFF1DC6FFA100B1D81B /* OPTLYEventBuilder.m in Sources */,
1255+
EA8FD0DE1DE9798E00D950AD /* OPTLYHTTPRequestManager.m in Sources */,
12191256
EA2FAC001DC6FFA100B1D81B /* OPTLYLogger.m in Sources */,
12201257
5E3C0E701DDF7A290025DB85 /* OPTLYVariable.m in Sources */,
12211258
EA2FAC011DC6FFA100B1D81B /* OPTLYLoggerMessages.m in Sources */,
@@ -1237,6 +1274,7 @@
12371274
EA2FABBE1DC6FDFA00B1D81B /* OPTLYLoggerTest.m in Sources */,
12381275
EA064BCF1DD3FCD800DF7537 /* OPTLYQueueTest.m in Sources */,
12391276
EA2FABB51DC6FDFA00B1D81B /* OPTLYEventBuilderTest.m in Sources */,
1277+
EA8FD0EB1DE97DD900D950AD /* OPTLYHTTPRequestManagerTest.m in Sources */,
12401278
EA2FABB81DC6FDFA00B1D81B /* OPTLYEventDispatcherTest.m in Sources */,
12411279
EA2FABA61DC6FDFA00B1D81B /* OPTLYAudienceTest.m in Sources */,
12421280
EA2FABB21DC6FDFA00B1D81B /* OPTLYErrorHandlerTest.m in Sources */,

‎OptimizelySDKShared/OptimizelySDKShared/OPTLYHTTPRequestManager.h renamed to ‎OptimizelySDKCore/OptimizelySDKCore/OPTLYHTTPRequestManager.h

File renamed without changes.

‎OptimizelySDKShared/OptimizelySDKShared/OPTLYHTTPRequestManager.m renamed to ‎OptimizelySDKCore/OptimizelySDKCore/OPTLYHTTPRequestManager.m

File renamed without changes.

‎OptimizelySDKShared/OptimizelySDKShared/OPTLYNetworkService.h renamed to ‎OptimizelySDKCore/OptimizelySDKCore/OPTLYNetworkService.h

File renamed without changes.

‎OptimizelySDKShared/OptimizelySDKShared/OPTLYNetworkService.m renamed to ‎OptimizelySDKCore/OptimizelySDKCore/OPTLYNetworkService.m

File renamed without changes.

‎OptimizelySDKCore/OptimizelySDKCore/OptimizelySDKCore.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
#import "OPTLYEventBuilder.h"
2323
#import "OPTLYEventDispatcher.h"
2424
#import "OPTLYExperiment.h"
25+
#import "OPTLYHTTPRequestManager.h"
2526
#import "OPTLYLogger.h"
2627
#import "OPTLYLoggerMessages.h"
28+
#import "OPTLYNetworkService.h"
2729
#import "OPTLYProjectConfig.h"
2830
#import "OPTLYProjectConfigBuilder.h"
2931
#import "OPTLYVariable.h"

‎OptimizelySDKShared/OptimizelySDKSharedTests/OPTLYHTTPRequestManagerTest.m renamed to ‎OptimizelySDKCore/OptimizelySDKCoreTests/OPTLYHTTPRequestManagerTest.m

File renamed without changes.

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManager/OPTLYDatafileManager.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616

1717
#import <Foundation/Foundation.h>
1818
#import <OptimizelySDKShared/OPTLYDatafileManager.h>
19-
#import <OptimizelySDKCore/OPTLYErrorHandler.h>
20-
#import <OptimizelySDKShared/OPTLYHTTPRequestManager.h>
21-
#import <OptimizelySDKCore/OPTLYLogger.h>
2219
#import "OPTLYDatafileManagerBuilder.h"
2320

2421
@protocol OPTLYErrorHandler, OPTLYLogger;

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManager/OPTLYDatafileManager.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
***************************************************************************/
1616

1717
#import "OPTLYDatafileManager.h"
18+
#import <OptimizelySDKCore/OPTLYErrorHandler.h>
19+
#import <OptimizelySDKCore/OPTLYLogger.h>
20+
#import <OptimizelySDKCore/OPTLYNetworkService.h>
1821
#import <OptimizelySDKShared/OPTLYDataStore.h>
19-
#import <OptimizelySDKShared/OPTLYNetworkService.h>
2022

2123
static NSString *const kCDNAddressFormat = @"https://cdn.optimizely.com/json/%@.json";
2224
NSTimeInterval const kDefaultDatafileFetchInterval = 0;

0 commit comments

Comments
 (0)