Skip to content

Commit 49a1b26

Browse files
dfeinzimerdfeinzimer
authored
Merge pull request #978 from Esri/v.next
Merge `v.next` into `main`
2 parents 27259c3 + 15e6b01 commit 49a1b26

File tree

214 files changed

+4615
-1562
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+4615
-1562
lines changed

‎.spi.yml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version: 1
2+
external_links:
3+
documentation: "https://developers.arcgis.com/swift/toolkit-api-reference/documentation/arcgistoolkit/"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1530"
3+
LastUpgradeVersion = "1600"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎AuthenticationExample/AuthenticationExample.xcodeproj/project.pbxproj

+17-11
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 55;
6+
objectVersion = 77;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -133,22 +133,22 @@
133133
attributes = {
134134
BuildIndependentTargetsInParallel = 1;
135135
LastSwiftUpdateCheck = 1320;
136-
LastUpgradeCheck = 1530;
136+
LastUpgradeCheck = 1600;
137137
TargetAttributes = {
138138
88AD13742834355000500B2E = {
139139
CreatedOnToolsVersion = 13.2.1;
140140
};
141141
};
142142
};
143143
buildConfigurationList = 88AD13702834355000500B2E /* Build configuration list for PBXProject "AuthenticationExample" */;
144-
compatibilityVersion = "Xcode 13.0";
145144
developmentRegion = en;
146145
hasScannedForEncodings = 0;
147146
knownRegions = (
148147
en,
149148
Base,
150149
);
151150
mainGroup = 88AD136C2834355000500B2E;
151+
preferredProjectObjectVersion = 77;
152152
productRefGroup = 88AD13762834355000500B2E /* Products */;
153153
projectDirPath = "";
154154
projectRoot = "";
@@ -270,6 +270,7 @@
270270
SDKROOT = iphoneos;
271271
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
272272
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
273+
SWIFT_VERSION = 6.0;
273274
};
274275
name = Debug;
275276
};
@@ -325,6 +326,7 @@
325326
SDKROOT = iphoneos;
326327
SWIFT_COMPILATION_MODE = wholemodule;
327328
SWIFT_OPTIMIZATION_LEVEL = "-O";
329+
SWIFT_VERSION = 6.0;
328330
VALIDATE_PRODUCT = YES;
329331
};
330332
name = Release;
@@ -351,16 +353,18 @@
351353
"$(inherited)",
352354
"@executable_path/Frameworks",
353355
);
354-
MARKETING_VERSION = 200.5.0;
356+
MARKETING_VERSION = 200.6.0;
355357
PRODUCT_BUNDLE_IDENTIFIER = com.esri.Authentication;
356358
PRODUCT_NAME = "$(TARGET_NAME)";
357-
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
359+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
358360
SUPPORTS_MACCATALYST = YES;
359361
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
362+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
360363
SWIFT_EMIT_LOC_STRINGS = YES;
361364
SWIFT_STRICT_CONCURRENCY = complete;
362-
SWIFT_VERSION = 5.0;
363-
TARGETED_DEVICE_FAMILY = "1,2";
365+
SWIFT_VERSION = 6.0;
366+
TARGETED_DEVICE_FAMILY = "1,2,7";
367+
XROS_DEPLOYMENT_TARGET = 2.0;
364368
};
365369
name = Debug;
366370
};
@@ -386,16 +390,18 @@
386390
"$(inherited)",
387391
"@executable_path/Frameworks",
388392
);
389-
MARKETING_VERSION = 200.5.0;
393+
MARKETING_VERSION = 200.6.0;
390394
PRODUCT_BUNDLE_IDENTIFIER = com.esri.Authentication;
391395
PRODUCT_NAME = "$(TARGET_NAME)";
392-
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
396+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
393397
SUPPORTS_MACCATALYST = YES;
394398
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
399+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
395400
SWIFT_EMIT_LOC_STRINGS = YES;
396401
SWIFT_STRICT_CONCURRENCY = complete;
397-
SWIFT_VERSION = 5.0;
398-
TARGETED_DEVICE_FAMILY = "1,2";
402+
SWIFT_VERSION = 6.0;
403+
TARGETED_DEVICE_FAMILY = "1,2,7";
404+
XROS_DEPLOYMENT_TARGET = 2.0;
399405
};
400406
name = Release;
401407
};

