Merge pull request #812 from Esri/philium/enable-targeted-strict-concurrency-checking

Enable targeted strict concurrency checking

Author: philium

AuthenticationExample/AuthenticationExample.xcodeproj/project.pbxproj

@@ -358,6 +358,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";
 			};
@@ -392,6 +393,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";
 			};

AuthenticationExample/AuthenticationExample/LoadableImageView.swift

@@ -18,6 +18,7 @@ import SwiftUI
 /// A view that loads a `LoadableImage` and displays it.
 /// While the image is loading a progress view is displayed.
 /// If there is an error displaying the image a red exclamation circle is displayed.
+@MainActor
 struct LoadableImageView: View {
     /// The loadable image to display.
     let loadableImage: LoadableImage

AuthenticationExample/AuthenticationExample/MapItemView.swift

@@ -16,6 +16,7 @@ import ArcGIS
 import SwiftUI
 
 /// A view that displays a map.
+@MainActor
 struct MapItemView: View {
     /// The map that is to be displayed.
     let map: Map

Examples/Examples.xcodeproj/project.pbxproj

@@ -432,6 +432,7 @@
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SWIFT_STRICT_CONCURRENCY = targeted;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,6";
 			};
@@ -462,6 +463,7 @@
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SWIFT_STRICT_CONCURRENCY = targeted;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,6";
 			};

Examples/Examples/WorldScaleExampleView.swift

@@ -20,6 +20,7 @@ import SwiftUI
 /// An example that utilizes the `WorldScaleSceneView` to show an augmented reality view
 /// of your current location. Because this is an example that can be run from anywhere,
 /// it places a red circle around your initial location which can be explored.
