Skip to content

Commit caac102

Browse files
wangjoshuahwangjoshuah
authored
Merge pull request #44 from optimizely/josh.want/datafile_manager/move_datafile_manager_from_core_to_shared
move datafile manager back to shared from core
2 parents 188a32c + 0f2dfce commit caac102

File tree

17 files changed

+73
-147
lines changed

17 files changed

+73
-147
lines changed

‎OptimizelySDKCore/OptimizelySDKCore.xcodeproj/project.pbxproj

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,6 @@
214214
EA5249651DC7B69A00AF6685 /* OPTLYEventDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = EA5249631DC7B69A00AF6685 /* OPTLYEventDispatcher.m */; };
215215
EA5249771DC7C6EF00AF6685 /* OPTLYEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = EA5249621DC7B69A00AF6685 /* OPTLYEventDispatcher.h */; settings = {ATTRIBUTES = (Public, ); }; };
216216
EA5249F21DC7FACF00AF6685 /* OPTLYEventDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = EA5249631DC7B69A00AF6685 /* OPTLYEventDispatcher.m */; };
217-
EA6E1CD91DED59DB00D533BB /* OPTLYDatafileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = EA6E1CD71DED59DB00D533BB /* OPTLYDatafileManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
218-
EA6E1CDA1DED59DB00D533BB /* OPTLYDatafileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = EA6E1CD71DED59DB00D533BB /* OPTLYDatafileManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
219-
EA6E1CDB1DED59DB00D533BB /* OPTLYDatafileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = EA6E1CD81DED59DB00D533BB /* OPTLYDatafileManager.m */; };
220-
EA6E1CDC1DED59DB00D533BB /* OPTLYDatafileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = EA6E1CD81DED59DB00D533BB /* OPTLYDatafileManager.m */; };
221217
EA87A02A1DE31453002E9EF7 /* OPTLYUserProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = EA87A0281DE31453002E9EF7 /* OPTLYUserProfile.h */; settings = {ATTRIBUTES = (Public, ); }; };
222218
EA87A02B1DE31453002E9EF7 /* OPTLYUserProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = EA87A0281DE31453002E9EF7 /* OPTLYUserProfile.h */; settings = {ATTRIBUTES = (Public, ); }; };
223219
EA87A02C1DE31453002E9EF7 /* OPTLYUserProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = EA87A0291DE31453002E9EF7 /* OPTLYUserProfile.m */; };
@@ -381,8 +377,6 @@
381377
EA3C68161DC1E66C00C578CA /* OptimizelySDKCoreTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OptimizelySDKCoreTests-Info.plist"; sourceTree = "<group>"; };
382378
EA5249621DC7B69A00AF6685 /* OPTLYEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPTLYEventDispatcher.h; sourceTree = "<group>"; };
383379
EA5249631DC7B69A00AF6685 /* OPTLYEventDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYEventDispatcher.m; sourceTree = "<group>"; };
384-
EA6E1CD71DED59DB00D533BB /* OPTLYDatafileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OPTLYDatafileManager.h; path = OptimizelySDKCore/OPTLYDatafileManager.h; sourceTree = "<group>"; };
385-
EA6E1CD81DED59DB00D533BB /* OPTLYDatafileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OPTLYDatafileManager.m; path = OptimizelySDKCore/OPTLYDatafileManager.m; sourceTree = "<group>"; };
386380
EA87A0281DE31453002E9EF7 /* OPTLYUserProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OPTLYUserProfile.h; path = OptimizelySDKCore/OPTLYUserProfile.h; sourceTree = "<group>"; };
387381
EA87A0291DE31453002E9EF7 /* OPTLYUserProfile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OPTLYUserProfile.m; path = OptimizelySDKCore/OPTLYUserProfile.m; sourceTree = "<group>"; };
388382
EA8FD0D71DE9798E00D950AD /* OPTLYHTTPRequestManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPTLYHTTPRequestManager.h; sourceTree = "<group>"; };
@@ -648,7 +642,6 @@
648642
EA2FA83F1DC5E11F00B1D81B /* Bucketer */,
649643
EA2FA90B1DC6F17400B1D81B /* Builder */,
650644
EA2FA8401DC5E13A00B1D81B /* Data Models */,
651-
EA6E1CD61DED59AE00D533BB /* Datafile Manager */,
652645
EA2FA8411DC5E14700B1D81B /* Error Handler */,
653646
EA2FA8421DC5E15700B1D81B /* Event Builder */,
654647
EA5249611DC7B64C00AF6685 /* Event Dispatcher */,
@@ -694,16 +687,6 @@
694687
name = "Event Dispatcher";
695688
sourceTree = "<group>";
696689
};
697-
EA6E1CD61DED59AE00D533BB /* Datafile Manager */ = {
698-
isa = PBXGroup;
699-
children = (
700-
EA6E1CD71DED59DB00D533BB /* OPTLYDatafileManager.h */,
701-
EA6E1CD81DED59DB00D533BB /* OPTLYDatafileManager.m */,
702-
);
703-
name = "Datafile Manager";
704-
path = ..;
705-
sourceTree = "<group>";
706-
};
707690
EA87A0271DE3142A002E9EF7 /* UserProfile */ = {
708691
isa = PBXGroup;
709692
children = (
@@ -752,7 +735,6 @@
752735
EA064BC71DD3FC8800DF7537 /* OPTLYQueue.h in Headers */,
753736
EA8FD0DB1DE9798E00D950AD /* OPTLYHTTPRequestManager.h in Headers */,
754737
EA8FD0DF1DE9798E00D950AD /* OPTLYNetworkService.h in Headers */,
755-
EA6E1CD91DED59DB00D533BB /* OPTLYDatafileManager.h in Headers */,
756738
EA2FAB791DC6F5F400B1D81B /* OPTLYMacros.h in Headers */,
757739
EA2FAAF41DC6F57200B1D81B /* OPTLYEventTicket.h in Headers */,
758740
EA2FAB121DC6F57200B1D81B /* OPTLYTrafficAllocation.h in Headers */,
@@ -803,7 +785,6 @@
803785
EA064BC81DD3FC8800DF7537 /* OPTLYQueue.h in Headers */,
804786
EA2C242E1DE6A2470063ADA0 /* OPTLYProjectConfigBuilder.h in Headers */,
805787
EA8FD0DC1DE9798E00D950AD /* OPTLYHTTPRequestManager.h in Headers */,
806-
EA6E1CDA1DED59DB00D533BB /* OPTLYDatafileManager.h in Headers */,
807788
EA8FD0E01DE9798E00D950AD /* OPTLYNetworkService.h in Headers */,
808789
EA2FAC7B1DC70EBC00B1D81B /* murmur3.h in Headers */,
809790
EA2FAB7A1DC6F5F400B1D81B /* OPTLYMacros.h in Headers */,
@@ -1179,7 +1160,6 @@
11791160
EA2FAC111DC6FFC600B1D81B /* OPTLYEventAudience.m in Sources */,
11801161
EA2FAC121DC6FFC600B1D81B /* OPTLYEventDecision.m in Sources */,
11811162
EA2FAC131DC6FFC600B1D81B /* OPTLYEventDecisionTicket.m in Sources */,
1182-
EA6E1CDB1DED59DB00D533BB /* OPTLYDatafileManager.m in Sources */,
11831163
EA2FAC141DC6FFC600B1D81B /* OPTLYEventFeature.m in Sources */,
11841164
EA2FAC151DC6FFC600B1D81B /* OPTLYEventHeader.m in Sources */,
11851165
EA2FAC161DC6FFC600B1D81B /* OPTLYEventLayerState.m in Sources */,
@@ -1251,7 +1231,6 @@
12511231
EA2FABEC1DC6FFA100B1D81B /* OPTLYEventAudience.m in Sources */,
12521232
EA2FABED1DC6FFA100B1D81B /* OPTLYEventDecision.m in Sources */,
12531233
EA2FABEE1DC6FFA100B1D81B /* OPTLYEventDecisionTicket.m in Sources */,
1254-
EA6E1CDC1DED59DB00D533BB /* OPTLYDatafileManager.m in Sources */,
12551234
EA2FABEF1DC6FFA100B1D81B /* OPTLYEventFeature.m in Sources */,
12561235
EA2FABF01DC6FFA100B1D81B /* OPTLYEventHeader.m in Sources */,
12571236
EA2FABF11DC6FFA100B1D81B /* OPTLYEventLayerState.m in Sources */,

‎OptimizelySDKCore/OptimizelySDKCore/OPTLYBuilder.m

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

1717
#import "OPTLYBucketer.h"
1818
#import "OPTLYBuilder.h"
19-
#import "OPTLYDatafileManager.h"
2019
#import "OPTLYErrorHandler.h"
2120
#import "OPTLYEventBuilder.h"
2221
#import "OPTLYEventDispatcher.h"
@@ -86,13 +85,6 @@ - (NSData *)datafile {
8685
return _datafile;
8786
}
8887

89-
- (id<OPTLYDatafileManager>)datafileManager {
90-
if (!_datafileManager) {
91-
_datafileManager = [[OPTLYDatafileManagerDefault alloc] init];
92-
}
93-
return _datafileManager;
94-
}
95-
9688
- (id<OPTLYErrorHandler>)errorHandler {
9789
if (!_errorHandler) {
9890
_errorHandler = [[OPTLYErrorHandlerNoOp alloc] init];

‎OptimizelySDKCore/OptimizelySDKCore/Optimizely.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#import "OPTLYBuilder.h"
1919

2020
@class OPTLYProjectConfig, OPTLYVariation;
21-
@protocol OPTLYBucketer, OPTLYDatafileManager, OPTLYErrorHandler, OPTLYEventBuilder, OPTLYEventDispatcher, OPTLYLogger;
21+
@protocol OPTLYBucketer, OPTLYErrorHandler, OPTLYEventBuilder, OPTLYEventDispatcher, OPTLYLogger;
2222

2323
// ---- Live Variable Getter Errors ----
2424

@@ -222,7 +222,6 @@ typedef NS_ENUM(NSInteger, OPTLYLiveVariableError) {
222222

223223
@property (nonatomic, strong, readonly, nullable) id<OPTLYBucketer> bucketer;
224224
@property (nonatomic, strong, readonly, nullable) OPTLYProjectConfig *config;
225-
@property (nonatomic, strong, readonly, nullable) id<OPTLYDatafileManager> datafileManager;
226225
@property (nonatomic, strong, readonly, nullable) id<OPTLYErrorHandler> errorHandler;
227226
@property (nonatomic, strong, readonly, nullable) id<OPTLYEventBuilder> eventBuilder;
228227
@property (nonatomic, strong, readonly, nullable) id<OPTLYEventDispatcher> eventDispatcher;

‎OptimizelySDKCore/OptimizelySDKCore/Optimizely.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ - (instancetype)initWithBuilder:(OPTLYBuilder *)builder {
5454
if (self != nil) {
5555
_bucketer = builder.bucketer;
5656
_config = builder.config;
57-
_datafileManager = builder.datafileManager;
5857
_eventBuilder = builder.eventBuilder;
5958
_eventDispatcher = builder.eventDispatcher;
6059
_errorHandler = builder.errorHandler;

‎OptimizelySDKCore/OptimizelySDKCore/OptimizelySDKCore.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#import "Optimizely.h"
1818
#import "OPTLYBucketer.h"
1919
#import "OPTLYBuilder.h"
20-
#import "OPTLYDatafileManager.h"
2120
#import "OPTLYErrorHandler.h"
2221
#import "OPTLYErrorHandlerMessages.h"
2322
#import "OPTLYEventBuilder.h"

‎OptimizelySDKCore/OptimizelySDKCoreTests/OPTLYBuilderTest.m

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

1717
#import <XCTest/XCTest.h>
1818
#import "Optimizely.h"
19-
#import "OPTLYDatafileManager.h"
2019
#import "OPTLYErrorHandler.h"
2120
#import "OPTLYEventDispatcher.h"
2221
#import "OPTLYLogger.h"
@@ -45,7 +44,6 @@ - (void)testBuilderBuildsDefaults {
4544
XCTAssertNotNil(optimizely);
4645
XCTAssertNotNil(optimizely.bucketer);
4746
XCTAssertNotNil(optimizely.config);
48-
XCTAssertNotNil(optimizely.datafileManager);
4947
XCTAssertNotNil(optimizely.errorHandler);
5048
XCTAssertNotNil(optimizely.eventBuilder);
5149
XCTAssertNotNil(optimizely.eventDispatcher);
@@ -109,21 +107,6 @@ - (void)testBuilderCanAssignLogger {
109107
XCTAssertEqual(logger, customOptimizely.logger, @"Should be the same object with custom builder");
110108
}
111109

112-
- (void)testBuilderCanAssignDatafileManager {
113-
NSData *datafile = [OPTLYTestHelper loadJSONDatafileIntoDataObject:kDataModelDatafileName];
114-
115-
id<OPTLYDatafileManager> datafileManager = [OPTLYDatafileManagerNoOp new];
116-
117-
Optimizely *customOptimizely = [Optimizely initWithBuilderBlock:^(OPTLYBuilder *builder) {
118-
builder.datafile = datafile;
119-
builder.datafileManager = datafileManager;
120-
}];
121-
122-
XCTAssertNotNil(customOptimizely);
123-
XCTAssertNotNil(customOptimizely.datafileManager);
124-
XCTAssertEqualObjects(datafileManager, customOptimizely.datafileManager, @"This module should be the same as that created in the OPLTYManager builder.");
125-
}
126-
127110
- (void)testInitializationWithoutBuilder {
128111
Optimizely *optimizely = [Optimizely initWithBuilderBlock:nil];
129112
XCTAssertNil(optimizely);

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManager/OPTLYDatafileManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
***************************************************************************/
1616

1717
#import <Foundation/Foundation.h>
18-
#import <OptimizelySDKCore/OPTLYDatafileManager.h>
18+
#import <OptimizelySDKShared/OPTLYDatafileManager.h>
1919
#import "OPTLYDatafileManagerBuilder.h"
2020

2121
@protocol OPTLYDatafileManager, OPTLYErrorHandler, OPTLYLogger;

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManager/OPTLYDatafileManagerBuilder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
***************************************************************************/
1616

1717
#import <Foundation/Foundation.h>
18-
#import <OptimizelySDKCore/OPTLYDatafileManager.h>
18+
#import <OptimizelySDKShared/OPTLYDatafileManager.h>
1919

2020
@class OPTLYDatafileManagerBuilder;
2121
@protocol OPTLYErrorHandler, OPTLYLogger;

‎OptimizelySDKShared/OptimizelySDKShared.xcodeproj/project.pbxproj

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
2D08FBA01DCA5FA8006CA063 /* OPTLYClientBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D08FB9E1DCA5FA8006CA063 /* OPTLYClientBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
3030
2D08FBA21DCA5FB3006CA063 /* OPTLYClientBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D08FBA11DCA5FB3006CA063 /* OPTLYClientBuilder.m */; };
3131
2D08FBA31DCA5FB3006CA063 /* OPTLYClientBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D08FBA11DCA5FB3006CA063 /* OPTLYClientBuilder.m */; };
32+
2D3EC7A01DEFB63E0014D9A7 /* OPTLYDatafileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D3EC79E1DEFB63E0014D9A7 /* OPTLYDatafileManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
33+
2D3EC7A11DEFB63E0014D9A7 /* OPTLYDatafileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D3EC79F1DEFB63E0014D9A7 /* OPTLYDatafileManager.m */; };
34+
2D3EC7A21DEFB6420014D9A7 /* OPTLYDatafileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D3EC79E1DEFB63E0014D9A7 /* OPTLYDatafileManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
35+
2D3EC7A31DEFB6420014D9A7 /* OPTLYDatafileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D3EC79F1DEFB63E0014D9A7 /* OPTLYDatafileManager.m */; };
3236
2DB3D1561DC8163900ECF72E /* OPTLYManagerBuilderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DB3D1521DC8163600ECF72E /* OPTLYManagerBuilderTest.m */; };
3337
2DB3D1571DC8163A00ECF72E /* OPTLYManagerBuilderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DB3D1521DC8163600ECF72E /* OPTLYManagerBuilderTest.m */; };
3438
2DB3D1581DC8164800ECF72E /* OptimizelySDKSharedTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EA3C68381DC1E68E00C578CA /* OptimizelySDKSharedTests.m */; };
@@ -147,6 +151,8 @@
147151
2D08FB851DCA5E66006CA063 /* validator_whitelisting_test_datafile.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = validator_whitelisting_test_datafile.json; path = TestData/validator_whitelisting_test_datafile.json; sourceTree = "<group>"; };
148152
2D08FB9E1DCA5FA8006CA063 /* OPTLYClientBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPTLYClientBuilder.h; sourceTree = "<group>"; };
149153
2D08FBA11DCA5FB3006CA063 /* OPTLYClientBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYClientBuilder.m; sourceTree = "<group>"; };
154+
2D3EC79E1DEFB63E0014D9A7 /* OPTLYDatafileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPTLYDatafileManager.h; sourceTree = "<group>"; };
155+
2D3EC79F1DEFB63E0014D9A7 /* OPTLYDatafileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYDatafileManager.m; sourceTree = "<group>"; };
150156
2DB3D1521DC8163600ECF72E /* OPTLYManagerBuilderTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYManagerBuilderTest.m; sourceTree = "<group>"; };
151157
2DB3D17A1DC816D600ECF72E /* OPTLYManagerBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPTLYManagerBuilder.h; sourceTree = "<group>"; };
152158
2DB3D17B1DC816D600ECF72E /* OPTLYManagerBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYManagerBuilder.m; sourceTree = "<group>"; };
@@ -258,6 +264,15 @@
258264
name = TestData;
259265
sourceTree = "<group>";
260266
};
267+
2D3EC79B1DEFB5F30014D9A7 /* Datafile Manger */ = {
268+
isa = PBXGroup;
269+
children = (
270+
2D3EC79E1DEFB63E0014D9A7 /* OPTLYDatafileManager.h */,
271+
2D3EC79F1DEFB63E0014D9A7 /* OPTLYDatafileManager.m */,
272+
);
273+
name = "Datafile Manger";
274+
sourceTree = "<group>";
275+
};
261276
B770041BA173BC0CC7E9DB5F /* Pods */ = {
262277
isa = PBXGroup;
263278
children = (
@@ -311,6 +326,7 @@
311326
EA3C682C1DC1E68E00C578CA /* OptimizelySDKShared.h */,
312327
EA52478F1DC7246C00AF6685 /* Manager */,
313328
2D08FB671DCA5A78006CA063 /* Client */,
329+
2D3EC79B1DEFB5F30014D9A7 /* Datafile Manger */,
314330
EA5247911DC7248200AF6685 /* DataStore */,
315331
);
316332
path = OptimizelySDKShared;
@@ -394,6 +410,7 @@
394410
2D08FB9F1DCA5FA8006CA063 /* OPTLYClientBuilder.h in Headers */,
395411
EA5249971DC7D8AD00AF6685 /* OptimizelySDKShared.h in Headers */,
396412
2D08FB6B1DCA5A99006CA063 /* OPTLYClient.h in Headers */,
413+
2D3EC7A01DEFB63E0014D9A7 /* OPTLYDatafileManager.h in Headers */,
397414
EA5247851DC7226400AF6685 /* OPTLYManager.h in Headers */,
398415
EA064BD21DD4030700DF7537 /* OPTLYDataStore.h in Headers */,
399416
2DB3D17C1DC816D600ECF72E /* OPTLYManagerBuilder.h in Headers */,
@@ -408,6 +425,7 @@
408425
buildActionMask = 2147483647;
409426
files = (
410427
2D08FBA01DCA5FA8006CA063 /* OPTLYClientBuilder.h in Headers */,
428+
2D3EC7A21DEFB6420014D9A7 /* OPTLYDatafileManager.h in Headers */,
411429
EA52499A1DC7D8B800AF6685 /* OptimizelySDKShared.h in Headers */,
412430
2DB3D1801DC8181100ECF72E /* OPTLYManagerBuilder.h in Headers */,
413431
2D08FB6C1DCA5A99006CA063 /* OPTLYClient.h in Headers */,
@@ -797,6 +815,7 @@
797815
2DB3D17D1DC816D600ECF72E /* OPTLYManagerBuilder.m in Sources */,
798816
EA064BD41DD4030700DF7537 /* OPTLYDataStore.m in Sources */,
799817
EA29D9551DCED4580034A4FE /* OPTLYDatabaseEntity.m in Sources */,
818+
2D3EC7A11DEFB63E0014D9A7 /* OPTLYDatafileManager.m in Sources */,
800819
);
801820
runOnlyForDeploymentPostprocessing = 0;
802821
};
@@ -823,6 +842,7 @@
823842
2D08FB6F1DCA5B3D006CA063 /* OPTLYClient.m in Sources */,
824843
2D08FBA31DCA5FB3006CA063 /* OPTLYClientBuilder.m in Sources */,
825844
2DB3D1811DC8181400ECF72E /* OPTLYManagerBuilder.m in Sources */,
845+
2D3EC7A31DEFB6420014D9A7 /* OPTLYDatafileManager.m in Sources */,
826846
);
827847
runOnlyForDeploymentPostprocessing = 0;
828848
};

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

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
***************************************************************************/
1616

