Merge pull request #978 from Esri/v.next

Merge `v.next` into `main`

Author: dfeinzimer

.spi.yml

@@ -0,0 +1,3 @@
+version: 1
+external_links:
+  documentation: "https://developers.arcgis.com/swift/toolkit-api-reference/documentation/arcgistoolkit/"

.swiftpm/xcode/xcshareddata/xcschemes/arcgis-runtime-toolkit-swift.xcscheme

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

AuthenticationExample/AuthenticationExample.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 55;
+	objectVersion = 77;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -133,22 +133,22 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1320;
-				LastUpgradeCheck = 1530;
+				LastUpgradeCheck = 1600;
 				TargetAttributes = {
 					88AD13742834355000500B2E = {
 						CreatedOnToolsVersion = 13.2.1;
 					};
 				};
 			};
 			buildConfigurationList = 88AD13702834355000500B2E /* Build configuration list for PBXProject "AuthenticationExample" */;
-			compatibilityVersion = "Xcode 13.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				Base,
 			);
 			mainGroup = 88AD136C2834355000500B2E;
+			preferredProjectObjectVersion = 77;
 			productRefGroup = 88AD13762834355000500B2E /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -270,6 +270,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 6.0;
 			};
 			name = Debug;
 		};
@@ -325,6 +326,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 6.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -351,16 +353,18 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 200.5.0;
+				MARKETING_VERSION = 200.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.esri.Authentication;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_STRICT_CONCURRENCY = complete;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				SWIFT_VERSION = 6.0;
+				TARGETED_DEVICE_FAMILY = "1,2,7";
+				XROS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Debug;
 		};
@@ -386,16 +390,18 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 200.5.0;
+				MARKETING_VERSION = 200.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.esri.Authentication;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_STRICT_CONCURRENCY = complete;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				SWIFT_VERSION = 6.0;
+				TARGETED_DEVICE_FAMILY = "1,2,7";
+				XROS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Release;
 		};

AuthenticationExample/AuthenticationExample/HomeView.swift

@@ -25,22 +25,24 @@ struct HomeView: View {
 
     var body: some View {
         if let portal = portal {
-            NavigationStack {
+            NavigationSplitView {
                 WebMapsView(portal: portal)
                     .toolbar {
-                        ToolbarItem(placement: .navigationBarTrailing) {
+                        ToolbarItem(placement: .topBarTrailing) {
                             Button {
                                 showProfile = true
                             } label: {
                                 Image(systemName: "person.circle")
                             }
+                            .sheet(isPresented: $showProfile) {
+                                ProfileView(portal: portal) {
+                                    self.portal = nil
+                                }
+                            }
                         }
                     }
-                    .sheet(isPresented: $showProfile) {
-                        ProfileView(portal: portal) {
-                            self.portal = nil
-                        }
-                    }
+            } detail: {
+                Text("No Webmap Selected")
             }
         } else {
             SignInView(portal: $portal)

AuthenticationExample/AuthenticationExample/LoadableImageView.swift

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

AuthenticationExample/AuthenticationExample/ProfileView.swift

@@ -17,7 +17,6 @@ import ArcGISToolkit
 import SwiftUI
 
 /// A view that displays the profile of a user.
-@MainActor
 struct ProfileView: View {
     /// The portal that the user is signed in to.
     let portal: Portal
@@ -28,15 +27,28 @@ struct ProfileView: View {
     /// The closure to call once the user has signed out.
     var signOutAction: () -> Void
 
+    /// Dismisses the current presentation.
+    @Environment(\.dismiss)
+    private var dismiss
+    
     var body: some View {
-        VStack {
-            if let user = portal.user {
-                UserView(user: user).padding()
+        NavigationStack {
+            VStack {
+                if let user = portal.user {
+                    UserView(user: user).padding()
+                }
+                Spacer()
+                signOutButton
+            }
+            .padding()
+            .toolbar {
+                ToolbarItem(placement: .topBarTrailing) {
+                    Button("Done") {
+                        dismiss()
+                    }
+                }
             }
-            Spacer()
-            signOutButton
         }
-        .padding()
     }
 
     var signOutButton: some View {

AuthenticationExample/AuthenticationExample/SignInView.swift

@@ -18,7 +18,6 @@ import CryptoKit
 import SwiftUI
 
 /// A view that allows the user to sign in to a portal.
-@MainActor
 struct SignInView: View {
     /// The error that occurred during an attempt to sign in.
     @State private var error: Error?
@@ -44,7 +43,11 @@ struct SignInView: View {
                 ProgressView()
             } else {
                 Text(URL.portal.host!)
+#if os(visionOS) || targetEnvironment(macCatalyst)
+                    .font(.headline)
+#else
                     .font(.footnote)
+#endif
                     .foregroundColor(.secondary)
                 signInButton
             }
@@ -107,7 +110,9 @@ struct SignInView: View {
             signIn()
         } label: {
             Text(signInButtonText)
+#if !os(visionOS)
                 .frame(maxWidth: .infinity)
+#endif
         }
         .buttonStyle(.bordered)
         .controlSize(.large)

AuthenticationExample/AuthenticationExample/UserView.swift

@@ -65,7 +65,7 @@ struct UserView: View {
     }
 }
 
-extension PortalUser.Role: CustomStringConvertible {
+extension PortalUser.Role: @retroactive CustomStringConvertible {
     public var description: String {
         switch self {
         case .user:

Examples/Examples.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 77;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -199,22 +199,22 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1250;
-				LastUpgradeCheck = 1530;
+				LastUpgradeCheck = 1600;
 				TargetAttributes = {
 					E47ABE3F2652FE0900FD2FE3 = {
 						CreatedOnToolsVersion = 12.5;
 					};
 				};
 			};
 			buildConfigurationList = E47ABE3B2652FE0900FD2FE3 /* Build configuration list for PBXProject "Examples" */;
-			compatibilityVersion = "Xcode 9.3";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				Base,
 			);
 			mainGroup = E47ABE372652FE0900FD2FE3;
+			preferredProjectObjectVersion = 77;
 			productRefGroup = E47ABE412652FE0900FD2FE3 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -348,6 +348,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 6.0;
 			};
 			name = Debug;
 		};
@@ -403,6 +404,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 6.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -427,14 +429,14 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 200.5.0;
+				MARKETING_VERSION = 200.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.esri.arcgis-swift-sdk-toolkit-examples";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_STRICT_CONCURRENCY = complete;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2,6";
 			};
 			name = Debug;
@@ -459,14 +461,14 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 200.5.0;
+				MARKETING_VERSION = 200.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.esri.arcgis-swift-sdk-toolkit-examples";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_STRICT_CONCURRENCY = complete;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2,6";
 			};
 			name = Release;