Skip to content

Commit 016c67d

Browse files
committed
- remove code related to swift migration
1 parent 2a087f4 commit 016c67d

File tree

7 files changed

+4
-38
lines changed

7 files changed

+4
-38
lines changed

UnitTests/MParticleTestsSwift.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ class MParticleTestsSwift: XCTestCase {
637637
func testSessionDidBegin() {
638638
let kitContainer = MPKitContainerMock()
639639
kitContainer.forwardSDKCallExpectation = XCTestExpectation()
640-
mparticle.kitContainer = kitContainer
640+
mparticle.setKitContainer(kitContainer)
641641
mparticle.sessionDidBegin(MPSession())
642642

643643

@@ -654,7 +654,7 @@ class MParticleTestsSwift: XCTestCase {
654654
func testSessionDidEnd() {
655655
let kitContainer = MPKitContainerMock()
656656
kitContainer.forwardSDKCallExpectation = XCTestExpectation()
657-
mparticle.kitContainer = kitContainer
657+
mparticle.setKitContainer(kitContainer)
658658
mparticle.sessionDidEnd(MPSession())
659659

660660

@@ -677,7 +677,7 @@ class MParticleTestsSwift: XCTestCase {
677677

678678
let backendController = MPBackendControllerMock()
679679

680-
mparticle.kitContainer = kitContainer
680+
mparticle.setKitContainer(kitContainer)
681681
mparticle.persistenceController = persistenceController
682682
mparticle.backendController = backendController
683683

UnitTests/mParticle_iOS_SDKTests-Bridging-Header.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//
22
// Use this file to import your target's public headers that you would like to expose to Swift.
33
//
4+
#import "Executor.h"
45
#import "MPAttributionResult+MParticlePrivate.h"
56
#import "MParticleSession+MParticlePrivate.h"
67
#import "MParticleOptions+MParticlePrivate.h"

mParticle-Apple-SDK.xcodeproj/project.pbxproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
35329FF32E54CA78009AC4FD /* MParticleOptions+MParticlePrivate.m in Sources */ = {isa = PBXBuildFile; fileRef = 35329FF12E54CA78009AC4FD /* MParticleOptions+MParticlePrivate.m */; };
2828
35329FF52E54CB8C009AC4FD /* MParticleOptions+MParticlePrivateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35329FF42E54CB84009AC4FD /* MParticleOptions+MParticlePrivateTests.swift */; };
2929
35329FF62E54CB8C009AC4FD /* MParticleOptions+MParticlePrivateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35329FF42E54CB84009AC4FD /* MParticleOptions+MParticlePrivateTests.swift */; };
30-
354B67302E6F64CB00F1880D /* mParticle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 354B672F2E6F64BD00F1880D /* mParticle.swift */; };
31-
354B67312E6F64CB00F1880D /* mParticle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 354B672F2E6F64BD00F1880D /* mParticle.swift */; };
3230
3567528F2E5F7FF900DEEE23 /* MPBackendControllerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3567528E2E5F7FF100DEEE23 /* MPBackendControllerMock.swift */; };
3331
356752902E5F7FF900DEEE23 /* MPBackendControllerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3567528E2E5F7FF100DEEE23 /* MPBackendControllerMock.swift */; };
3432
356752932E60928B00DEEE23 /* MPStateMachineMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 356752922E60928500DEEE23 /* MPStateMachineMock.swift */; };
@@ -587,7 +585,6 @@
587585
35329FEE2E54CA49009AC4FD /* MParticleOptions+MParticlePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MParticleOptions+MParticlePrivate.h"; sourceTree = "<group>"; };
588586
35329FF12E54CA78009AC4FD /* MParticleOptions+MParticlePrivate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "MParticleOptions+MParticlePrivate.m"; sourceTree = "<group>"; };
589587
35329FF42E54CB84009AC4FD /* MParticleOptions+MParticlePrivateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MParticleOptions+MParticlePrivateTests.swift"; sourceTree = "<group>"; };
590-
354B672F2E6F64BD00F1880D /* mParticle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = mParticle.swift; sourceTree = "<group>"; };
591588
3567528E2E5F7FF100DEEE23 /* MPBackendControllerMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPBackendControllerMock.swift; sourceTree = "<group>"; };
592589
356752922E60928500DEEE23 /* MPStateMachineMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPStateMachineMock.swift; sourceTree = "<group>"; };
593590
356D4A582E58B09D00CB69FE /* SettingsProviderMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsProviderMock.swift; sourceTree = "<group>"; };
@@ -950,7 +947,6 @@
950947
53A79A7B29CCCD6400E7489F /* mParticle-Apple-SDK */ = {
951948
isa = PBXGroup;
952949
children = (
953-
354B672F2E6F64BD00F1880D /* mParticle.swift */,
954950
3513083F2E6B28F5002A3AD6 /* Executor.h */,
955951
351308402E6B28F5002A3AD6 /* Executor.m */,
956952
53A79C2229CDFB4800E7489F /* Include */,
@@ -1876,7 +1872,6 @@
18761872
351308422E6B28F5002A3AD6 /* Executor.m in Sources */,
18771873
53A79BEB29CDFB2000E7489F /* NSNumber+MPFormatter.swift in Sources */,
18781874
53A79B6D29CDFB2000E7489F /* FilteredMParticleUser.m in Sources */,
1879-
354B67302E6F64CB00F1880D /* mParticle.swift in Sources */,
18801875
53A79C0729CDFB2100E7489F /* MPBaseEvent.m in Sources */,
18811876
D3961CD62CB468DC003B3194 /* NSArray+MPCaseInsensitive.swift in Sources */,
18821877
53A79C1829CDFB2100E7489F /* MPAttributeProjection.m in Sources */,
@@ -2071,7 +2066,6 @@
20712066
351308442E6B28F5002A3AD6 /* Executor.m in Sources */,
20722067
53A79D7329CE23F700E7489F /* FilteredMParticleUser.m in Sources */,
20732068
53A79D7429CE23F700E7489F /* MPBaseEvent.m in Sources */,
2074-
354B67312E6F64CB00F1880D /* mParticle.swift in Sources */,
20752069
53A79D7529CE23F700E7489F /* MPAttributeProjection.m in Sources */,
20762070
D3961CD72CB468DC003B3194 /* NSArray+MPCaseInsensitive.swift in Sources */,
20772071
53A79D7629CE23F700E7489F /* MPConsumerInfo.m in Sources */,

mParticle-Apple-SDK/Include/mParticle_Apple_SDK.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,4 @@
1414
#import "mParticle.h"
1515
#endif
1616

17-
#import "Executor.h"
18-
#import "MPKitContainer.h"
19-
#import "MPSession.h"
20-
#import "MPBaseEvent.h"
21-
#import "MPForwardQueueParameters.h"
22-
2317
#endif /* mParticle_Apple_SDK_h */

mParticle-Apple-SDK/Include/mParticle_Apple_SDK_NoLocation.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,4 @@
1414
#import "mParticle.h"
1515
#endif
1616

17-
#import "Executor.h"
18-
#import "MPKitContainer.h"
19-
#import "MPSession.h"
20-
#import "MPBaseEvent.h"
21-
#import "MPForwardQueueParameters.h"
22-
2317
#endif /* mParticle_Apple_SDK_NoLocation_h */

mParticle-Apple-SDK/mParticle.m

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ @implementation MParticle
9696
@synthesize settingsProvider = _settingsProvider;
9797
@synthesize listenerController = _listenerController;
9898
static id<ExecutorProtocol> executor;
99-
MParticleSwift* innerMparticle;
10099

101100
+ (void)initialize {
102101
if (self == [MParticle class]) {
@@ -148,7 +147,6 @@ - (instancetype)init {
148147
_stateMachine = [[MPStateMachine_PRIVATE alloc] init];
149148
_webView = [[MParticleWebView_PRIVATE alloc] initWithMessageQueue:executor.messageQueue];
150149
_listenerController = MPListenerController.sharedInstance;
151-
innerMparticle = [[MParticleSwift alloc] initWithExecutor:executor kitContainer:_kitContainer];
152150

153151
return self;
154152
}
@@ -434,7 +432,6 @@ - (void)startWithOptions:(MParticleOptions *)options {
434432
[self.webView startWithCustomUserAgent:options.customUserAgent shouldCollect:options.collectUserAgent defaultUserAgentOverride:options.defaultAgent];
435433

436434
_backendController = [[MPBackendController_PRIVATE alloc] initWithDelegate:self];
437-
innerMparticle.backendController = _backendController;
438435

439436
if (options.networkOptions) {
440437
self.networkOptions = options.networkOptions;

mParticle-Apple-SDK/mParticle.swift

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)