+@MainActor
 struct WorldScaleExampleView: View {
     @State private var scene: ArcGIS.Scene = {
         // Creates an elevation source from Terrain3D REST service.
@@ -78,7 +79,7 @@ struct WorldScaleExampleView: View {
             try? await locationDataSource.start()
 
             // Retrieve initial location.
-            guard let initialLocation = await locationDataSource.locations.first(where: { _ in true }) else { return }
+            guard let initialLocation = await locationDataSource.locations.first(where: { @Sendable _ in true }) else { return }
 
             // Put a circle graphic around the initial location.
             let circle = GeometryEngine.geodeticBuffer(around: initialLocation.position, distance: 20, distanceUnit: .meters, maxDeviation: 1, curveType: .geodesic)

Examples/ExamplesApp/AnyExample.swift

@@ -16,9 +16,9 @@ import SwiftUI
 
 struct AnyExample<Content: View> {
     var name: String
-    var content: () -> Content
+    var content: @MainActor () -> Content
 
-    init(_ name: String, content: @autoclosure @escaping () -> Content) {
+    init(_ name: String, content: @autoclosure @escaping @MainActor () -> Content) {
         self.name = name
         self.content = content
     }

Examples/ExamplesApp/Example.swift

@@ -19,5 +19,6 @@ protocol Example {
     var name: String { get }
 
     /// A function which creates the example view.
+    @MainActor
     func makeBody() -> AnyView
 }

Examples/ExamplesApp/ExampleList.swift

@@ -14,6 +14,7 @@
 
 import SwiftUI
 
+@MainActor
 struct ExampleList: View {
     /// The name of the list of examples.
     var name: String

JobManagerExample/JobManagerExample.xcodeproj/project.pbxproj

@@ -329,6 +329,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.esri.JobManagerExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_STRICT_CONCURRENCY = targeted;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -360,6 +361,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.esri.JobManagerExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_STRICT_CONCURRENCY = targeted;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};

JobManagerExample/JobManagerExample/JobManagerExampleView.swift

@@ -136,7 +136,7 @@ private struct JobView: View {
     /// Initializer that takes a job for which to show the data for.
     init(job: Job) {
         self.job = job
-        status = job.status
+        self._status = .init(initialValue: job.status)
     }
 
     /// A Boolean value indicating if the progress is showing.
@@ -286,7 +286,7 @@ extension JobManagerExampleView {
 
         if syncModel == .layer, let featureServiceInfo = task.featureServiceInfo {
             let layerOptions = featureServiceInfo.layerInfos
-                .compactMap({ $0 as? FeatureServiceLayerIDInfo })
+                .compactMap { $0 as? FeatureServiceLayerIDInfo }
                 .compactMap(\.id)
                 .map(GenerateLayerOption.init(layerID:))
             params.addLayerOptions(layerOptions)

JobManagerExample/JobManagerExample/View.swift

@@ -28,8 +28,8 @@ extension View {
     @ViewBuilder
     func onReceive<S>(
         _ sequence: S,
-        perform action: ((S.Element) -> Void)?
-    ) -> some View where S: AsyncSequence {
+        perform action: (@MainActor (S.Element) -> Void)?
+    ) -> some View where S: AsyncSequence & Sendable, S.Element: Sendable {
         if let action {
             task {
                 do {

Package.swift

@@ -53,8 +53,8 @@ for target in package.targets {
     target.swiftSettings = (target.swiftSettings ?? []) + [
         // Experimental Features.
         .enableExperimentalFeature("AccessLevelOnImport"),
-        /* .enableExperimentalFeature("StrictConcurrency"), */
+        .enableExperimentalFeature("StrictConcurrency=targeted"),
         // Upcoming Features.
-        /* .enableUpcomingFeature("DisableOutwardActorInference") */
+        .enableUpcomingFeature("DisableOutwardActorInference")
     ]
 }

Sources/ArcGISToolkit/Common/AttachmentModel.swift

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import ArcGIS
-import QuickLook
+@preconcurrency import QuickLook
 import SwiftUI
 
 internal import os

Sources/ArcGISToolkit/Components/Augmented Reality/Utilities/WorldTrackingSceneView.swift

@@ -17,6 +17,7 @@ import SwiftUI
 import ArcGIS
 
 /// A scene view that provides an augmented reality world scale experience using world-tracking.
+@MainActor
 struct WorldTrackingSceneView: View {
     /// A Boolean value indicating if the camera was initially set.
     @Binding var initialCameraIsSet: Bool

Sources/ArcGISToolkit/Components/BasemapGallery/BasemapGalleryItem.swift

@@ -17,9 +17,11 @@ import Combine
 import UIKit
 
 ///  The `BasemapGalleryItem` encompasses an element in a `BasemapGallery`.
-public class BasemapGalleryItem: ObservableObject {
+@MainActor
+@preconcurrency
+public final class BasemapGalleryItem: ObservableObject, Sendable {
     /// The status of a basemap's spatial reference in relation to a reference spatial reference.
-    public enum SpatialReferenceStatus {
+    public enum SpatialReferenceStatus: Sendable {
         /// The basemap's spatial reference status is unknown, either because the basemap's
         /// base layers haven't been loaded yet or the status has yet to be updated.
         case unknown
@@ -52,7 +54,7 @@ public class BasemapGalleryItem: ObservableObject {
             if basemap.loadStatus != .loaded {
                 await loadBasemap()
             } else {
-                await finalizeLoading()
+                finalizeLoading()
             }
         }
     }
@@ -97,12 +99,12 @@ private extension BasemapGalleryItem {
         } catch  {
             loadError = error
         }
-        await finalizeLoading(error: loadError)
+        finalizeLoading(error: loadError)
     }
 
     /// Updates the item in response to basemap loading completion.
     /// - Parameter error: The basemap load error, if any.
-    @MainActor func finalizeLoading(error: Error? = nil) {
+    func finalizeLoading(error: Error? = nil) {
         if name == nil {
             name = basemap.name
         }

Sources/ArcGISToolkit/Components/FeatureFormView/AttachmentHelpers/AttachmentPhotoPicker.swift

@@ -16,6 +16,7 @@ import PhotosUI
 import SwiftUI
 
 /// A wrapper for the PhotosPicker API.
+@MainActor
 struct AttachmentPhotoPicker: ViewModifier {
     /// The item selected in the photos picker.
     @State private var item: PhotosPickerItem?
@@ -53,3 +54,5 @@ struct AttachmentPhotoPicker: ViewModifier {
             }
     }
 }
+
+extension PhotosPickerItem: @unchecked Swift.Sendable {}

Sources/ArcGISToolkit/Components/Popups/PopupView.swift

@@ -51,6 +51,8 @@ import ArcGIS
 /// and refer to
 /// [PopupExampleView.swift](https://github.com/Esri/arcgis-maps-sdk-swift-toolkit/blob/main/Examples/Examples/PopupExampleView.swift)
 /// in the project. To learn more about using the `PopupView` see the <doc:PopupViewTutorial>.
+@MainActor
+@preconcurrency
 public struct PopupView: View {
     /// Creates a `PopupView` with the given popup.
     /// - Parameters

Sources/ArcGISToolkit/Components/Search/SearchResult.swift

@@ -16,7 +16,7 @@ import UIKit.UIImage
 import ArcGIS
 
 /// Wraps a search result for display.
-public struct SearchResult {
+public struct SearchResult: Sendable {
     /// Creates a `SearchResult`.
     /// - Parameters:
     ///   - displayTitle: The string to be shown whenever a result is displayed.

Sources/ArcGISToolkit/Components/Search/SearchSource.swift

@@ -15,7 +15,8 @@
 import ArcGIS
 
 /// Defines the contract for a search result provider.
-public protocol SearchSource {
+@preconcurrency
+public protocol SearchSource: Sendable {
     /// Name to show when presenting this source in the UI.
     var name: String { get set }
 

Sources/ArcGISToolkit/Components/Search/SearchSuggestion.swift

@@ -16,7 +16,7 @@ import Foundation
 import ArcGIS
 
 /// Wraps a suggestion for display.
-public struct SearchSuggestion {
+public struct SearchSuggestion: Sendable {
     /// Creates a `SearchSuggestion`.
     /// - Parameters:
     ///   - displayTitle: The string to be used when displaying a suggestion.

Sources/ArcGISToolkit/Components/Search/SearchViewModel.swift

@@ -33,7 +33,7 @@ public enum SearchResultMode {
 ///
 /// The `failure` case contains the error (if any) generated by the last search or suggestion
 /// operation.
-public enum SearchOutcome {
+public enum SearchOutcome: Sendable {
     case results([SearchResult])
     case suggestions([SearchSuggestion])
     case failure(String)

Sources/ArcGISToolkit/Components/UtilityNetworkTrace/UtilityNetworkTraceViewModel.swift

@@ -129,7 +129,7 @@ import SwiftUI
         await withTaskGroup(of: Void.self) { [weak self] taskGroup in
             guard let self else { return }
             for layer in network?.layers ?? [] {
-                taskGroup.addTask {
+                taskGroup.addTask { @MainActor in
                     if let result = try? await proxy.identify(on: layer, screenPoint: screenPoint, tolerance: 10) {
                         for element in result.geoElements {
                             await self.processAndAdd(

Sources/ArcGISToolkit/Extensions/ArcGIS/AttachmentHelpers/AttachmentsFeatureElement.swift

@@ -26,7 +26,7 @@ public enum AttachmentsFeatureElementDisplayType {
 }
 
 /// Common properties for elements which display feature attachments.
-public protocol AttachmentsFeatureElement {
+public protocol AttachmentsFeatureElement: Sendable {
     /// Indicates how to display the attachments.
     var attachmentsDisplayType: AttachmentsFeatureElementDisplayType { get }
 

Test Runner/Test Runner.xcodeproj/project.pbxproj

@@ -486,6 +486,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";
 			};
@@ -521,6 +522,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";
 			};

Test Runner/UI Tests/AttachmentCameraControllerTests.swift

@@ -21,11 +21,14 @@ final class AttachmentCameraControllerTests: XCTestCase {
 
     /// Test `AttachmentCameraController.onCameraCaptureModeChanged(perform:)`
     func testOnCameraCaptureModeChanged() throws {
-#if targetEnvironment(simulator)
-        XCTSkip("This test intended for iOS devices only.")
-#elseif targetEnvironment(macCatalyst)
-        XCTSkip("This test intended for iOS devices only.")
+        let isUnsupportedEnvironment: Bool
+#if targetEnvironment(simulator) || targetEnvironment(macCatalyst)
+        isUnsupportedEnvironment = true
+#else
+        isUnsupportedEnvironment = false
 #endif
+        try XCTSkipIf(isUnsupportedEnvironment, "This test intended for iOS devices only.")
+        
         let app = XCUIApplication()
         let cameraModeController = app.otherElements["CameraMode"]
         let cameraModeLabel = app.staticTexts["Camera Capture Mode"]

Tests/ArcGISToolkitTests/BasemapGalleryItemTests.swift

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
 
-import XCTest
 import ArcGIS
 @testable import ArcGISToolkit
+@preconcurrency import Combine
+import Foundation
 import SwiftUI
-import Combine
+import XCTest
 
 // Note:  the iOS implementation uses the MVVM approach and SwiftUI. This
 // required a bit more properties/logic in the 'BasemapGalleryItem' (such
@@ -34,6 +34,7 @@ final class BasemapGalleryItemTests: XCTestCase {
         ArcGISEnvironment.apiKey = nil
     }
 
+    @MainActor
     func testInit() async throws {
         let basemap = Basemap(style: .arcGISLightGray)
         let item = BasemapGalleryItem(basemap: basemap)
@@ -83,6 +84,7 @@ final class BasemapGalleryItemTests: XCTestCase {
         XCTAssertNil(item3.loadBasemapError)
     }
 
+    @MainActor
     func testLoadBasemapError() async throws {
         // Create item with bad portal item URL.
         let item = BasemapGalleryItem(
@@ -99,6 +101,7 @@ final class BasemapGalleryItemTests: XCTestCase {
         XCTAssertNotNil(item.loadBasemapError)
     }
 
+    @MainActor
     func testSpatialReferenceAndStatus() async throws {
         let basemap = Basemap(style: .arcGISLightGray)
         let item = BasemapGalleryItem(basemap: basemap)

Tests/ArcGISToolkitTests/BasemapGalleryViewModelTests.swift

@@ -12,13 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
-
-import XCTest
 import ArcGIS
 @testable import ArcGISToolkit
-import SwiftUI
-import Combine
+@preconcurrency import Combine
+import XCTest
 
 // Note:  the iOS implementation uses the MVVM approach and SwiftUI. This
 // required a bit more properties/logic in the 'BasemapGalleryViewModel' (such

Tests/ArcGISToolkitTests/FloorFilterViewModelTests.swift

@@ -259,6 +259,7 @@ final class FloorFilterViewModelTests: XCTestCase {
         )
     }
 
+    @MainActor
     private func floorManager(
         forWebMapWithIdentifier id: PortalItem.ID,
         file: StaticString = #filePath,

Tests/ArcGISToolkitTests/Publisher.swift

@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
 import Combine
 
-extension Publisher {
+extension Publisher where Self: Sendable {
     /// Asynchronously returns the first value emitted from the publisher.
     /// This property will return `nil` if this publisher completes without an error before
     /// it emits a value.