[Update] Bump version to Xcode 16

README.md

@@ -18,9 +18,9 @@ This repository contains Swift sample code demonstrating the capabilities of the
 
 ## Requirements
 
-* [ArcGIS Maps SDK for Swift](https://developers.arcgis.com/swift/) 200.5 (or newer)
+* [ArcGIS Maps SDK for Swift](https://developers.arcgis.com/swift/) 200.5.1 (or newer)
 * [ArcGIS Maps SDK for Swift Toolkit](https://github.com/Esri/arcgis-maps-sdk-swift-toolkit) 200.5 (or newer)
-* Xcode 15.0 (or newer)
+* Xcode 16.0 (or newer)
 
 The *ArcGIS Maps SDK for Swift Samples app* has a *Target SDK* version of *16.0*, meaning that it can run on devices with *iOS 16.0* or newer.
 

Samples.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 60;
+	objectVersion = 77;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -2951,7 +2951,7 @@
 					StyleSymbolsFromMobileStyleFile,
 				);
 				LastSwiftUpdateCheck = 1330;
-				LastUpgradeCheck = 1500;
+				LastUpgradeCheck = 1600;
 				ORGANIZATIONNAME = Esri;
 				TargetAttributes = {
 					00E5401227F3CCA200CF66D5 = {
@@ -2960,7 +2960,6 @@
 				};
 			};
 			buildConfigurationList = 00E5400A27F3CCA100CF66D5 /* Build configuration list for PBXProject "Samples" */;
-			compatibilityVersion = "Xcode 15.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -2971,6 +2970,7 @@
 			packageReferences = (
 				00C43AEB2947DC350099AE34 /* XCRemoteSwiftPackageReference "arcgis-maps-sdk-swift-toolkit" */,
 			);
+			preferredProjectObjectVersion = 77;
 			productRefGroup = 00E5401427F3CCA200CF66D5 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -3490,7 +3490,7 @@
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_STRICT_CONCURRENCY = targeted;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2,6";
 			};
 			name = Debug;
@@ -3522,7 +3522,7 @@
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_STRICT_CONCURRENCY = targeted;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2,6";
 				VALIDATE_PRODUCT = YES;
 			};

Samples.xcodeproj/xcshareddata/xcschemes/Samples.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Shared/Samples/Analyze network with subnetwork trace/AnalyzeNetworkWithSubnetworkTraceView.swift