‎AuthenticationExample/AuthenticationExample/HomeView.swift

+9-7
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,24 @@ struct HomeView: View {
2525

2626
var body: some View {
2727
if let portal = portal {
28-
NavigationStack {
28+
NavigationSplitView {
2929
WebMapsView(portal: portal)
3030
.toolbar {
31-
ToolbarItem(placement: .navigationBarTrailing) {
31+
ToolbarItem(placement: .topBarTrailing) {
3232
Button {
3333
showProfile = true
3434
} label: {
3535
Image(systemName: "person.circle")
3636
}
37+
.sheet(isPresented: $showProfile) {
38+
ProfileView(portal: portal) {
39+
self.portal = nil
40+
}
41+
}
3742
}
3843
}
39-
.sheet(isPresented: $showProfile) {
40-
ProfileView(portal: portal) {
41-
self.portal = nil
42-
}
43-
}
44+
} detail: {
45+
Text("No Webmap Selected")
4446
}
4547
} else {
4648
SignInView(portal: $portal)

‎AuthenticationExample/AuthenticationExample/LoadableImageView.swift

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import SwiftUI
1818
/// A view that loads a `LoadableImage` and displays it.
1919
/// While the image is loading a progress view is displayed.
2020
/// If there is an error displaying the image a red exclamation circle is displayed.
21-
@MainActor
2221
struct LoadableImageView: View {
2322
/// The loadable image to display.
2423
let loadableImage: LoadableImage

‎AuthenticationExample/AuthenticationExample/MapItemView.swift

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import ArcGIS
1616
import SwiftUI
1717

1818
/// A view that displays a map.
19-
@MainActor
2019
struct MapItemView: View {
2120
/// The map that is to be displayed.
2221
let map: Map

‎AuthenticationExample/AuthenticationExample/ProfileView.swift

+19-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import ArcGISToolkit
1717
import SwiftUI
1818

1919
/// A view that displays the profile of a user.
20-
@MainActor
2120
struct ProfileView: View {
2221
/// The portal that the user is signed in to.
2322
let portal: Portal
@@ -28,15 +27,28 @@ struct ProfileView: View {
2827
/// The closure to call once the user has signed out.
2928
var signOutAction: () -> Void
3029

30+
/// Dismisses the current presentation.
31+
@Environment(\.dismiss)
32+
private var dismiss
33+
3134
var body: some View {
32-
VStack {
33-
if let user = portal.user {
34-
UserView(user: user).padding()
35+
NavigationStack {
36+
VStack {
37+
if let user = portal.user {
38+
UserView(user: user).padding()
39+
}
40+
Spacer()
41+
signOutButton
42+
}
43+
.padding()
44+
.toolbar {
45+
ToolbarItem(placement: .topBarTrailing) {
46+
Button("Done") {
47+
dismiss()
48+
}
49+
}
3550
}
36-
Spacer()
37-
signOutButton
3851
}
39-
.padding()
4052
}
4153

4254
var signOutButton: some View {

‎AuthenticationExample/AuthenticationExample/SignInView.swift

+6-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import CryptoKit
1818
import SwiftUI
1919

2020
/// A view that allows the user to sign in to a portal.
21-
@MainActor
2221
struct SignInView: View {
2322
/// The error that occurred during an attempt to sign in.
2423
@State private var error: Error?
@@ -44,7 +43,11 @@ struct SignInView: View {
4443
ProgressView()
4544
} else {
4645
Text(URL.portal.host!)
46+
#if os(visionOS) || targetEnvironment(macCatalyst)
47+
.font(.headline)
48+
#else
4749
.font(.footnote)
50+
#endif
4851
.foregroundColor(.secondary)
4952
signInButton
5053
}
@@ -107,7 +110,9 @@ struct SignInView: View {
107110
signIn()
108111
} label: {
109112
Text(signInButtonText)
113+
#if !os(visionOS)
110114
.frame(maxWidth: .infinity)
115+
#endif
111116
}
112117
.buttonStyle(.bordered)
113118
.controlSize(.large)

‎AuthenticationExample/AuthenticationExample/UserView.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ struct UserView: View {
6565
}
6666
}
6767

68-
extension PortalUser.Role: CustomStringConvertible {
68+
extension PortalUser.Role: @retroactive CustomStringConvertible {
6969
public var description: String {
7070
switch self {
7171
case .user:

‎Examples/Examples.xcodeproj/project.pbxproj

+9-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 54;
6+
objectVersion = 77;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -199,22 +199,22 @@
199199
attributes = {
200200
BuildIndependentTargetsInParallel = YES;
201201
LastSwiftUpdateCheck = 1250;
202-
LastUpgradeCheck = 1530;
202+
LastUpgradeCheck = 1600;
203203
TargetAttributes = {
204204
E47ABE3F2652FE0900FD2FE3 = {
205205
CreatedOnToolsVersion = 12.5;
206206
};
207207
};
208208
};
209209
buildConfigurationList = E47ABE3B2652FE0900FD2FE3 /* Build configuration list for PBXProject "Examples" */;
210-
compatibilityVersion = "Xcode 9.3";
211210
developmentRegion = en;
212211
hasScannedForEncodings = 0;
213212
knownRegions = (
214213
en,
215214
Base,
216215
);
217216
mainGroup = E47ABE372652FE0900FD2FE3;
217+
preferredProjectObjectVersion = 77;
218218
productRefGroup = E47ABE412652FE0900FD2FE3 /* Products */;
219219
projectDirPath = "";
220220
projectRoot = "";
@@ -348,6 +348,7 @@
348348
SDKROOT = iphoneos;
349349
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
350350
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
351+
SWIFT_VERSION = 6.0;
351352
};
352353
name = Debug;
353354
};
@@ -403,6 +404,7 @@
403404
SDKROOT = iphoneos;
404405
SWIFT_COMPILATION_MODE = wholemodule;
405406
SWIFT_OPTIMIZATION_LEVEL = "-O";
407+
SWIFT_VERSION = 6.0;
406408
VALIDATE_PRODUCT = YES;
407409
};
408410
name = Release;
@@ -427,14 +429,14 @@
427429
"$(inherited)",
428430
"@executable_path/Frameworks",
429431
);
430-
MARKETING_VERSION = 200.5.0;
432+
MARKETING_VERSION = 200.6.0;
431433
PRODUCT_BUNDLE_IDENTIFIER = "com.esri.arcgis-swift-sdk-toolkit-examples";
432434
PRODUCT_NAME = "$(TARGET_NAME)";
433435
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
434436
SUPPORTS_MACCATALYST = YES;
435437
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
436438
SWIFT_STRICT_CONCURRENCY = complete;
437-
SWIFT_VERSION = 5.0;
439+
SWIFT_VERSION = 6.0;
438440
TARGETED_DEVICE_FAMILY = "1,2,6";
439441
};
440442
name = Debug;
@@ -459,14 +461,14 @@
459461
"$(inherited)",
460462
"@executable_path/Frameworks",
461463
);
462-
MARKETING_VERSION = 200.5.0;
464+
MARKETING_VERSION = 200.6.0;
463465
PRODUCT_BUNDLE_IDENTIFIER = "com.esri.arcgis-swift-sdk-toolkit-examples";
464466
PRODUCT_NAME = "$(TARGET_NAME)";
465467
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
466468
SUPPORTS_MACCATALYST = YES;
467469
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
468470
SWIFT_STRICT_CONCURRENCY = complete;
469-
SWIFT_VERSION = 5.0;
471+
SWIFT_VERSION = 6.0;
470472
TARGETED_DEVICE_FAMILY = "1,2,6";
471473
};
472474
name = Release;

‎Examples/Examples.xcodeproj/xcshareddata/xcschemes/Toolkit Examples.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1530"
3+
LastUpgradeVersion = "1600"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Examples/Examples/BasemapGalleryExampleView.swift

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import ArcGIS
1616
import ArcGISToolkit
1717
import SwiftUI
1818

19-
@MainActor
2019
struct BasemapGalleryExampleView: View {
2120
/// A Boolean value indicating whether the basemap gallery is presented.
2221
@State private var basemapGalleryIsPresented = false

0 commit comments

Comments
 (0)