Skip to content

Commit 67eb3cc

Browse files
alda-optimizelyalda-optimizely
committed
Rebased with devel.
1 parent 5dac265 commit 67eb3cc

File tree

6 files changed

+26
-28
lines changed

6 files changed

+26
-28
lines changed

‎OptimizelySDKCore/OptimizelySDKCore.xcodeproj/project.pbxproj

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -654,13 +654,13 @@
654654
EA2FA83F1DC5E11F00B1D81B /* Bucketer */,
655655
EA2FA90B1DC6F17400B1D81B /* Builder */,
656656
EA2FA8401DC5E13A00B1D81B /* Data Models */,
657-
EA8FD0F91DEB120C00D950AD /* Datafile Manager */,
657+
EA8FD13D1DED36FF00D950AD /* Datafile Manager */,
658658
EA2FA8411DC5E14700B1D81B /* Error Handler */,
659659
EA2FA8421DC5E15700B1D81B /* Event Builder */,
660660
EA5249611DC7B64C00AF6685 /* Event Dispatcher */,
661661
EA87A0271DE3142A002E9EF7 /* UserProfile */,
662662
EA2FA8451DC5E1A300B1D81B /* Loggers */,
663-
EA8FD0C81DE978E400D950AD /* Network */,
663+
EA8FD1301DED35CC00D950AD /* Network */,
664664
EA2FA83D1DC5E0E900B1D81B /* Utilities */,
665665
);
666666
path = OptimizelySDKCore;
@@ -679,7 +679,6 @@
679679
EA2FAB8B1DC6FDFA00B1D81B /* OPTLYErrorHandlerTest.m */,
680680
EA2FAB8C1DC6FDFA00B1D81B /* OPTLYEventBuilderTest.m */,
681681
EA2FAB8D1DC6FDFA00B1D81B /* OPTLYEventDispatcherTest.m */,
682-
EA8FD0E71DE97DC000D950AD /* OPTLYHTTPRequestManagerTest.m */,
683682
EA2FAB8F1DC6FDFA00B1D81B /* OPTLYLoggerTest.m */,
684683
EA2FAB901DC6FDFA00B1D81B /* OPTLYProjectConfigTest.m */,
685684
EA2FAB911DC6FDFA00B1D81B /* OPTLYTestHelper.h */,
@@ -720,19 +719,22 @@
720719
EA8FD0C81DE978E400D950AD /* Network */ = {
721720
isa = PBXGroup;
722721
children = (
723-
EA8FD0D71DE9798E00D950AD /* OPTLYHTTPRequestManager.h */,
724-
EA8FD0D81DE9798E00D950AD /* OPTLYHTTPRequestManager.m */,
725-
EA8FD0D91DE9798E00D950AD /* OPTLYNetworkService.h */,
726-
EA8FD0DA1DE9798E00D950AD /* OPTLYNetworkService.m */,
722+
EA8FD1311DED35E800D950AD /* OPTLYHTTPRequestManager.h */,
723+
EA8FD1321DED35E800D950AD /* OPTLYHTTPRequestManager.m */,
724+
EA8FD1331DED35E800D950AD /* OPTLYNetworkService.h */,
725+
EA8FD1341DED35E800D950AD /* OPTLYNetworkService.m */,
727726
);
728727
name = Network;
729-
EA8FD0F91DEB120C00D950AD /* Datafile Manager */ = {
728+
sourceTree = "<group>";
729+
};
730+
EA8FD13D1DED36FF00D950AD /* Datafile Manager */ = {
730731
isa = PBXGroup;
731732
children = (
732-
EA8FD0FA1DEB12A400D950AD /* OPTLYDatafileManager.h */,
733-
EA8FD0FB1DEB12A400D950AD /* OPTLYDatafileManager.m */,
733+
EA8FD13E1DED372F00D950AD /* OPTLYDatafileManager.h */,
734+
EA8FD13F1DED372F00D950AD /* OPTLYDatafileManager.m */,
734735
);
735736
name = "Datafile Manager";
737+
path = ..;
736738
sourceTree = "<group>";
737739
};
738740
/* End PBXGroup section */
@@ -812,10 +814,10 @@
812814
EA2FAB741DC6F5F400B1D81B /* OPTLYLog.h in Headers */,
813815
EA87A02B1DE31453002E9EF7 /* OPTLYUserProfile.h in Headers */,
814816
EA064BC81DD3FC8800DF7537 /* OPTLYQueue.h in Headers */,
815-
EA8FD0FD1DEB12A400D950AD /* OPTLYDatafileManager.h in Headers */,
816817
EA2C242E1DE6A2470063ADA0 /* OPTLYProjectConfigBuilder.h in Headers */,
817-
EA8FD0DC1DE9798E00D950AD /* OPTLYHTTPRequestManager.h in Headers */,
818-
EA8FD0E01DE9798E00D950AD /* OPTLYNetworkService.h in Headers */,
818+
EA8FD1411DED372F00D950AD /* OPTLYDatafileManager.h in Headers */,
819+
EA8FD13A1DED35E800D950AD /* OPTLYNetworkService.h in Headers */,
820+
EA8FD1361DED35E800D950AD /* OPTLYHTTPRequestManager.h in Headers */,
819821
EA2FAC7B1DC70EBC00B1D81B /* murmur3.h in Headers */,
820822
EA2FAB7A1DC6F5F400B1D81B /* OPTLYMacros.h in Headers */,
821823
EA2FAA951DC6F57100B1D81B /* OPTLYBaseCondition.h in Headers */,
@@ -1190,12 +1192,13 @@
11901192
EA2FAC111DC6FFC600B1D81B /* OPTLYEventAudience.m in Sources */,
11911193
EA2FAC121DC6FFC600B1D81B /* OPTLYEventDecision.m in Sources */,
11921194
EA2FAC131DC6FFC600B1D81B /* OPTLYEventDecisionTicket.m in Sources */,
1195+
EA8FD1421DED372F00D950AD /* OPTLYDatafileManager.m in Sources */,
11931196
EA2FAC141DC6FFC600B1D81B /* OPTLYEventFeature.m in Sources */,
11941197
EA2FAC151DC6FFC600B1D81B /* OPTLYEventHeader.m in Sources */,
11951198
EA2FAC161DC6FFC600B1D81B /* OPTLYEventLayerState.m in Sources */,
11961199
EA5249651DC7B69A00AF6685 /* OPTLYEventDispatcher.m in Sources */,
11971200
EA2C242F1DE6A2470063ADA0 /* OPTLYProjectConfigBuilder.m in Sources */,
1198-
EA8FD0E11DE9798E00D950AD /* OPTLYNetworkService.m in Sources */,
1201+
EA8FD13B1DED35E800D950AD /* OPTLYNetworkService.m in Sources */,
11991202
EA2FAC171DC6FFC600B1D81B /* OPTLYEventMetric.m in Sources */,
12001203
EA2FAC181DC6FFC600B1D81B /* OPTLYEventParameterKeys.m in Sources */,
12011204
EA2FAC191DC6FFC600B1D81B /* OPTLYEventRelatedEvent.m in Sources */,
@@ -1211,13 +1214,12 @@
12111214
EA87A02C1DE31453002E9EF7 /* OPTLYUserProfile.m in Sources */,
12121215
EA2FAC221DC6FFC600B1D81B /* OPTLYErrorHandlerMessages.m in Sources */,
12131216
EA2FAC241DC6FFC600B1D81B /* OPTLYEventBuilder.m in Sources */,
1214-
EA8FD0DD1DE9798E00D950AD /* OPTLYHTTPRequestManager.m in Sources */,
1217+
EA8FD1371DED35E800D950AD /* OPTLYHTTPRequestManager.m in Sources */,
12151218
EA2FAC251DC6FFC600B1D81B /* OPTLYLogger.m in Sources */,
12161219
5ECBBE691DDE6A800028FF6B /* OPTLYVariable.m in Sources */,
12171220
EA2FAC261DC6FFC600B1D81B /* OPTLYLoggerMessages.m in Sources */,
12181221
EA2FAC291DC6FFC600B1D81B /* OPTLYLog.m in Sources */,
12191222
EA2C24351DE7887C0063ADA0 /* OPTLYVariationVariable.m in Sources */,
1220-
EA8FD0FE1DEB12A400D950AD /* OPTLYDatafileManager.m in Sources */,
12211223
EA2FAC2A1DC6FFC600B1D81B /* OPTLYValidator.m in Sources */,
12221224
);
12231225
runOnlyForDeploymentPostprocessing = 0;
@@ -1234,7 +1236,6 @@
12341236
EA2FABBD1DC6FDFA00B1D81B /* OPTLYLoggerTest.m in Sources */,
12351237
EA064BCE1DD3FCD700DF7537 /* OPTLYQueueTest.m in Sources */,
12361238
EA2FABB41DC6FDFA00B1D81B /* OPTLYEventBuilderTest.m in Sources */,
1237-
EA8FD0EA1DE97DD700D950AD /* OPTLYHTTPRequestManagerTest.m in Sources */,
12381239
EA2FABB71DC6FDFA00B1D81B /* OPTLYEventDispatcherTest.m in Sources */,
12391240
EA2FABA51DC6FDFA00B1D81B /* OPTLYAudienceTest.m in Sources */,
12401241
EA2FABB11DC6FDFA00B1D81B /* OPTLYErrorHandlerTest.m in Sources */,
@@ -1262,12 +1263,13 @@
12621263
EA2FABEC1DC6FFA100B1D81B /* OPTLYEventAudience.m in Sources */,
12631264
EA2FABED1DC6FFA100B1D81B /* OPTLYEventDecision.m in Sources */,
12641265
EA2FABEE1DC6FFA100B1D81B /* OPTLYEventDecisionTicket.m in Sources */,
1266+
EA8FD1431DED372F00D950AD /* OPTLYDatafileManager.m in Sources */,
12651267
EA2FABEF1DC6FFA100B1D81B /* OPTLYEventFeature.m in Sources */,
12661268
EA2FABF01DC6FFA100B1D81B /* OPTLYEventHeader.m in Sources */,
12671269
EA2FABF11DC6FFA100B1D81B /* OPTLYEventLayerState.m in Sources */,
12681270
EA5249F21DC7FACF00AF6685 /* OPTLYEventDispatcher.m in Sources */,
12691271
EA2C24301DE6A2470063ADA0 /* OPTLYProjectConfigBuilder.m in Sources */,
1270-
EA8FD0E21DE9798E00D950AD /* OPTLYNetworkService.m in Sources */,
1272+
EA8FD13C1DED35E800D950AD /* OPTLYNetworkService.m in Sources */,
12711273
EA2FABF21DC6FFA100B1D81B /* OPTLYEventMetric.m in Sources */,
12721274
EA2FABF31DC6FFA100B1D81B /* OPTLYEventParameterKeys.m in Sources */,
12731275
EA2FABF41DC6FFA100B1D81B /* OPTLYEventRelatedEvent.m in Sources */,
@@ -1283,13 +1285,12 @@
12831285
EA87A02D1DE31453002E9EF7 /* OPTLYUserProfile.m in Sources */,
12841286
EA2FABFD1DC6FFA100B1D81B /* OPTLYErrorHandlerMessages.m in Sources */,
12851287
EA2FABFF1DC6FFA100B1D81B /* OPTLYEventBuilder.m in Sources */,
1286-
EA8FD0DE1DE9798E00D950AD /* OPTLYHTTPRequestManager.m in Sources */,
1288+
EA8FD1381DED35E800D950AD /* OPTLYHTTPRequestManager.m in Sources */,
12871289
EA2FAC001DC6FFA100B1D81B /* OPTLYLogger.m in Sources */,
12881290
5E3C0E701DDF7A290025DB85 /* OPTLYVariable.m in Sources */,
12891291
EA2FAC011DC6FFA100B1D81B /* OPTLYLoggerMessages.m in Sources */,
12901292
EA2FAC041DC6FFA100B1D81B /* OPTLYLog.m in Sources */,
12911293
EA2C24361DE7887C0063ADA0 /* OPTLYVariationVariable.m in Sources */,
1292-
EA8FD0FF1DEB12A400D950AD /* OPTLYDatafileManager.m in Sources */,
12931294
EA2FAC051DC6FFA100B1D81B /* OPTLYValidator.m in Sources */,
12941295
);
12951296
runOnlyForDeploymentPostprocessing = 0;
@@ -1306,7 +1307,6 @@
13061307
EA2FABBE1DC6FDFA00B1D81B /* OPTLYLoggerTest.m in Sources */,
13071308
EA064BCF1DD3FCD800DF7537 /* OPTLYQueueTest.m in Sources */,
13081309
EA2FABB51DC6FDFA00B1D81B /* OPTLYEventBuilderTest.m in Sources */,
1309-
EA8FD0EB1DE97DD900D950AD /* OPTLYHTTPRequestManagerTest.m in Sources */,
13101310
EA2FABB81DC6FDFA00B1D81B /* OPTLYEventDispatcherTest.m in Sources */,
13111311
EA2FABA61DC6FDFA00B1D81B /* OPTLYAudienceTest.m in Sources */,
13121312
EA2FABB21DC6FDFA00B1D81B /* OPTLYErrorHandlerTest.m in Sources */,

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManager.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
EA5249DF1DC7E3C300AF6685 /* OptimizelySDKShared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA5248921DC72C5300AF6685 /* OptimizelySDKShared.framework */; };
4242
EA5249E01DC7E3CF00AF6685 /* OptimizelySDKShared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA5248961DC72C5300AF6685 /* OptimizelySDKShared.framework */; };
4343
EA524A3D1DC846CE00AF6685 /* OptimizelySDKDatafileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = EA3C68BE1DC1E75900C578CA /* OptimizelySDKDatafileManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
44-
EA8FD10D1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = EA8FD10B1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.h */; };
45-
EA8FD10E1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = EA8FD10B1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.h */; };
44+
EA8FD10D1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = EA8FD10B1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
45+
EA8FD10E1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = EA8FD10B1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
4646
EA8FD10F1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = EA8FD10C1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.m */; };
4747
EA8FD1101DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = EA8FD10C1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.m */; };
4848
/* End PBXBuildFile section */

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManager/OPTLYDatafileManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#import <OptimizelySDKCore/OPTLYErrorHandler.h>
1919
#import <OptimizelySDKCore/OPTLYLog.h>
2020
#import <OptimizelySDKCore/OPTLYLogger.h>
21+
#import <OptimizelySDKCore/OPTLYNetworkService.h>
2122
#import <OptimizelySDKShared/OPTLYDataStore.h>
22-
#import <OptimizelySDKShared/OPTLYNetworkService.h>
2323
#import "OPTLYDatafileManager.h"
2424

