- remove code related to swift migration

Author: denischilik

UnitTests/MParticleTestsSwift.swift

@@ -637,7 +637,7 @@ class MParticleTestsSwift: XCTestCase {
     func testSessionDidBegin() {
         let kitContainer = MPKitContainerMock()
         kitContainer.forwardSDKCallExpectation = XCTestExpectation()
-        mparticle.kitContainer = kitContainer
+        mparticle.setKitContainer(kitContainer)
         mparticle.sessionDidBegin(MPSession())
 
 
@@ -654,7 +654,7 @@ class MParticleTestsSwift: XCTestCase {
     func testSessionDidEnd() {
         let kitContainer = MPKitContainerMock()
         kitContainer.forwardSDKCallExpectation = XCTestExpectation()
-        mparticle.kitContainer = kitContainer
+        mparticle.setKitContainer(kitContainer)
         mparticle.sessionDidEnd(MPSession())
 
 
@@ -677,7 +677,7 @@ class MParticleTestsSwift: XCTestCase {
 
         let backendController = MPBackendControllerMock()
 
-        mparticle.kitContainer = kitContainer
+        mparticle.setKitContainer(kitContainer)
         mparticle.persistenceController = persistenceController
         mparticle.backendController = backendController
 

UnitTests/mParticle_iOS_SDKTests-Bridging-Header.h

@@ -1,6 +1,7 @@
 //
 //  Use this file to import your target's public headers that you would like to expose to Swift.
 //
+#import "Executor.h"
 #import "MPAttributionResult+MParticlePrivate.h"
 #import "MParticleSession+MParticlePrivate.h"
 #import "MParticleOptions+MParticlePrivate.h"

mParticle-Apple-SDK.xcodeproj/project.pbxproj

@@ -11,9 +11,9 @@
 		351308202E6729DA002A3AD6 /* MPKitContainerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3513081E2E6729D0002A3AD6 /* MPKitContainerMock.swift */; };
 		351308242E676F18002A3AD6 /* MPPersistenceControllerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 351308232E676F12002A3AD6 /* MPPersistenceControllerMock.swift */; };
 		351308252E676F18002A3AD6 /* MPPersistenceControllerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 351308232E676F12002A3AD6 /* MPPersistenceControllerMock.swift */; };
-		351308412E6B28F5002A3AD6 /* Executor.h in Headers */ = {isa = PBXBuildFile; fileRef = 3513083F2E6B28F5002A3AD6 /* Executor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		351308412E6B28F5002A3AD6 /* Executor.h in Headers */ = {isa = PBXBuildFile; fileRef = 3513083F2E6B28F5002A3AD6 /* Executor.h */; };
 		351308422E6B28F5002A3AD6 /* Executor.m in Sources */ = {isa = PBXBuildFile; fileRef = 351308402E6B28F5002A3AD6 /* Executor.m */; };
-		351308432E6B28F5002A3AD6 /* Executor.h in Headers */ = {isa = PBXBuildFile; fileRef = 3513083F2E6B28F5002A3AD6 /* Executor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		351308432E6B28F5002A3AD6 /* Executor.h in Headers */ = {isa = PBXBuildFile; fileRef = 3513083F2E6B28F5002A3AD6 /* Executor.h */; };
 		351308442E6B28F5002A3AD6 /* Executor.m in Sources */ = {isa = PBXBuildFile; fileRef = 351308402E6B28F5002A3AD6 /* Executor.m */; };
 		3517794F2E706BF8004BF05E /* ExecutorMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3517794C2E706BE4004BF05E /* ExecutorMock.swift */; };
 		351779502E706BF8004BF05E /* ExecutorMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3517794C2E706BE4004BF05E /* ExecutorMock.swift */; };
@@ -27,8 +27,6 @@
 		35329FF32E54CA78009AC4FD /* MParticleOptions+MParticlePrivate.m in Sources */ = {isa = PBXBuildFile; fileRef = 35329FF12E54CA78009AC4FD /* MParticleOptions+MParticlePrivate.m */; };
 		35329FF52E54CB8C009AC4FD /* MParticleOptions+MParticlePrivateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35329FF42E54CB84009AC4FD /* MParticleOptions+MParticlePrivateTests.swift */; };
 		35329FF62E54CB8C009AC4FD /* MParticleOptions+MParticlePrivateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35329FF42E54CB84009AC4FD /* MParticleOptions+MParticlePrivateTests.swift */; };
