Merge pull request #680 from Esri/v.next

Merge `v.next` into `main`

Author: dfeinzimer

.gitattributes

@@ -30,8 +30,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/Esri/arcgis-maps-sdk-swift", .upToNextMinor(from: "200.4.0")),
-        .package(url: "https://github.com/Esri/Dejavu", .upToNextMinor(from: "1.0.0"))
+        .package(url: "https://github.com/Esri/arcgis-maps-sdk-swift", .upToNextMinor(from: "200.4.0"))
     ],
     targets: [
         .target(
@@ -45,7 +44,7 @@ let package = Package(
         ),
         .testTarget(
             name: "ArcGISToolkitTests",
-            dependencies: ["ArcGISToolkit", "Dejavu"]
+            dependencies: ["ArcGISToolkit"]
         )
     ]
 )

Package.swift

@@ -17,7 +17,7 @@ import SwiftUI
 import XCTest
 @testable import ArcGISToolkit
 
-final class BookmarksTests: DejavuTestCase {
+final class BookmarksTests: XCTestCase {
     /// Asserts that the list properly handles a selection when provided a modifier.
     func testSelectBookmarkWithModifier() {
         let expectation = XCTestExpectation(

Tests/ArcGISToolkitTests/BookmarksTests.swift

@@ -19,7 +19,7 @@ import XCTest
 @testable import ArcGISToolkit
 
 @MainActor
-final class FloorFilterViewModelTests: DejavuTestCase {
+final class FloorFilterViewModelTests: XCTestCase {
     /// Confirms that the selected site/facility/level properties and the viewpoint are correctly updated.
     func testAutoSelectAlways() async throws {
         let floorManager = try await floorManager(

Tests/ArcGISToolkitTests/FloorFilterViewModelTests.swift

@@ -16,7 +16,7 @@ import XCTest
 import ArcGIS
 import ArcGISToolkit
 
-final class LocatorSearchSourceTests: DejavuTestCase {
+final class LocatorSearchSourceTests: XCTestCase {
     func testMaximumResults() async throws {
         let locator = LocatorSearchSource()
         locator.maximumResults = 4

Tests/ArcGISToolkitTests/LocatorSearchSourceTests.swift

@@ -17,7 +17,7 @@ import ArcGIS
 @testable import ArcGISToolkit
 
 @MainActor
-class SearchViewModelTests: DejavuTestCase {
+class SearchViewModelTests: XCTestCase {
     func testAcceptSuggestion() async throws {
         let model = SearchViewModel(sources: [LocatorSearchSource()])
         model.currentQuery = "Magers & Quinn Booksellers"

Tests/ArcGISToolkitTests/SearchViewModelTests.swift

@@ -16,7 +16,7 @@ import XCTest
 import ArcGIS
 import ArcGISToolkit
 
-final class SmartLocatorSearchSourceTests: DejavuTestCase {
+final class SmartLocatorSearchSourceTests: XCTestCase {
     func testRepeatSearchResultThreshold() async throws {
         let locator = SmartLocatorSearchSource()