Merge branch 'main' of github.com:mapbox/mapbox-search-ios into SSDK-…

…541-add-searchbox-validation

.circleci/config.yml

@@ -106,7 +106,7 @@ jobs:
           command: make dependencies
       - run:
           name: Test frameworks
-          command: make ci-dev-test
+          command: make ci-full-test
       - run: make codecov
       - run:
           name: Prepare artifacts

CHANGELOG.md

@@ -8,12 +8,16 @@ Guide: https://keepachangelog.com/en/1.0.0/
 
 <!-- Add changes for active work here -->
 
-- [Discover] Add support for country, proximity, and origin parameters in Discover.Options search parameters. This fixes an issue when using search-along-route to query category results.
 
-- [SearchUI] Add `distanceFormatter` field to Configuration to support changing the search suggestions distance format. Nil values will use the default behavior.
+- [License] Update license to reflect 2024 usage
 
-- [Core] Add xcprivacy for MapboxSearch and MapboxSearchUI
+- [Tests] Change MockResponse into a protocol, create separate enums conforming to MockResponse for each API type (geocoding, sbs, autofill), add MockResponse as generic to each test base class and MockWebServer.
+
+## 2.0.0-rc.2
 
+- [Discover] Add support for country, proximity, and origin parameters in Discover.Options search parameters. This fixes an issue when using search-along-route to query category results.
+- [SearchUI] Add `distanceFormatter` field to Configuration to support changing the search suggestions distance format. Nil values will use the default behavior.
+- [Core] Add xcprivacy for MapboxSearch and MapboxSearchUI
 - [SearchUI] Update Maki icons to all SVG, latest versions from https://github.com/mapbox/maki
 - [SearchUI] Remove all custom Maki icons
 - [Unit Tests] Update and correct tests for iOS 17 using all mocked data.
@@ -23,6 +27,8 @@ Guide: https://keepachangelog.com/en/1.0.0/
 - [Core] Remove Swifter library dependency from MapboxSearch target (only used in Test targets)
 - [Core] Change AbstractSearchEngine.init `supportSBS: Bool = false` parameter to `apiType: ApiType = .SBS`. This changes the default API engine for discover/category and other API requests to SBS. Add ApiType enum to represent non-Autofill and non-PlaceAutocomplete SearchEngine API types.
 
+**MapboxCoreSearch**: v2.0.0-alpha.13
+
 ## 2.0.0-rc.1
 
 - [Discover] Fix charging station category canonical ID

Cartfile

@@ -1,2 +1,2 @@
-binary "https://api.mapbox.com/downloads/v2/carthage/search-core-sdk/MapboxCoreSearch.xcframework.json" == 2.0.0-alpha.9
+binary "https://api.mapbox.com/downloads/v2/carthage/search-core-sdk/MapboxCoreSearch.xcframework.json" == 2.0.0-alpha.13
 binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 24.0.0

Cartfile.resolved

@@ -1,2 +1,2 @@
 binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "24.0.0"
-binary "https://api.mapbox.com/downloads/v2/carthage/search-core-sdk/MapboxCoreSearch.xcframework.json" "2.0.0-alpha.9"
+binary "https://api.mapbox.com/downloads/v2/carthage/search-core-sdk/MapboxCoreSearch.xcframework.json" "2.0.0-alpha.13"

Examples/SearchExamples.xcodeproj/project.pbxproj

@@ -23,7 +23,6 @@
 		FE849B5626FC9E63001CBC27 /* ExamplesTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE849B5526FC9E63001CBC27 /* ExamplesTableViewController.swift */; };
 		FE849B5A26FCBCEC001CBC27 /* MapsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE849B5926FCBCEC001CBC27 /* MapsViewController.swift */; };
 		FEF1D1BA26FDF642004AE229 /* TextViewLoggerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEF1D1B926FDF642004AE229 /* TextViewLoggerViewController.swift */; };
-		FEF1D1BD26FDFB1F004AE229 /* Atlantis in Frameworks */ = {isa = PBXBuildFile; productRef = FEF1D1BC26FDFB1F004AE229 /* Atlantis */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -54,7 +53,6 @@
 				047D759E2B5850DB005182A3 /* MapboxSearch in Frameworks */,
 				047D75A02B5850DB005182A3 /* MapboxSearchUI in Frameworks */,
 				04F0A1612B4F276D0097D316 /* MapboxMaps in Frameworks */,
-				FEF1D1BD26FDFB1F004AE229 /* Atlantis in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -150,7 +148,6 @@
 			);
 			name = SearchExamples;
 			packageProductDependencies = (
-				FEF1D1BC26FDFB1F004AE229 /* Atlantis */,
 				04F0A1602B4F276D0097D316 /* MapboxMaps */,
 				047D759D2B5850DB005182A3 /* MapboxSearch */,
 				047D759F2B5850DB005182A3 /* MapboxSearchUI */,
@@ -184,7 +181,6 @@
 			);
 			mainGroup = FE114A9B24C10B88001B2CE8;
 			packageReferences = (
-				FEF1D1BB26FDFB1F004AE229 /* XCRemoteSwiftPackageReference "atlantis" */,
 				04F0A15F2B4F276D0097D316 /* XCRemoteSwiftPackageReference "mapbox-maps-ios" */,
 			);
 			productRefGroup = FE114AA524C10B88001B2CE8 /* Products */;
@@ -448,14 +444,6 @@
 				minimumVersion = 11.0.0;
 			};
 		};
-		FEF1D1BB26FDFB1F004AE229 /* XCRemoteSwiftPackageReference "atlantis" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/ProxymanApp/atlantis";
-			requirement = {
-				kind = upToNextMinorVersion;
-				minimumVersion = 1.23.0;
-			};
-		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -472,11 +460,6 @@
 			package = 04F0A15F2B4F276D0097D316 /* XCRemoteSwiftPackageReference "mapbox-maps-ios" */;
 			productName = MapboxMaps;
 		};
-		FEF1D1BC26FDFB1F004AE229 /* Atlantis */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = FEF1D1BB26FDFB1F004AE229 /* XCRemoteSwiftPackageReference "atlantis" */;
-			productName = Atlantis;
-		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = FE114A9C24C10B88001B2CE8 /* Project object */;

Examples/SearchExamples.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,15 +1,6 @@
 {
   "object": {
     "pins": [
-      {
-        "package": "Atlantis",
-        "repositoryURL": "https://github.com/ProxymanApp/atlantis",
-        "state": {
-          "branch": null,
-          "revision": "131d757cf8e6e368ad338728379174f7cfff9326",
-          "version": "1.23.0"
-        }
-      },
       {
         "package": "CwlCatchException",
         "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",

Examples/SearchExamples/AppDelegate.swift

@@ -1,4 +1,3 @@
-import Atlantis
 import UIKit
 
 @main
@@ -17,8 +16,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         window?.rootViewController = navigationController
         window?.makeKeyAndVisible()
 
-        Atlantis.start()
-
         return true
     }
 }

Examples/SearchExamples/Info.plist

@@ -24,8 +24,6 @@
 	<array>
 		<string>_Proxyman._tcp</string>
 	</array>
-	<key>NSLocalNetworkUsageDescription</key>
-	<string>Atlantis would use Bonjour Service to discover Proxyman app from your local network.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Improve search results</string>
 	<key>UILaunchStoryboardName</key>