-		354B67302E6F64CB00F1880D /* mParticle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 354B672F2E6F64BD00F1880D /* mParticle.swift */; };
-		354B67312E6F64CB00F1880D /* mParticle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 354B672F2E6F64BD00F1880D /* mParticle.swift */; };
 		3567528F2E5F7FF900DEEE23 /* MPBackendControllerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3567528E2E5F7FF100DEEE23 /* MPBackendControllerMock.swift */; };
 		356752902E5F7FF900DEEE23 /* MPBackendControllerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3567528E2E5F7FF100DEEE23 /* MPBackendControllerMock.swift */; };
 		356752932E60928B00DEEE23 /* MPStateMachineMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 356752922E60928500DEEE23 /* MPStateMachineMock.swift */; };
@@ -587,7 +585,6 @@
 		35329FEE2E54CA49009AC4FD /* MParticleOptions+MParticlePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MParticleOptions+MParticlePrivate.h"; sourceTree = "<group>"; };
 		35329FF12E54CA78009AC4FD /* MParticleOptions+MParticlePrivate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "MParticleOptions+MParticlePrivate.m"; sourceTree = "<group>"; };
 		35329FF42E54CB84009AC4FD /* MParticleOptions+MParticlePrivateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MParticleOptions+MParticlePrivateTests.swift"; sourceTree = "<group>"; };
-		354B672F2E6F64BD00F1880D /* mParticle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = mParticle.swift; sourceTree = "<group>"; };
 		3567528E2E5F7FF100DEEE23 /* MPBackendControllerMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPBackendControllerMock.swift; sourceTree = "<group>"; };
 		356752922E60928500DEEE23 /* MPStateMachineMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPStateMachineMock.swift; sourceTree = "<group>"; };
 		356D4A582E58B09D00CB69FE /* SettingsProviderMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsProviderMock.swift; sourceTree = "<group>"; };
@@ -950,7 +947,6 @@
 		53A79A7B29CCCD6400E7489F /* mParticle-Apple-SDK */ = {
 			isa = PBXGroup;
 			children = (
-				354B672F2E6F64BD00F1880D /* mParticle.swift */,
 				3513083F2E6B28F5002A3AD6 /* Executor.h */,
 				351308402E6B28F5002A3AD6 /* Executor.m */,
 				53A79C2229CDFB4800E7489F /* Include */,
@@ -1410,7 +1406,6 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				351308412E6B28F5002A3AD6 /* Executor.h in Headers */,
 				53A79C4929CDFB4800E7489F /* mParticle.h in Headers */,
 				53A79C5E29CDFB4800E7489F /* FilteredMPIdentityApiRequest.h in Headers */,
 				53A79C4629CDFB4800E7489F /* MPBaseEvent.h in Headers */,
@@ -1451,6 +1446,7 @@
 				53A79B9929CDFB2000E7489F /* MPIConstants.h in Headers */,
 				53A79B7129CDFB2000E7489F /* MPBackendController.h in Headers */,
 				35E3FCCC2E54975C00DB5B18 /* MParticleSession+MParticlePrivate.h in Headers */,
+				351308412E6B28F5002A3AD6 /* Executor.h in Headers */,
 				53A79B7929CDFB2000E7489F /* MPConnectorResponseProtocol.h in Headers */,
 				7E0387832DB913D2003B7D5E /* MPRokt.h in Headers */,
 				53A79B7C29CDFB2000E7489F /* MPConnectorFactoryProtocol.h in Headers */,
@@ -1506,7 +1502,6 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				351308432E6B28F5002A3AD6 /* Executor.h in Headers */,
 				53A79D0229CE23F700E7489F /* mParticle.h in Headers */,
 				53A79D0329CE23F700E7489F /* FilteredMPIdentityApiRequest.h in Headers */,
 				53A79D0429CE23F700E7489F /* MPBaseEvent.h in Headers */,
@@ -1546,6 +1541,7 @@
 				359BAFF92E56330200A8A704 /* SettingsProvider.h in Headers */,
 				53A79D2E29CE23F700E7489F /* MPBackendController.h in Headers */,
 				7E0387812DB913D2003B7D5E /* MPRokt.h in Headers */,
+				351308432E6B28F5002A3AD6 /* Executor.h in Headers */,
 				35E3FCCD2E54975C00DB5B18 /* MParticleSession+MParticlePrivate.h in Headers */,
 				53A79D3029CE23F700E7489F /* MPConnectorResponseProtocol.h in Headers */,
 				53A79D3229CE23F700E7489F /* MPConnectorFactoryProtocol.h in Headers */,
@@ -1876,7 +1872,6 @@
 				351308422E6B28F5002A3AD6 /* Executor.m in Sources */,
 				53A79BEB29CDFB2000E7489F /* NSNumber+MPFormatter.swift in Sources */,
 				53A79B6D29CDFB2000E7489F /* FilteredMParticleUser.m in Sources */,
-				354B67302E6F64CB00F1880D /* mParticle.swift in Sources */,
 				53A79C0729CDFB2100E7489F /* MPBaseEvent.m in Sources */,
 				D3961CD62CB468DC003B3194 /* NSArray+MPCaseInsensitive.swift in Sources */,
 				53A79C1829CDFB2100E7489F /* MPAttributeProjection.m in Sources */,
@@ -2071,7 +2066,6 @@
 				351308442E6B28F5002A3AD6 /* Executor.m in Sources */,
 				53A79D7329CE23F700E7489F /* FilteredMParticleUser.m in Sources */,
 				53A79D7429CE23F700E7489F /* MPBaseEvent.m in Sources */,
-				354B67312E6F64CB00F1880D /* mParticle.swift in Sources */,
 				53A79D7529CE23F700E7489F /* MPAttributeProjection.m in Sources */,
 				D3961CD72CB468DC003B3194 /* NSArray+MPCaseInsensitive.swift in Sources */,
 				53A79D7629CE23F700E7489F /* MPConsumerInfo.m in Sources */,

mParticle-Apple-SDK/Include/mParticle_Apple_SDK.h

@@ -14,10 +14,4 @@
     #import "mParticle.h"
 #endif
 
-#import "Executor.h"
-#import "MPKitContainer.h"
-#import "MPSession.h"
-#import "MPBaseEvent.h"
-#import "MPForwardQueueParameters.h"
-
 #endif /* mParticle_Apple_SDK_h */

mParticle-Apple-SDK/Include/mParticle_Apple_SDK_NoLocation.h

@@ -14,10 +14,4 @@
     #import "mParticle.h"
 #endif
 
-#import "Executor.h"
-#import "MPKitContainer.h"
-#import "MPSession.h"
-#import "MPBaseEvent.h"
-#import "MPForwardQueueParameters.h"
-
 #endif /* mParticle_Apple_SDK_NoLocation_h */

mParticle-Apple-SDK/mParticle.m

@@ -96,7 +96,6 @@ @implementation MParticle
 @synthesize settingsProvider = _settingsProvider;
 @synthesize listenerController = _listenerController;
 static id<ExecutorProtocol> executor;
-MParticleSwift* innerMparticle;
 
 + (void)initialize {
     if (self == [MParticle class]) {
@@ -148,7 +147,6 @@ - (instancetype)init {
     _stateMachine = [[MPStateMachine_PRIVATE alloc] init];
     _webView = [[MParticleWebView_PRIVATE alloc] initWithMessageQueue:executor.messageQueue];
     _listenerController = MPListenerController.sharedInstance;
-    innerMparticle = [[MParticleSwift alloc] initWithExecutor:executor kitContainer:_kitContainer];
 
     return self;
 }
@@ -434,7 +432,6 @@ - (void)startWithOptions:(MParticleOptions *)options {
     [self.webView startWithCustomUserAgent:options.customUserAgent shouldCollect:options.collectUserAgent defaultUserAgentOverride:options.defaultAgent];
 
     _backendController = [[MPBackendController_PRIVATE alloc] initWithDelegate:self];
-    innerMparticle.backendController = _backendController;
 
     if (options.networkOptions) {
         self.networkOptions = options.networkOptions;