[maps-ios] use DI-ed main queue instead of the singleton (#9080)

This PR addresses
`testPartialUpdateCancellableIsDeallocatedWhenUpdateIsComplete()` by
making sure `StyleSourceManager` uses main queue instance passed as a
init dependency instead of the global singleton.

cc @mapbox/maps-ios

GitOrigin-RevId: 8a1bb87bc83086e69061c7565e88c0a291b21cc5

Author: evil159

Sources/MapboxMaps/Style/StyleSourceManager.swift

@@ -110,6 +110,11 @@ internal final class StyleSourceManager: StyleSourceManagerProtocol {
         let identifier = UUID()
         let item = DispatchWorkItem { [weak self] in
             guard let self else { return }
+            defer {
+                self.mainQueue.async { [weak self] in
+                    self?.workItemTracker.removePartialUpdateCancelable(for: sourceId, uuid: identifier)
+                }
+            }
             do {
                 try handleExpected {
                     return self.styleManager.addGeoJSONSourceFeatures(forSourceId: sourceId,
@@ -120,9 +125,6 @@ internal final class StyleSourceManager: StyleSourceManagerProtocol {
                 Log.error("Failed to add features for source with id: \(sourceId), dataId: \(dataId ?? ""), error: \(error)")
             }
         }
-        item.notify(queue: .main) { [weak self] in
-            self?.workItemTracker.removePartialUpdateCancelable(for: sourceId, uuid: identifier)
-        }
         workItemTracker.addPartialUpdateCancelable(AnyCancelable(item.cancel), for: sourceId, uuid: identifier)
         backgroundQueue.async(execute: item)
     }
@@ -167,6 +169,11 @@ internal final class StyleSourceManager: StyleSourceManagerProtocol {
         let identifier = UUID()
         let item = DispatchWorkItem { [weak self] in
             guard let self else { return }
+            defer {
+                self.mainQueue.async { [weak self] in
+                    self?.workItemTracker.removePartialUpdateCancelable(for: sourceId, uuid: identifier)
+                }
+            }
             do {
                 try handleExpected {
                     return self.styleManager.updateGeoJSONSourceFeatures(forSourceId: sourceId,
@@ -177,9 +184,6 @@ internal final class StyleSourceManager: StyleSourceManagerProtocol {
                 Log.error("Failed to update features for source with id: \(sourceId), dataId: \(dataId ?? ""), error: \(error)")
             }
         }
-        item.notify(queue: .main) { [weak self] in
-            self?.workItemTracker.removePartialUpdateCancelable(for: sourceId, uuid: identifier)
-        }
 
         workItemTracker.addPartialUpdateCancelable(AnyCancelable(item.cancel), for: sourceId, uuid: identifier)
         backgroundQueue.async(execute: item)
@@ -189,6 +193,11 @@ internal final class StyleSourceManager: StyleSourceManagerProtocol {
         let identifier = UUID()
         let item = DispatchWorkItem { [weak self] in
             guard let self else { return }
+            defer {
+                self.mainQueue.async { [weak self] in
+                    self?.workItemTracker.removePartialUpdateCancelable(for: sourceId, uuid: identifier)
+                }
+            }
             do {
                 try handleExpected {
                     return self.styleManager.removeGeoJSONSourceFeatures(forSourceId: sourceId,
@@ -199,9 +208,6 @@ internal final class StyleSourceManager: StyleSourceManagerProtocol {
                 Log.error("Failed to remove features for source with id: \(sourceId), dataId: \(dataId ?? ""), error: \(error)")
             }
         }
-        item.notify(queue: .main) { [weak self] in
-            self?.workItemTracker.removePartialUpdateCancelable(for: sourceId, uuid: identifier)
-        }
 
         workItemTracker.addPartialUpdateCancelable(AnyCancelable(item.cancel), for: sourceId, uuid: identifier)
         backgroundQueue.async(execute: item)

Tests/MapboxMapsTests/Foundation/Style/StyleSourceManagerTests.swift

@@ -565,6 +565,9 @@ final class StyleSourceManagerTests: XCTestCase {
             let dummyQueue = DispatchQueue(label: "Dummy queue", qos: .userInitiated)
             let sourceId = "sourceId"
 
+            // Make mainQueue execute cleanup blocks synchronously
+            mainQueue.asyncClosureStub.defaultSideEffect = { $0.parameters.work() }
+
             sourceManager.addGeoJSONSourceFeatures(forSourceId: sourceId, features: [], dataId: nil)
             sourceManager.updateGeoJSONSourceFeatures(forSourceId: sourceId, features: [], dataId: nil)
             sourceManager.removeGeoJSONSourceFeatures(forSourceId: sourceId, featureIds: [], dataId: nil)