1717
#import "OPTLYDatafileManager.h"
18-
#import "OPTLYNetworkService.h"
18+
#import <OptimizelySDKCore/OPTLYNetworkService.h>
1919

2020
@implementation OPTLYDatafileManagerUtility
2121

‎OptimizelySDKShared/OptimizelySDKShared/OPTLYManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* limitations under the License. *
1515
***************************************************************************/
1616

17-
#import <OptimizelySDKCore/OPTLYDatafileManager.h>
1817
#import <OptimizelySDKCore/OPTLYErrorHandler.h>
1918
#import <OptimizelySDKCore/OPTLYLogger.h>
2019
#import <OptimizelySDKCore/OPTLYLoggerMessages.h>
2120
#import <OptimizelySDKShared/OPTLYManagerBuilder.h>
2221
#import <OptimizelySDKCore/OPTLYNetworkService.h>
2322
#import "OPTLYClient.h"
23+
#import "OPTLYDatafileManager.h"
2424
#import "OPTLYManager.h"
2525
#import "OPTLYManagerBuilder.h"
2626

‎OptimizelySDKShared/OptimizelySDKShared/OPTLYManagerBuilder.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
***************************************************************************/
1616

1717
#import "OPTLYManagerBuilder.h"
18-
#import <OptimizelySDKCore/OPTLYDatafileManager.h>
18+
#import "OPTLYDatafilemanager.h"
1919
#import <OptimizelySDKCore/OPTLYErrorHandler.h>
2020
#import <OptimizelySDKCore/OPTLYEventDispatcher.h>
2121
#import <OptimizelySDKCore/OPTLYLogger.h>

