Skip to content

Commit 24ccb76

Browse files
nickolas-dimitrakasnickolas-dimitrakas
committed
delete MPListenerController files
1 parent 8182d09 commit 24ccb76

File tree

5 files changed

+2
-527
lines changed

5 files changed

+2
-527
lines changed

‎IntegrationTests/Sources/main.swift‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ import Foundation
22
import mParticle_Apple_SDK
33

44
// Listener for tracking upload events
5-
// FIXME: Removal of MPListenerProtocol breaks the EventUploadWaiter
6-
// Find workaround to keep this working
7-
class EventUploadWaiter: NSObject {
5+
class EventUploadWaiter: NSObject, MPListenerProtocol {
86
private var uploadCompletedSemaphore: DispatchSemaphore?
97
var mparticle = MParticle.sharedInstance()
108

@@ -448,6 +446,7 @@ options.networkOptions = networkOptions
448446

449447
// Register listener for tracking upload events
450448
let uploadWaiter = EventUploadWaiter()
449+
MPListenerController.sharedInstance().addSdkListener(uploadWaiter)
451450

452451
let mparticle = MParticle.sharedInstance()
453452
mparticle.start(with: options)

‎UnitTests/Mocks/MPListenerControllerMock.swift‎

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

‎mParticle-Apple-SDK.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
356D4A5A2E58B09D00CB69FE /* SettingsProviderMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 356D4A582E58B09D00CB69FE /* SettingsProviderMock.swift */; };
3838
356D4A5C2E58B25900CB69FE /* MPDataPlanFilterMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 356D4A5B2E58B25500CB69FE /* MPDataPlanFilterMock.swift */; };
3939
356D4A5D2E58B25900CB69FE /* MPDataPlanFilterMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 356D4A5B2E58B25500CB69FE /* MPDataPlanFilterMock.swift */; };
40-
356D4A5F2E5CAB0000CB69FE /* MPListenerControllerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 356D4A5E2E5CAB0000CB69FE /* MPListenerControllerMock.swift */; };
41-
356D4A602E5CAB0000CB69FE /* MPListenerControllerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 356D4A5E2E5CAB0000CB69FE /* MPListenerControllerMock.swift */; };
4240
359BAFF92E56330200A8A704 /* SettingsProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 359BAFF82E56330200A8A704 /* SettingsProvider.h */; };
4341
359BAFFA2E56330200A8A704 /* SettingsProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 359BAFF82E56330200A8A704 /* SettingsProvider.h */; };
4442
359BAFFC2E56335300A8A704 /* SettingsProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 359BAFFB2E56335300A8A704 /* SettingsProvider.m */; };
@@ -260,7 +258,6 @@
260258
53A79C1D29CDFB2100E7489F /* MPKitConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79B5F29CDFB1F00E7489F /* MPKitConfiguration.h */; };
261259
53A79C1E29CDFB2100E7489F /* MPKitFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79B6029CDFB1F00E7489F /* MPKitFilter.h */; };
262260
53A79C1F29CDFB2100E7489F /* MPBaseProjection.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79B6129CDFB1F00E7489F /* MPBaseProjection.h */; };
263-
53A79C2029CDFB2100E7489F /* MPListenerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79B6329CDFB1F00E7489F /* MPListenerController.m */; };
264261
53A79C2129CDFB2100E7489F /* MPIConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79B6429CDFB1F00E7489F /* MPIConstants.m */; };
265262
53A79C4529CDFB4800E7489F /* MPEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C2329CDFB4800E7489F /* MPEvent.h */; settings = {ATTRIBUTES = (Public, ); }; };
266263
53A79C4629CDFB4800E7489F /* MPBaseEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C2429CDFB4800E7489F /* MPBaseEvent.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -274,7 +271,6 @@
274271
53A79C4F29CDFB4800E7489F /* MPKitAPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C2D29CDFB4800E7489F /* MPKitAPI.h */; settings = {ATTRIBUTES = (Public, ); }; };
275272
53A79C5029CDFB4800E7489F /* MPTransactionAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C2E29CDFB4800E7489F /* MPTransactionAttributes.h */; settings = {ATTRIBUTES = (Public, ); }; };
276273
53A79C5129CDFB4800E7489F /* MPCommerceEventInstruction.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C2F29CDFB4800E7489F /* MPCommerceEventInstruction.h */; settings = {ATTRIBUTES = (Public, ); }; };
277-
53A79C5229CDFB4800E7489F /* MPListenerController.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C3029CDFB4800E7489F /* MPListenerController.h */; settings = {ATTRIBUTES = (Public, ); }; };
278274
53A79C5329CDFB4800E7489F /* MPIdentityApi.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C3129CDFB4800E7489F /* MPIdentityApi.h */; settings = {ATTRIBUTES = (Public, ); }; };
279275
53A79C5529CDFB4800E7489F /* NSDictionary+MPCaseInsensitive.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C3329CDFB4800E7489F /* NSDictionary+MPCaseInsensitive.h */; settings = {ATTRIBUTES = (Public, ); }; };
280276
53A79C5629CDFB4800E7489F /* MParticleUser.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C3429CDFB4800E7489F /* MParticleUser.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -355,7 +351,6 @@
355351
53A79D0229CE23F700E7489F /* mParticle.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C2729CDFB4800E7489F /* mParticle.h */; settings = {ATTRIBUTES = (Public, ); }; };
356352
53A79D0329CE23F700E7489F /* FilteredMPIdentityApiRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C3C29CDFB4800E7489F /* FilteredMPIdentityApiRequest.h */; settings = {ATTRIBUTES = (Public, ); }; };
357353
53A79D0429CE23F700E7489F /* MPBaseEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C2429CDFB4800E7489F /* MPBaseEvent.h */; settings = {ATTRIBUTES = (Public, ); }; };
358-
53A79D0529CE23F700E7489F /* MPListenerController.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C3029CDFB4800E7489F /* MPListenerController.h */; settings = {ATTRIBUTES = (Public, ); }; };
359354
53A79D0629CE23F700E7489F /* MPProduct+Dictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C4229CDFB4800E7489F /* MPProduct+Dictionary.h */; settings = {ATTRIBUTES = (Public, ); }; };
360355
53A79D0729CE23F700E7489F /* MPKitRegister.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C4129CDFB4800E7489F /* MPKitRegister.h */; settings = {ATTRIBUTES = (Public, ); }; };
361356
53A79D0829CE23F700E7489F /* MPTransactionAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C2E29CDFB4800E7489F /* MPTransactionAttributes.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -493,7 +488,6 @@
493488
53A79DB529CE23F700E7489F /* MPBackendController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79AF429CDFB1F00E7489F /* MPBackendController.m */; };
494489
53A79DB629CE23F700E7489F /* MPForwardQueueItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79B5D29CDFB1F00E7489F /* MPForwardQueueItem.m */; };
495490
53A79DB729CE23F700E7489F /* MPEventProjection.mm in Sources */ = {isa = PBXBuildFile; fileRef = 53A79B5829CDFB1F00E7489F /* MPEventProjection.mm */; };
496-
53A79DB829CE23F700E7489F /* MPListenerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79B6329CDFB1F00E7489F /* MPListenerController.m */; };
497491
53A79DB929CE23F700E7489F /* MPKitContainer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 53A79B5029CDFB1F00E7489F /* MPKitContainer.mm */; };
498492
53A79DBA29CE23F700E7489F /* MPUploadBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79B1229CDFB1F00E7489F /* MPUploadBuilder.m */; };
499493
53A79DBC29CE23F700E7489F /* MPBaseProjection.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79B5329CDFB1F00E7489F /* MPBaseProjection.m */; };
@@ -644,7 +638,6 @@
644638
356752922E60928500DEEE23 /* MPStateMachineMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPStateMachineMock.swift; sourceTree = "<group>"; };
645639
356D4A582E58B09D00CB69FE /* SettingsProviderMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsProviderMock.swift; sourceTree = "<group>"; };
646640
356D4A5B2E58B25500CB69FE /* MPDataPlanFilterMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPDataPlanFilterMock.swift; sourceTree = "<group>"; };
647-
356D4A5E2E5CAB0000CB69FE /* MPListenerControllerMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPListenerControllerMock.swift; sourceTree = "<group>"; };
648641
359BAFEA2E55EE0C00A8A704 /* MParticle+PrivateMethods.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MParticle+PrivateMethods.h"; sourceTree = "<group>"; };
649642
359BAFF82E56330200A8A704 /* SettingsProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SettingsProvider.h; sourceTree = "<group>"; };
650643
359BAFFB2E56335300A8A704 /* SettingsProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SettingsProvider.m; sourceTree = "<group>"; };
@@ -785,7 +778,6 @@
785778
53A79B5F29CDFB1F00E7489F /* MPKitConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPKitConfiguration.h; sourceTree = "<group>"; };
786779
53A79B6029CDFB1F00E7489F /* MPKitFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPKitFilter.h; sourceTree = "<group>"; };
787780
53A79B6129CDFB1F00E7489F /* MPBaseProjection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPBaseProjection.h; sourceTree = "<group>"; };
788-
53A79B6329CDFB1F00E7489F /* MPListenerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPListenerController.m; sourceTree = "<group>"; };
789781
53A79B6429CDFB1F00E7489F /* MPIConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPIConstants.m; sourceTree = "<group>"; };
790782
53A79C2329CDFB4800E7489F /* MPEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPEvent.h; sourceTree = "<group>"; };
791783
53A79C2429CDFB4800E7489F /* MPBaseEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPBaseEvent.h; sourceTree = "<group>"; };
@@ -799,7 +791,6 @@
799791
53A79C2D29CDFB4800E7489F /* MPKitAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPKitAPI.h; sourceTree = "<group>"; };
800792
53A79C2E29CDFB4800E7489F /* MPTransactionAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPTransactionAttributes.h; sourceTree = "<group>"; };
801793
53A79C2F29CDFB4800E7489F /* MPCommerceEventInstruction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPCommerceEventInstruction.h; sourceTree = "<group>"; };
802-
53A79C3029CDFB4800E7489F /* MPListenerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPListenerController.h; sourceTree = "<group>"; };
803794
53A79C3129CDFB4800E7489F /* MPIdentityApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPIdentityApi.h; sourceTree = "<group>"; };
804795
53A79C3329CDFB4800E7489F /* NSDictionary+MPCaseInsensitive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+MPCaseInsensitive.h"; sourceTree = "<group>"; };
805796
53A79C3429CDFB4800E7489F /* MParticleUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MParticleUser.h; sourceTree = "<group>"; };
@@ -994,7 +985,6 @@
994985
356752922E60928500DEEE23 /* MPStateMachineMock.swift */,
995986
3567528E2E5F7FF100DEEE23 /* MPBackendControllerMock.swift */,
996987
356D4A5B2E58B25500CB69FE /* MPDataPlanFilterMock.swift */,
997-
356D4A5E2E5CAB0000CB69FE /* MPListenerControllerMock.swift */,
998988
359BB0052E57A56300A8A704 /* MPUserDefaultsMock.swift */,
999989
356D4A582E58B09D00CB69FE /* SettingsProviderMock.swift */,
1000990
727801DD2EB0FE8400BDAD98 /* MPNotificationControllerMock.swift */,
@@ -1067,7 +1057,6 @@
10671057
53A79A9729CDFB1E00E7489F /* Identity */,
10681058
53A79B4A29CDFB1F00E7489F /* Kits */,
10691059
53A79AFD29CDFB1F00E7489F /* Libraries */,
1070-
53A79B6229CDFB1F00E7489F /* Listener */,
10711060
53A79AA429CDFB1E00E7489F /* Location */,
10721061
53A79B4529CDFB1F00E7489F /* Logger */,
10731062
53A79AA729CDFB1E00E7489F /* Network */,
@@ -1318,14 +1307,6 @@
13181307
path = Kits;
13191308
sourceTree = "<group>";
13201309
};
1321-
53A79B6229CDFB1F00E7489F /* Listener */ = {
1322-
isa = PBXGroup;
1323-
children = (
1324-
53A79B6329CDFB1F00E7489F /* MPListenerController.m */,
1325-
);
1326-
path = Listener;
1327-
sourceTree = "<group>";
1328-
};
13291310
53A79C2229CDFB4800E7489F /* Include */ = {
13301311
isa = PBXGroup;
13311312
children = (
@@ -1343,7 +1324,6 @@
13431324
53A79C2D29CDFB4800E7489F /* MPKitAPI.h */,
13441325
53A79C2E29CDFB4800E7489F /* MPTransactionAttributes.h */,
13451326
53A79C2F29CDFB4800E7489F /* MPCommerceEventInstruction.h */,
1346-
53A79C3029CDFB4800E7489F /* MPListenerController.h */,
13471327
53A79C3129CDFB4800E7489F /* MPIdentityApi.h */,
13481328
53A79C3329CDFB4800E7489F /* NSDictionary+MPCaseInsensitive.h */,
13491329
53A79C3429CDFB4800E7489F /* MParticleUser.h */,
@@ -1541,7 +1521,6 @@
15411521
53A79C4929CDFB4800E7489F /* mParticle.h in Headers */,
15421522
53A79C5E29CDFB4800E7489F /* FilteredMPIdentityApiRequest.h in Headers */,
15431523
53A79C4629CDFB4800E7489F /* MPBaseEvent.h in Headers */,
1544-
53A79C5229CDFB4800E7489F /* MPListenerController.h in Headers */,
15451524
53A79C6429CDFB4800E7489F /* MPProduct+Dictionary.h in Headers */,
15461525
53A79C6329CDFB4800E7489F /* MPKitRegister.h in Headers */,
15471526
53A79C5029CDFB4800E7489F /* MPTransactionAttributes.h in Headers */,
@@ -1638,7 +1617,6 @@
16381617
53A79D0229CE23F700E7489F /* mParticle.h in Headers */,
16391618
53A79D0329CE23F700E7489F /* FilteredMPIdentityApiRequest.h in Headers */,
16401619
53A79D0429CE23F700E7489F /* MPBaseEvent.h in Headers */,
1641-
53A79D0529CE23F700E7489F /* MPListenerController.h in Headers */,
16421620
53A79D0629CE23F700E7489F /* MPProduct+Dictionary.h in Headers */,
16431621
53A79D0729CE23F700E7489F /* MPKitRegister.h in Headers */,
16441622
53A79D0829CE23F700E7489F /* MPTransactionAttributes.h in Headers */,
@@ -1974,7 +1952,6 @@
19741952
534CD28C29CE2CE1008452B3 /* MPUserDefaultsTests.m in Sources */,
19751953
7231B82F2EB95D96001565E5 /* MParticleEventTests.swift in Sources */,
19761954
534CD28D29CE2CE1008452B3 /* MPUploadBuilderTests.m in Sources */,
1977-
356D4A5F2E5CAB0000CB69FE /* MPListenerControllerMock.swift in Sources */,
19781955
534CD28E29CE2CE1008452B3 /* MPBaseTestCase.m in Sources */,
19791956
35329FEC2E54C483009AC4FD /* MPNetworkOptions+MParticlePrivateTests.swift in Sources */,
19801957
7231B8352EB95F9F001565E5 /* MParticleBreadcrumbTests.swift in Sources */,
@@ -2110,7 +2087,6 @@
21102087
53A79C1B29CDFB2100E7489F /* MPForwardQueueItem.m in Sources */,
21112088
53A79C1629CDFB2100E7489F /* MPEventProjection.mm in Sources */,
21122089
D3CEDAC32C9DAC25001B32DF /* MPDateFormatter.swift in Sources */,
2113-
53A79C2029CDFB2100E7489F /* MPListenerController.m in Sources */,
21142090
53A79C0E29CDFB2100E7489F /* MPKitContainer.mm in Sources */,
21152091
D33C8B352B8510C20012EDFD /* MPAudience.m in Sources */,
21162092
53A79BD729CDFB2000E7489F /* MPUploadBuilder.m in Sources */,
@@ -2193,7 +2169,6 @@
21932169
53A79CD629CE019F00E7489F /* MPCCPAConsentTests.m in Sources */,
21942170
53A79CE129CE019F00E7489F /* MPUserDefaultsTests.m in Sources */,
21952171
7231B8302EB95D96001565E5 /* MParticleEventTests.swift in Sources */,
2196-
356D4A602E5CAB0000CB69FE /* MPListenerControllerMock.swift in Sources */,
21972172
53A79CCD29CE019F00E7489F /* MPUploadBuilderTests.m in Sources */,
21982173
35329FED2E54C483009AC4FD /* MPNetworkOptions+MParticlePrivateTests.swift in Sources */,
21992174
53A79CE829CE019F00E7489F /* MPBaseTestCase.m in Sources */,
@@ -2330,7 +2305,6 @@
23302305
53A79DB529CE23F700E7489F /* MPBackendController.m in Sources */,
23312306
53A79DB629CE23F700E7489F /* MPForwardQueueItem.m in Sources */,
23322307
53A79DB729CE23F700E7489F /* MPEventProjection.mm in Sources */,
2333-
53A79DB829CE23F700E7489F /* MPListenerController.m in Sources */,
23342308
53A79DB929CE23F700E7489F /* MPKitContainer.mm in Sources */,
23352309
D33C8B362B8510C20012EDFD /* MPAudience.m in Sources */,
23362310
53A79DBA29CE23F700E7489F /* MPUploadBuilder.m in Sources */,

0 commit comments

Comments
 (0)