Enable targeted strict concurrency

philium · philium · commit 4bbab6365400 · 2024-07-17T10:33:25.000-07:00
diff --git a/Samples.xcodeproj/project.pbxproj b/Samples.xcodeproj/project.pbxproj
@@ -3348,6 +3348,7 @@
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_STRICT_CONCURRENCY = targeted;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,6";
 			};
@@ -3379,6 +3380,7 @@
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_STRICT_CONCURRENCY = targeted;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,6";
 				VALIDATE_PRODUCT = YES;
diff --git a/Shared/Samples/Add ENC exchange set/AddENCExchangeSetView.swift b/Shared/Samples/Add ENC exchange set/AddENCExchangeSetView.swift
@@ -57,6 +57,7 @@ struct AddENCExchangeSetView: View {
 }
 
 private extension AddENCExchangeSetView {
+    @MainActor
     class Model: ObservableObject {
         /// A map with Oceans style.
         let map: Map = {
diff --git a/Shared/Samples/Add feature layers/AddFeatureLayersView.swift b/Shared/Samples/Add feature layers/AddFeatureLayersView.swift
@@ -76,6 +76,7 @@ private struct ChallengeHandler: ArcGISAuthenticationChallengeHandler {
 private extension AddFeatureLayersView {
     /// The model used to store the geo model and other expensive objects
     /// used in this view.
+    @MainActor
     class Model: ObservableObject {
         /// A map with a topographic basemap style.
         let map = Map(basemapStyle: .arcGISTopographic)
diff --git a/Shared/Samples/Analyze network with subnetwork trace/AnalyzeNetworkWithSubnetworkTraceView.Model.swift b/Shared/Samples/Analyze network with subnetwork trace/AnalyzeNetworkWithSubnetworkTraceView.Model.swift
@@ -294,9 +294,9 @@ extension AnalyzeNetworkWithSubnetworkTraceView {
         func addConditionalExpression(
             attribute: UtilityNetworkAttribute,
             comparison: UtilityNetworkAttributeComparison.Operator,
-            value: Any
+            value: any Sendable
         ) throws {
-            let convertedValue: Any
+            let convertedValue: any Sendable
             
             if let codedValue = value as? CodedValue, attribute.domain is CodedValueDomain {
                 convertedValue = convertToDataType(value: codedValue.code!, dataType: attribute.dataType)
@@ -331,7 +331,7 @@ extension AnalyzeNetworkWithSubnetworkTraceView {
         ///   - value: The right hand side value used in the conditional expression.
         ///   - dataType: An `UtilityNetworkAttribute.DataType` enum case.
         /// - Returns: Converted value.
-        func convertToDataType(value: Any, dataType: UtilityNetworkAttribute.DataType) -> Any {
+        func convertToDataType(value: any Sendable, dataType: UtilityNetworkAttribute.DataType) -> any Sendable {
             switch dataType {
             case .integer:
                 if let value = value as? Int16 {
diff --git a/Shared/Samples/Augment reality to collect data/AugmentRealityToCollectDataView.swift b/Shared/Samples/Augment reality to collect data/AugmentRealityToCollectDataView.swift
@@ -153,7 +153,7 @@ private extension AugmentRealityToCollectDataView {
                   let featurePoint = featureGraphic.geometry as? Point else { return }
             
             // Create attributes for the new feature.
-            let featureAttributes: [String: Any] = [
+            let featureAttributes: [String: any Sendable] = [
                 "Health": health.rawValue,
                 "Height": 3.2,
                 "Diameter": 1.2
diff --git a/Shared/Samples/Augment reality to navigate route/AugmentRealityToNavigateRouteView.swift b/Shared/Samples/Augment reality to navigate route/AugmentRealityToNavigateRouteView.swift
@@ -17,6 +17,7 @@ import ArcGISToolkit
 import AVFoundation
 import SwiftUI
 
+@MainActor
 struct AugmentRealityToNavigateRouteView: View {
     /// The data model for the selected route.
     @StateObject private var routeDataModel = RouteDataModel()
@@ -147,7 +148,7 @@ struct AugmentRealityToNavigateRouteView: View {
     ) {
         if let densifiedPolyline = GeometryEngine.densify(polyline, maxSegmentLength: 0.3) as? Polyline {
             let polylineBuilder = PolylineBuilder(spatialReference: densifiedPolyline.spatialReference)
-            Task {
+            Task { @MainActor in
                 for part in densifiedPolyline.parts {
                     for point in part.points {
                         async let elevation = try await elevationSurface.elevation(at: point)
diff --git a/Shared/Samples/Augment reality to show hidden infrastructure/AugmentRealityToShowHiddenInfrastructureView.ARSceneView.swift b/Shared/Samples/Augment reality to show hidden infrastructure/AugmentRealityToShowHiddenInfrastructureView.ARSceneView.swift
@@ -71,6 +71,7 @@ extension AugmentRealityToShowHiddenInfrastructureView {
     // MARK: Scene Model
     
     /// The view model for scene view in the sample.
+    @MainActor
     class SceneModel: ObservableObject {
         /// A scene with an imagery basemap style and an elevation surface.
         let scene: ArcGIS.Scene = {
diff --git a/Shared/Samples/Augment reality to show hidden infrastructure/AugmentRealityToShowHiddenInfrastructureView.swift b/Shared/Samples/Augment reality to show hidden infrastructure/AugmentRealityToShowHiddenInfrastructureView.swift
@@ -132,6 +132,7 @@ private extension AugmentRealityToShowHiddenInfrastructureView {
     // MARK: Map Model
     
     /// The view model for the map view in the sample.
+    @MainActor
     class MapModel: ObservableObject {
         /// A map with an imagery basemap style.
         let map = Map(basemapStyle: .arcGISImagery)
diff --git a/Shared/Samples/Configure clusters/ConfigureClustersView.Model.swift b/Shared/Samples/Configure clusters/ConfigureClustersView.Model.swift
@@ -18,6 +18,7 @@ import UIKit.UIColor
 extension ConfigureClustersView {
     /// The model used to store the geo model and other expensive objects
     /// used in this view.
+    @MainActor
     class Model: ObservableObject {
         /// A Zurich buildings web map.
         let map = Map(
diff --git a/Shared/Samples/Create and save KML file/CreateAndSaveKMLView.swift b/Shared/Samples/Create and save KML file/CreateAndSaveKMLView.swift
@@ -105,6 +105,7 @@ final class KMZFile: FileDocument {
     }
     
     /// Saves the KML document as a KMZ file to a temporary location.
+    @MainActor
     func saveFile() async throws {
         temporaryDirectory = FileManager.createTemporaryDirectory()
         
diff --git a/Shared/Samples/Create symbol styles from web styles/CreateSymbolStylesFromWebStylesView.swift b/Shared/Samples/Create symbol styles from web styles/CreateSymbolStylesFromWebStylesView.swift
@@ -15,6 +15,7 @@
 import ArcGIS
 import SwiftUI
 
+@MainActor
 struct CreateSymbolStylesFromWebStylesView: View {
     /// The display scale of the environment.
     @Environment(\.displayScale) private var displayScale
diff --git a/Shared/Samples/Display dimensions/DisplayDimensionsView.swift b/Shared/Samples/Display dimensions/DisplayDimensionsView.swift
@@ -15,6 +15,7 @@
 import ArcGIS
 import SwiftUI
 
+@MainActor
 struct DisplayDimensionsView: View {
     /// A map with no specified style.
     @State private var map = Map()
diff --git a/Shared/Samples/Display map from mobile map package/DisplayMapFromMobileMapPackageView.swift b/Shared/Samples/Display map from mobile map package/DisplayMapFromMobileMapPackageView.swift
@@ -15,6 +15,7 @@
 import ArcGIS
 import SwiftUI
 
+@MainActor
 struct DisplayMapFromMobileMapPackageView: View {
     /// A map with no specified style.
     @State private var map = Map()
diff --git a/Shared/Samples/Download preplanned map area/DownloadPreplannedMapAreaView.Model.swift b/Shared/Samples/Download preplanned map area/DownloadPreplannedMapAreaView.Model.swift
@@ -70,8 +70,8 @@ extension DownloadPreplannedMapAreaView {
         /// Gets the preplanned map areas from the offline map task and creates the
         /// offline map models.
         func makeOfflineMapModels() async {
-            self.offlineMapModels = await Result {
-                try await offlineMapTask.preplannedMapAreas
+            do {
+                let models = try await offlineMapTask.preplannedMapAreas
                     .sorted(using: KeyPathComparator(\.portalItem.title))
                     .compactMap {
                         OfflineMapModel(
@@ -80,6 +80,9 @@ extension DownloadPreplannedMapAreaView {
                             temporaryDirectory: temporaryDirectory
                         )
                     }
+                offlineMapModels = .success(models)
+            } catch {
+                offlineMapModels = .failure(error)
             }
         }
         
@@ -123,9 +126,9 @@ extension DownloadPreplannedMapAreaView {
         /// Cancels all current jobs.
         private func cancelAllJobs() async {
             await withTaskGroup(of: Void.self) { group in
-                allOfflineMapModels.forEach { model in
+                for model in allOfflineMapModels {
                     if model.isDownloading {
-                        group.addTask {
+                        group.addTask { @MainActor in
                             await model.cancelDownloading()
                         }
                     }
diff --git a/Shared/Samples/Filter by definition expression or display filter/FilterByDefinitionExpressionOrDisplayFilterView.swift b/Shared/Samples/Filter by definition expression or display filter/FilterByDefinitionExpressionOrDisplayFilterView.swift
@@ -86,6 +86,7 @@ struct FilterByDefinitionExpressionOrDisplayFilterView: View {
 
 private extension FilterByDefinitionExpressionOrDisplayFilterView {
     /// The view model for the sample.
+    @MainActor
     final class Model: ObservableObject {
         /// A map with a topographic basemap.
         let map: Map = {
diff --git a/Shared/Samples/Find closest facility from point/FindClosestFacilityFromPointView.swift b/Shared/Samples/Find closest facility from point/FindClosestFacilityFromPointView.swift
@@ -91,6 +91,7 @@ struct FindClosestFacilityFromPointView: View {
 
 private extension FindClosestFacilityFromPointView {
     /// The view model for the sample.
+    @MainActor
     class Model: ObservableObject {
         /// A map with a streets relief basemap.
         let map = Map(basemapStyle: .arcGISStreetsRelief)
diff --git a/Shared/Samples/Find closest facility to multiple points/FindClosestFacilityToMultiplePointsView.swift b/Shared/Samples/Find closest facility to multiple points/FindClosestFacilityToMultiplePointsView.swift
@@ -57,6 +57,7 @@ struct FindClosestFacilityToMultiplePointsView: View {
 
 private extension FindClosestFacilityToMultiplePointsView {
     /// The view model for the sample.
+    @MainActor
     class Model: ObservableObject {
         /// A map with a streets basemap centered on San Diego, CA, USA.
         let map = {
diff --git a/Shared/Samples/Identify KML features/IdentifyKMLFeaturesView.swift b/Shared/Samples/Identify KML features/IdentifyKMLFeaturesView.swift
@@ -15,6 +15,7 @@
 import ArcGIS
 import SwiftUI
 
+@MainActor
 struct IdentifyKMLFeaturesView: View {
     /// A map with a dark gray base basemap centered on the USA.
     @State private var map: Map = {
diff --git a/Shared/Samples/Navigate route with rerouting/NavigateRouteWithReroutingView.swift b/Shared/Samples/Navigate route with rerouting/NavigateRouteWithReroutingView.swift
@@ -100,18 +100,18 @@ struct NavigateRouteWithReroutingView: View {
             guard model.isNavigating, let routeTracker = model.routeTracker else { return }
             
             await withTaskGroup(of: Void.self) { group in
-                group.addTask {
+                group.addTask { @MainActor in
                     // Handle new tracking statuses from the route tracker.
                     for await trackingStatus in routeTracker.$trackingStatus {
                         guard let trackingStatus else { continue }
                         await model.updateProgress(using: trackingStatus)
                     }
                 }
                 
-                group.addTask {
+                group.addTask { @MainActor in
                     // Speak new voice guidances from the route tracker.
                     for await voiceGuidance in routeTracker.voiceGuidances {
-                        await model.speakVoiceGuidance(voiceGuidance)
+                        model.speakVoiceGuidance(voiceGuidance)
                     }
                 }
             }
diff --git a/Shared/Samples/Orbit camera around object/OrbitCameraAroundObjectView.Model.swift b/Shared/Samples/Orbit camera around object/OrbitCameraAroundObjectView.Model.swift
@@ -17,6 +17,7 @@ import SwiftUI
 
 extension OrbitCameraAroundObjectView {
     /// The view model for the sample.
+    @MainActor
     class Model: ObservableObject {
         // MARK: Properties
         
diff --git a/Shared/Samples/Set feature request mode/SetFeatureRequestModeView.swift b/Shared/Samples/Set feature request mode/SetFeatureRequestModeView.swift
@@ -98,6 +98,7 @@ struct SetFeatureRequestModeView: View {
 
 private extension SetFeatureRequestModeView {
     /// The view model for the sample.
+    @MainActor
     class Model: ObservableObject {
         /// A map with a topographic basemap centered on Portland OR, USA.
         let map: Map = {
diff --git a/Shared/Samples/Set up location-driven geotriggers/SetUpLocationDrivenGeotriggersView.swift b/Shared/Samples/Set up location-driven geotriggers/SetUpLocationDrivenGeotriggersView.swift
@@ -37,10 +37,10 @@ struct SetUpLocationDrivenGeotriggersView: View {
     private func startGeotriggerMonitors(_ geotriggerMonitors: [GeotriggerMonitor]) async throws {
         await withThrowingTaskGroup(of: Void.self) { group in
             for monitor in geotriggerMonitors {
-                group.addTask {
+                group.addTask { @MainActor in
                     try await monitor.start()
                     for await newNotification in monitor.notifications where newNotification is FenceGeotriggerNotificationInfo {
-                        await model.handleGeotriggerNotification(newNotification as! FenceGeotriggerNotificationInfo)
+                        model.handleGeotriggerNotification(newNotification as! FenceGeotriggerNotificationInfo)
                     }
                 }
             }
diff --git a/Shared/Samples/Show device location history/ShowDeviceLocationHistoryView.swift b/Shared/Samples/Show device location history/ShowDeviceLocationHistoryView.swift
@@ -61,6 +61,7 @@ struct ShowDeviceLocationHistoryView: View {
 private extension ShowDeviceLocationHistoryView {
     /// The model used to store the geo model and other expensive objects
     /// used in this view.
+    @MainActor
     class Model: ObservableObject {
         /// A map with a light gray basemap style.
         let map = Map(basemapStyle: .arcGISLightGrayBase)
diff --git a/Shared/Samples/Show service area/ShowServiceAreaView.swift b/Shared/Samples/Show service area/ShowServiceAreaView.swift
@@ -96,6 +96,7 @@ private extension ShowServiceAreaView {
 private extension ShowServiceAreaView {
     // MARK: - Model
     
+    @MainActor
     class Model: ObservableObject {
         /// A map with terrain style centered over San Diego.
         let map: Map = {
diff --git a/Shared/Samples/Show utility associations/ShowUtilityAssociationsView.swift b/Shared/Samples/Show utility associations/ShowUtilityAssociationsView.swift
@@ -100,6 +100,7 @@ private extension ShowUtilityAssociationsView {
 private extension ShowUtilityAssociationsView {
     /// The model used to store the geo model and other expensive objects
     /// used in this view.
+    @MainActor
     class Model: ObservableObject {
         // MARK: Properties
         
diff --git a/Shared/Samples/Trace utility network/TraceUtilityNetworkView.Model.swift b/Shared/Samples/Trace utility network/TraceUtilityNetworkView.Model.swift
@@ -17,6 +17,7 @@ import UIKit.UIColor
 
 extension TraceUtilityNetworkView {
     /// The model used to manage the state of the trace view.
+    @MainActor
     class Model: ObservableObject {
         // MARK: Properties
         
@@ -158,7 +159,7 @@ extension TraceUtilityNetworkView {
                             tolerance: -1
                         )
                         Task {
-                            await updateUserHint(
+                            updateUserHint(
                                 withMessage: String(format: "fractionAlongEdge: %.3f", element.fractionAlongEdge)
                             )
                         }
@@ -169,7 +170,7 @@ extension TraceUtilityNetworkView {
                 }
             } else {
                 Task {
-                    await updateUserHint(withMessage: "An error occurred while adding element to the trace.")
+                    updateUserHint(withMessage: "An error occurred while adding element to the trace.")
                 }
             }
         }
@@ -200,7 +201,7 @@ extension TraceUtilityNetworkView {
                 try await map.load()
                 try await network.load()
             } catch {
-                await updateUserHint(withMessage: "An error occurred while loading the network.")
+                updateUserHint(withMessage: "An error occurred while loading the network.")
                 return
             }
             
@@ -247,7 +248,6 @@ extension TraceUtilityNetworkView {
         ///
         /// If no message is provided a default hint is used.
         /// - Parameter message: The message to display to the user.
-        @MainActor
         func updateUserHint(withMessage message: String? = nil) {
             if let message {
                 hint = message
diff --git a/Shared/Supporting Files/Models/OnDemandResource.swift b/Shared/Supporting Files/Models/OnDemandResource.swift
@@ -87,3 +87,5 @@ final class OnDemandResource: ObservableObject {
         }
     }
 }
+
+extension NSBundleResourceRequest: @unchecked Sendable {}
diff --git a/Shared/Supporting Files/Views/WebView.swift b/Shared/Supporting Files/Views/WebView.swift
@@ -41,17 +41,22 @@ struct WebView: UIViewRepresentable {
     }
     
     class Coordinator: NSObject, WKNavigationDelegate {
-        @MainActor
         func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction) async -> WKNavigationActionPolicy {
             switch navigationAction.navigationType {
             case .linkActivated:
-                if let url = navigationAction.request.url, UIApplication.shared.canOpenURL(url) {
-                    await UIApplication.shared.open(url)
+                if let url = navigationAction.request.url {
+                    await Self.openURL(url)
                 }
                 return .cancel
             default:
                 return .allow
             }
         }
+        
+        @MainActor
+        static func openURL(_ url: URL) {
+            guard UIApplication.shared.canOpenURL(url) else { return }
+            UIApplication.shared.open(url)
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ struct AddENCExchangeSetView: View {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`private extension AddENCExchangeSetView {`
	`60`	`+ @MainActor`
`60`	`61`	`class Model: ObservableObject {`
`61`	`62`	`/// A map with Oceans style.`
`62`	`63`	`let map: Map = {`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ final class KMZFile: FileDocument {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`/// Saves the KML document as a KMZ file to a temporary location.`
	`108`	`+ @MainActor`
`108`	`109`	`func saveFile() async throws {`
`109`	`110`	`temporaryDirectory = FileManager.createTemporaryDirectory()`
`110`	`111`