‎OptimizelySDKShared/OptimizelySDKShared/OptimizelySDKShared.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#import "OPTLYDatabase.h"
2222
#import "OPTLYDatabaseEntity.h"
2323
#endif
24+
#import "OPTLYDatafileManager.h"
2425
#import "OPTLYDataStore.h"
2526
#import "OPTLYFileManager.h"
2627
#import "OPTLYManager.h"

‎OptimizelySDKShared/OptimizelySDKSharedTests/OPTLYManagerBuilderTest.m

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

1717
#import <XCTest/XCTest.h>
18-
#import <OptimizelySDKCore/OPTLYDatafileManager.h>
1918
#import <OptimizelySDKCore/OPTLYErrorHandler.h>
2019
#import <OptimizelySDKCore/OPTLYEventDispatcher.h>
2120
#import <OptimizelySDKCore/OPTLYLogger.h>
21+
#import "OPTLYDatafileManager.h"
2222
#import "OPTLYManager.h"
2323
#import "OPTLYManagerBuilder.h"
2424

‎OptimizelySDKShared/OptimizelySDKSharedTests/OPTLYManagerTest.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#import <OptimizelySDKCore/OPTLYNetworkService.h>
2222
#import <OptimizelySDKCore/OPTLYProjectConfig.h>
2323
#import "OPTLYClient.h"
24+
#import "OPTLYDatafileManager.h"
2425
#import "OPTLYManager.h"
2526
#import "OPTLYTestHelper.h"
2627

0 commit comments

Comments
 (0)