refactor: Pull blackout branch into development

Scripts/release.sh

@@ -7,6 +7,7 @@ NOTES="$2"
 
 # Update constant in codebase
 sed -i '' 's/NSString \*const kMParticleSDKVersion = @".*/NSString *const kMParticleSDKVersion = @"'"$VERSION"'";/' mParticle-Apple-SDK/MPIConstants.m
+sed -i '' 's/let kMParticleSDKVersion = ".*/let kMParticleSDKVersion = "'"$VERSION"'"/' mParticle-Apple-SDK/MPConstants.swift
 
 # Update framework plist file
 /usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString $VERSION" Framework/Info.plist

UnitTests/MPAppNotificationHandlerTests.m

@@ -9,7 +9,7 @@
 @interface MParticle ()
 
 + (dispatch_queue_t)messageQueue;
-@property (nonatomic, strong) MPStateMachine *stateMachine;
+@property (nonatomic, strong) MPStateMachine_PRIVATE *stateMachine;
 @property (nonatomic, strong, readonly) MPAppNotificationHandler *appNotificationHandler;
 @property (nonatomic, strong, readonly) MPPersistenceController *persistenceController;
 

UnitTests/MPBaseTestCase.m

@@ -10,6 +10,7 @@
 #import "MPNetworkCommunication.h"
 #import "MPConnectorProtocol.h"
 #import "MPConnectorFactoryProtocol.h"
+#import "MPIConstants.h"
 
 @interface MParticle (Tests)
 @property (nonatomic, strong) MPPersistenceController *persistenceController;
@@ -42,13 +43,13 @@ - (void)setUpWithCompletionHandler:(void (^)(NSError * _Nullable))completion {
     }
 
     [instance reset:^{
-        MPNetworkCommunication.connectorFactory = [[MPTestConnectorFactory alloc] init];
+        MPNetworkCommunication_PRIVATE.connectorFactory = [[MPTestConnectorFactory alloc] init];
         completion(nil);
     }];
 }
 
 - (void)tearDown {
-    MPNetworkCommunication.connectorFactory = nil;
+    MPNetworkCommunication_PRIVATE.connectorFactory = nil;
     [super tearDown];
 }
 

UnitTests/MPDataModelTests.m

@@ -11,7 +11,7 @@
 
 @interface MParticle ()
 
-@property (nonatomic, strong) MPStateMachine *stateMachine;
+@property (nonatomic, strong) MPStateMachine_PRIVATE *stateMachine;
 
 @end
 

UnitTests/MPEventTests.m

@@ -13,8 +13,8 @@
 #pragma mark - MParticle+Tests category
 @interface MParticle (Tests)
 
-@property (nonatomic, strong, nonnull) MPBackendController *backendController;
-@property (nonatomic, strong) MPStateMachine *stateMachine;
+@property (nonatomic, strong, nonnull) MPBackendController_PRIVATE *backendController;
+@property (nonatomic, strong) MPStateMachine_PRIVATE *stateMachine;
 
 @end
 
@@ -146,7 +146,7 @@ - (void)testInvalidTypes {
 
 - (void)testDictionaryRepresentation {
     MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId]];
-    MPStateMachine *stateMachine = [MParticle sharedInstance].stateMachine;
+    MPStateMachine_PRIVATE *stateMachine = [MParticle sharedInstance].stateMachine;
     stateMachine.currentSession = session;
 
     NSNumber *eventDuration = @2;
@@ -180,7 +180,7 @@ - (void)testDictionaryRepresentation {
 
 - (void)testDictionaryRepresentationWithDictionaryValues {
     MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId]];
-    MPStateMachine *stateMachine = [MParticle sharedInstance].stateMachine;
+    MPStateMachine_PRIVATE *stateMachine = [MParticle sharedInstance].stateMachine;
     stateMachine.currentSession = session;
 
     NSNumber *eventDuration = @2;
@@ -215,7 +215,7 @@ - (void)testDictionaryRepresentationWithDictionaryValues {
 
 - (void)testDictionaryRepresentationWithDictionaryValuesContainingDictionary {
     MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId]];
-    MPStateMachine *stateMachine = [MParticle sharedInstance].stateMachine;
+    MPStateMachine_PRIVATE *stateMachine = [MParticle sharedInstance].stateMachine;
     stateMachine.currentSession = session;
 
     NSNumber *eventDuration = @2;