2525
NSTimeInterval const kDefaultDatafileFetchInterval_s = 120;

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManagerTests/OPTLYDatafileManagerTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
#import <XCTest/XCTest.h>
1818
#import <OHHTTPStubs/OHHTTPStubs.h>
19+
#import <OptimizelySDKCore/OPTLYNetworkService.h>
1920
#import <OptimizelySDKShared/OPTLYDataStore.h>
20-
#import <OptimizelySDKShared/OPTLYNetworkService.h>
2121
#import "OPTLYDatafileManager.h"
2222
#import "OPTLYTestHelper.h"
2323

‎OptimizelySDKShared/OptimizelySDKShared/OptimizelySDKShared.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@
2323
#endif
2424
#import "OPTLYDataStore.h"
2525
#import "OPTLYFileManager.h"
26-
#import "OPTLYHTTPRequestManager.h"
2726
#import "OPTLYManager.h"
2827
#import "OPTLYManagerBuilder.h"
29-
#import "OPTLYNetworkService.h"
3028

3129
//! Project version number for OptimizelySDKShared.
3230
FOUNDATION_EXPORT double OptimizelySDKSharedVersionNumber;

‎OptimizelySDKShared/OptimizelySDKSharedTests/OPTLYManagerTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#import <XCTest/XCTest.h>
1818
#import <OHHTTPStubs/OHHTTPStubs.h>
1919
#import <OptimizelySDKCore/OPTLYDatafileManager.h>
20+
#import <OptimizelySDKCore/OPTLYNetworkService.h>
2021
#import <OptimizelySDKCore/OPTLYProjectConfig.h>
21-
#import <OptimizelySDKShared/OPTLYNetworkService.h>
2222
#import "OPTLYClient.h"
2323
#import "OPTLYManager.h"
2424
#import "OPTLYTestHelper.h"

0 commit comments

Comments
 (0)