@@ -26,7 +26,7 @@ struct AnalyzeNetworkWithSubnetworkTraceView: View {
     @State private var selectedComparison: UtilityNetworkAttributeComparison.Operator?
 
     /// The value selected by the user.
-    @State private var selectedValue: Any?
+    @State private var selectedValue: (any Sendable)?
 
     /// A Boolean value indicating if the add condition menu is presented.
     @State private var isConditionMenuPresented = false

Shared/Samples/Animate 3D graphic/Animate3DGraphicView.Model.swift

@@ -136,10 +136,6 @@ extension Animate3DGraphicView {
             animation.setup(displayLink: displayLink)
         }
 
-        deinit {
-            Task { await animation.displayLink?.invalidate() }
-        }
-
         // MARK: Methods
 
         /// Monitors the camera controller's properties to update the associated text when they change.

Shared/Samples/Animate 3D graphic/Animate3DGraphicView.swift

@@ -86,6 +86,10 @@ struct Animate3DGraphicView: View {
                 } label: {
                     Image(systemName: model.animation.isPlaying ? "pause.fill" : "play.fill")
                 }
+                .onDisappear {
+                    model.animation.displayLink?.invalidate()
+                }
+
                 Spacer()
 
                 SettingsView(label: "Camera") {

Shared/Samples/Augment reality to navigate route/AugmentRealityToNavigateRouteView.swift

@@ -36,6 +36,11 @@ struct AugmentRealityToNavigateRouteView: View {
         .onSingleTapGesture { _, mapPoint in
             tapLocation = mapPoint
         }
+        .onDisappear {
+            Task {
+                await model.locationDisplay.dataSource.stop()
+            }
+        }
         .task(id: tapLocation) {
             guard let tapLocation else { return }
 
@@ -161,13 +166,6 @@ private extension AugmentRealityToNavigateRouteView {
         /// The status text displayed to the user.
         @Published var statusText = "Tap to place a start point."
 
-        deinit {
-            Task {
-                /// Stop the location data source.
-                await locationDisplay.dataSource.stop()
-            }
-        }
-
         /// Performs important tasks including setting up the location display, creating route parameters,
         /// and loading the scene elevation source.
         func setUp() async throws {

Shared/Samples/Create and save KML file/CreateAndSaveKMLView.swift

@@ -70,7 +70,8 @@ struct CreateAndSaveKMLView: View {
 
 extension CreateAndSaveKMLView {
     /// A KMZ file that can be used with the native file exporter.
-    final class KMZFile: FileDocument {
+    @MainActor
+    final class KMZFile: @preconcurrency FileDocument, Sendable {
         /// The KML document that is used to create the KMZ file.
         private let document: KMLDocument
 
@@ -106,7 +107,6 @@ extension CreateAndSaveKMLView {
         }
 
         /// Saves the KML document as a KMZ file to a temporary location.
-        @MainActor
         func saveFile() async throws {
             temporaryDirectory = FileManager.createTemporaryDirectory()
 

Shared/Samples/Create mobile geodatabase/CreateMobileGeodatabaseView.Model.swift

@@ -117,7 +117,8 @@ extension CreateMobileGeodatabaseView {
     // MARK: GeodatabaseFile
 
     /// A geodatabase file that can be used with the native file exporter.
-    final class GeodatabaseFile {
+    @MainActor
+    final class GeodatabaseFile: Sendable {
         /// The mobile geodatabase used to create the geodatabase file.
         private(set) var geodatabase: Geodatabase?
 
@@ -166,7 +167,7 @@ extension CreateMobileGeodatabaseView {
     }
 }
 
-extension CreateMobileGeodatabaseView.GeodatabaseFile: FileDocument {
+extension CreateMobileGeodatabaseView.GeodatabaseFile: @preconcurrency FileDocument {
     /// The file and data types that the document reads from.
     static var readableContentTypes: [UTType] { [.geodatabase] }
 

Shared/Samples/Download preplanned map area/DownloadPreplannedMapAreaView.Model.swift

@@ -128,7 +128,7 @@ extension DownloadPreplannedMapAreaView {
             await withTaskGroup(of: Void.self) { group in
                 for model in allOfflineMapModels {
                     if model.isDownloading {
-                        group.addTask { @MainActor in
+                        group.addTask { @MainActor @Sendable in
                             await model.cancelDownloading()
                         }
                     }

Shared/Samples/Navigate route with rerouting/NavigateRouteWithReroutingView.swift

@@ -100,15 +100,15 @@ struct NavigateRouteWithReroutingView: View {
             guard model.isNavigating, let routeTracker = model.routeTracker else { return }
 
             await withTaskGroup(of: Void.self) { group in
-                group.addTask { @MainActor in
+                group.addTask { @MainActor @Sendable 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 { @MainActor in
+                group.addTask { @MainActor @Sendable in
                     // Speak new voice guidances from the route tracker.
                     for await voiceGuidance in routeTracker.voiceGuidances {
                         model.speakVoiceGuidance(voiceGuidance)

Shared/Samples/Set up location-driven geotriggers/SetUpLocationDrivenGeotriggersView.swift

@@ -37,7 +37,7 @@ struct SetUpLocationDrivenGeotriggersView: View {
     private func startGeotriggerMonitors(_ geotriggerMonitors: [GeotriggerMonitor]) async throws {
         await withThrowingTaskGroup(of: Void.self) { group in
             for monitor in geotriggerMonitors {
-                group.addTask { @MainActor in
+                group.addTask { @MainActor @Sendable in
                     try await monitor.start()
                     for await newNotification in monitor.notifications where newNotification is FenceGeotriggerNotificationInfo {
                         model.handleGeotriggerNotification(newNotification as! FenceGeotriggerNotificationInfo)

Shared/Samples/Show device location with NMEA data sources/FileNMEASentenceReader.swift

@@ -16,7 +16,7 @@ import Foundation
 
 extension ShowDeviceLocationWithNMEADataSourcesView {
     /// A data source simulating a hardware that emits NMEA data.
-    class FileNMEASentenceReader {
+    class FileNMEASentenceReader: @unchecked Sendable {
         /// The playback time interval.
         private let interval: TimeInterval
 
@@ -79,7 +79,7 @@ extension ShowDeviceLocationWithNMEADataSourcesView {
                     withTimeInterval: interval,
                     repeats: true
                 ) { [weak self] _ in
-                    guard let self = self else { return }
+                    guard let self else { return }
                     let data = self.nmeaDataIterator.next()!
                     continuation.yield(data)
                 }

Shared/Samples/Show viewshed from geoelement in scene/ShowViewshedFromGeoelementInSceneView.swift

@@ -46,7 +46,7 @@ struct ShowViewshedFromGeoelementInSceneView: View {
 
 private extension ShowViewshedFromGeoelementInSceneView {
     /// The view model for the sample.
-    class Model: ObservableObject {
+    class Model: ObservableObject, @unchecked Sendable {
         /// A scene with an imagery basemap.
         let scene: ArcGIS.Scene = {
             let scene = Scene(basemapStyle: .arcGISImagery)

Shared/Supporting Files/Extensions/Array+RawRepresentable.swift

@@ -15,7 +15,7 @@
 import Foundation
 
 /// An extension allowing an array to be used with the app storage property wrapper.
-extension Array: RawRepresentable where Element == String {
+extension Array: @retroactive RawRepresentable where Element == String {
     /// Creates a new array from a given raw value.
     /// - Parameter rawValue: The raw value of the array to create.
     public init(rawValue: String) {

Shared/Supporting Files/Models/OnDemandResource.swift

@@ -88,4 +88,4 @@ final class OnDemandResource: ObservableObject {
     }
 }
 
-extension NSBundleResourceRequest: @unchecked Sendable {}
+extension NSBundleResourceRequest: @unchecked @retroactive Sendable {}

Shared/Supporting Files/Views/SampleDetailView.swift

@@ -104,5 +104,5 @@ struct SampleDetailView: View {
 }
 
 extension SampleDetailView: Identifiable {
-    var id: String { sample.nameInUpperCamelCase }
+    nonisolated var id: String { sample.nameInUpperCamelCase }
 }

Shared/Supporting Files/Views/WebView.swift

@@ -45,15 +45,14 @@ struct WebView: UIViewRepresentable {
             switch navigationAction.navigationType {
             case .linkActivated:
                 if let url = navigationAction.request.url {
-                    await Self.openURL(url)
+                    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)