@@ -250,7 +250,7 @@ - (void)testDictionaryRepresentationWithDictionaryValuesContainingDictionary {
 
 - (void)testDictionaryRepresentationWithNullValues {
     MPSession *session = [[MPSession alloc] initWithStartTime:[[NSDate date] timeIntervalSince1970] userId:[MPPersistenceController mpId]];
-    MPStateMachine *stateMachine = [MParticle sharedInstance].stateMachine;
+    MPStateMachine_PRIVATE *stateMachine = [MParticle sharedInstance].stateMachine;
     stateMachine.currentSession = session;
 
     NSNumber *eventDuration = @2;

UnitTests/MPIUserDefaultsTests.m

@@ -10,13 +10,13 @@
 @interface MParticle ()
 
 @property (nonatomic, strong, readonly) MPPersistenceController *persistenceController;
-@property (nonatomic, strong) MPStateMachine *stateMachine;
-@property (nonatomic, strong) MPKitContainer *kitContainer;
+@property (nonatomic, strong) MPStateMachine_PRIVATE *stateMachine;
+@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer_PRIVATE;
 
 @end
 
 @interface MPIUserDefaultsTests : MPBaseTestCase {
-    MPKitContainer *kitContainer;
+    MPKitContainer_PRIVATE *kitContainer;
 }
 
 @end
@@ -29,12 +29,12 @@ - (void)setUp {
     [MParticle sharedInstance].stateMachine.apiKey = @"unit_test_app_key";
     [MParticle sharedInstance].stateMachine.secret = @"unit_test_secret";
 
-    [MParticle sharedInstance].kitContainer = [[MPKitContainer alloc] init];
-    kitContainer = [MParticle sharedInstance].kitContainer;
+    [MParticle sharedInstance].kitContainer_PRIVATE = [[MPKitContainer_PRIVATE alloc] init];
+    kitContainer = [MParticle sharedInstance].kitContainer_PRIVATE;
 }
 
 - (void)tearDown {
-    for (MPKitRegister *kitRegister in [MPKitContainer registeredKits]) {
+    for (MPKitRegister *kitRegister in [MPKitContainer_PRIVATE registeredKits]) {
         kitRegister.wrapperInstance = nil;
     }
     kitContainer = nil;
@@ -471,7 +471,7 @@ - (void)testConfigParameters {
     XCTAssertNotNil(firstParameters);
 
     MPKitRegister *kitRegister = [[MPKitRegister alloc] initWithName:@"KitTest" className:@"MPKitTestClassNoStartImmediately"];
-    [MPKitContainer registerKit:kitRegister];
+    [MPKitContainer_PRIVATE registerKit:kitRegister];
 
     XCTAssertEqualObjects(responseConfiguration, [[MPIUserDefaults standardUserDefaults] getConfiguration]);
     XCTAssertTrue([[MPIUserDefaults standardUserDefaults] isConfigurationParametersOutdated]);

UnitTests/MPIdentityTests.m

@@ -23,7 +23,7 @@ typedef NS_ENUM(NSUInteger, MPIdentityRequestType) {
 };
 
 @interface MPIdentityTests : MPBaseTestCase {
-    MPKitContainer *kitContainer;
+    MPKitContainer_PRIVATE *kitContainer;
 }
 
 @end
@@ -43,7 +43,7 @@ - (void)onModifyRequestComplete:(MPIdentityApiRequest *)request httpResponse:(MP
 - (NSArray<MParticleUser *> *)sortedUserArrayByLastSeen:(NSMutableArray<MParticleUser *> *)userArray;
 @end
 
-@interface MPNetworkCommunication ()
+@interface MPNetworkCommunication_PRIVATE ()
 - (void)modifyWithIdentityChanges:(NSArray *)identityChanges blockOtherRequests:(BOOL)blockOtherRequests completion:(nullable MPIdentityApiManagerModifyCallback)completion;
 - (void)identityApiRequestWithURL:(NSURL*)url identityRequest:(MPIdentityHTTPBaseRequest *_Nonnull)identityRequest blockOtherRequests: (BOOL) blockOtherRequests completion:(nullable MPIdentityApiManagerCallback)completion;
 @end
@@ -58,7 +58,7 @@ - (instancetype)initWithIdentities:(NSDictionary *)identities;
 
 @interface MParticle ()
 
-@property (nonatomic, strong) MPKitContainer *kitContainer;
+@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer_PRIVATE;
 @property (nonatomic, strong, readonly) MPPersistenceController *persistenceController;
 
 @end
@@ -502,7 +502,7 @@ - (void)testConstructIdentityApiRequestWithAuthorizedATTStatus {
 }
 
 - (void)testNoEmptyModifyRequests {
-    MPNetworkCommunication *network = [[MPNetworkCommunication alloc] init];
+    MPNetworkCommunication_PRIVATE *network = [[MPNetworkCommunication_PRIVATE alloc] init];
 
     id partialMock = OCMPartialMock(network);
 
@@ -614,8 +614,8 @@ - (void)testIdentifyIdentityRequestCompleteWithKits {
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
-    id mockContainer = OCMClassMock([MPKitContainer class]);
-    [[[mockInstance stub] andReturn:mockContainer] kitContainer];
+    id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
+    [[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
     [[[mockInstance stub] andReturn:mockInstance] sharedInstance];
 
     id mockUser = OCMClassMock([MParticleUser class]);
@@ -646,8 +646,8 @@ - (void)testLoginIdentityRequestCompleteWithKits {
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
-    id mockContainer = OCMClassMock([MPKitContainer class]);
-    [[[mockInstance stub] andReturn:mockContainer] kitContainer];
+    id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
+    [[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
     [[[mockInstance stub] andReturn:mockInstance] sharedInstance];
 
     id mockUser = OCMClassMock([MParticleUser class]);
@@ -678,8 +678,8 @@ - (void)testLogoutIdentityRequestCompleteWithKits {
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
-    id mockContainer = OCMClassMock([MPKitContainer class]);
-    [[[mockInstance stub] andReturn:mockContainer] kitContainer];
+    id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
+    [[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
     [[[mockInstance stub] andReturn:mockInstance] sharedInstance];
 
     id mockUser = OCMClassMock([MParticleUser class]);
@@ -706,8 +706,8 @@ - (void)testIdentifyIdentityRequestCompleteWithKitsAndNoUserChange {
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
-    id mockContainer = OCMClassMock([MPKitContainer class]);
-    [[[mockInstance stub] andReturn:mockContainer] kitContainer];
+    id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
+    [[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
     [[[mockInstance stub] andReturn:mockInstance] sharedInstance];
 
     id mockUser = OCMClassMock([MParticleUser class]);
@@ -738,8 +738,8 @@ - (void)testLoginIdentityRequestCompleteWithKitsAndNoUserChange {
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
-    id mockContainer = OCMClassMock([MPKitContainer class]);
-    [[[mockInstance stub] andReturn:mockContainer] kitContainer];
+    id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
+    [[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
     [[[mockInstance stub] andReturn:mockInstance] sharedInstance];
 
     id mockUser = OCMClassMock([MParticleUser class]);
@@ -770,8 +770,8 @@ - (void)testLogoutIdentityRequestCompleteWithKitsAndNoUserChange {
     [[[mockPersistenceController stub] andReturn:@"42"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
-    id mockContainer = OCMClassMock([MPKitContainer class]);
-    [[[mockInstance stub] andReturn:mockContainer] kitContainer];
+    id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
+    [[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
     [[[mockInstance stub] andReturn:mockInstance] sharedInstance];
 
     id mockUser = OCMClassMock([MParticleUser class]);
@@ -798,8 +798,8 @@ - (void)testMPIdZeroToMPId {
     [[[mockPersistenceController stub] andReturn:@"0"] mpId];
 
     id mockInstance = OCMClassMock([MParticle class]);
-    id mockContainer = OCMClassMock([MPKitContainer class]);
-    [[[mockInstance stub] andReturn:mockContainer] kitContainer];
+    id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
+    [[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
     [[[mockInstance stub] andReturn:mockPersistenceController] persistenceController];
     [[[mockInstance stub] andReturn:mockInstance] sharedInstance];
 
@@ -855,8 +855,8 @@ - (void)testModifyRequestComplete {
 
 - (void)testModifyRequestCompleteWithKits {
     id mockInstance = OCMClassMock([MParticle class]);
-    id mockContainer = OCMClassMock([MPKitContainer class]);
-    [[[mockInstance stub] andReturn:mockContainer] kitContainer];
+    id mockContainer = OCMClassMock([MPKitContainer_PRIVATE class]);
+    [[[mockInstance stub] andReturn:mockContainer] kitContainer_PRIVATE];
     [[[mockInstance stub] andReturn:mockInstance] sharedInstance];
 
     id mockUser = OCMClassMock([MParticleUser class]);

UnitTests/MPKitAPITests.m

@@ -13,7 +13,7 @@
 #import "MPIUserDefaults.h"
 #import "MPIConstants.h"
 
-@interface MPKitContainer ()
+@interface MPKitContainer_PRIVATE ()
 
 - (id<MPKitProtocol>)startKit:(NSNumber *)integrationId configuration:(MPKitConfiguration *)kitConfiguration;
 
@@ -22,13 +22,13 @@ @interface MPKitContainer ()
 @interface MParticle ()
 
 + (dispatch_queue_t)messageQueue;
-@property (nonatomic, strong) MPBackendController *backendController;
+@property (nonatomic, strong) MPBackendController_PRIVATE *backendController;
 @property (nonatomic, strong) MPPersistenceController *persistenceController;
-@property (nonatomic, strong) MPKitContainer *kitContainer;
+@property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer_PRIVATE;
 
 @end
 
-@interface MPBackendController ()
+@interface MPBackendController_PRIVATE ()
 
 
 - (void)clearUserAttributes;
@@ -46,7 +46,7 @@ - (id)initWithKitCode:(NSNumber *)integrationId;
 @interface MPKitAPITests : MPBaseTestCase  <MPKitProtocol>
 
 @property (nonatomic) MPKitAPI *kitApi;
-@property (nonatomic) MPKitContainer *kitContainer;
+@property (nonatomic) MPKitContainer_PRIVATE *kitContainer;
 
 @end
 
@@ -55,15 +55,15 @@ @implementation MPKitAPITests
 - (void)setUp {
     [super setUp];
 
-    [MParticle sharedInstance].kitContainer = [[MPKitContainer alloc] init];
-    _kitContainer = [MParticle sharedInstance].kitContainer;
+    [MParticle sharedInstance].kitContainer_PRIVATE = [[MPKitContainer_PRIVATE alloc] init];
+    _kitContainer = [MParticle sharedInstance].kitContainer_PRIVATE;
 
     [MParticle sharedInstance].persistenceController = [[MPPersistenceController alloc] init];
 
-    NSSet<id<MPExtensionProtocol>> *registeredKits = [MPKitContainer registeredKits];
+    NSSet<id<MPExtensionProtocol>> *registeredKits = [MPKitContainer_PRIVATE registeredKits];
     if (!registeredKits) {
         MPKitRegister *kitRegister = [[MPKitRegister alloc] initWithName:@"KitTest" className:@"MPKitTestClassNoStartImmediately"];
-        [MPKitContainer registerKit:kitRegister];
+        [MPKitContainer_PRIVATE registerKit:kitRegister];
 
         NSDictionary *configuration = @{
                                         @"id":@42,
@@ -83,7 +83,7 @@ - (void)testIntegrationAttributes {
     XCTestExpectation *expectation = [self expectationWithDescription:@"Integration attributes"];
     MParticle *mParticle = [MParticle sharedInstance];
 
-    mParticle.backendController = [[MPBackendController alloc] initWithDelegate:(id<MPBackendControllerDelegate>)mParticle];
+    mParticle.backendController = [[MPBackendController_PRIVATE alloc] initWithDelegate:(id<MPBackendControllerDelegate>)mParticle];
 
     [[MParticle sharedInstance] setIntegrationAttributes:@{@"Test key":@"Test value"} forKit:@42];
     dispatch_sync([MParticle messageQueue], ^{
@@ -154,7 +154,7 @@ - (void)testUserIdentities {
 - (void)testUserAttributeFromCache {
     XCTestExpectation *expectation = [self expectationWithDescription:@"Integration attributes"];
     MParticle *mParticle = [MParticle sharedInstance];
-    mParticle.backendController = [[MPBackendController alloc] initWithDelegate:(id<MPBackendControllerDelegate>)mParticle];
+    mParticle.backendController = [[MPBackendController_PRIVATE alloc] initWithDelegate:(id<MPBackendControllerDelegate>)mParticle];
     MParticleUser *currentUser = [[MParticle sharedInstance].identity currentUser];
 
     NSDictionary *userAttributes = @{
@@ -199,7 +199,7 @@ - (void)testUserAttributeFromCache {
 - (void)testUserAttributeManuallySet {
     XCTestExpectation *expectation = [self expectationWithDescription:@"Integration attributes"];
     MParticle *mParticle = [MParticle sharedInstance];
-    mParticle.backendController = [[MPBackendController alloc] initWithDelegate:(id<MPBackendControllerDelegate>)mParticle];
+    mParticle.backendController = [[MPBackendController_PRIVATE alloc] initWithDelegate:(id<MPBackendControllerDelegate>)mParticle];
     MParticleUser *currentUser = [[MParticle sharedInstance].identity currentUser];
 
     NSDictionary *userAttributes = @{