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

…541-add-searchbox-validation

Conflicts:
	Sources/MapboxSearch/InternalAPI/Engine/ApiType+Core.swift
	Sources/MapboxSearch/PublicAPI/Engine/ApiType.swift
	Sources/MapboxSearch/PublicAPI/MapboxSearchVersion.swift
	Sources/MapboxSearch/PublicAPI/Use Cases/Discover API/Discover.swift

.circleci/config.yml

@@ -87,7 +87,8 @@ jobs:
       - parse-release-version
       - run:
           name: Check existing public release
-          command: curl -L https://api.mapbox.com/downloads/v2/carthage/search-sdk/MapboxSearch.json | grep -v "$VERSION"
+          # Escape the quotes to check for exact versions
+          command: curl -L https://api.mapbox.com/downloads/v2/carthage/search-sdk/MapboxSearch.json | grep -v \"$VERSION\"
 
   build:
     macos:

CHANGELOG.md

@@ -8,6 +8,10 @@ Guide: https://keepachangelog.com/en/1.0.0/
 
 <!-- Add changes for active work here -->
 
+- [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.
+
+## 2.0.0-rc.1
+
 - [Discover] Fix charging station category canonical ID
 - [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.
 - [SearchUI] Rename MapboxPanelController.Configuration to .PanelConfiguration. This disambiguates PanelConfiguration from the broader Configuration struct.

Examples/SearchExamples.xcodeproj/project.pbxproj

@@ -389,7 +389,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 2.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.SearchExamples;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -408,7 +408,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 2.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.SearchExamples;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

MapboxSearch.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MapboxSearch'
-  s.version          = '2.0.0-alpha.1'
+  s.version          = '2.0.0'
   s.summary          = 'Search SDK for Mapbox Search API '
 
 # This description is used to generate tags and improve search results.

MapboxSearch.xcodeproj/project.pbxproj

@@ -3122,7 +3122,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 2.0.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxSearchDemoApplication;
@@ -3147,7 +3147,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 2.0.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxSearchDemoApplication;

MapboxSearchUI.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MapboxSearchUI'
-  s.version          = '2.0.0-alpha.1'
+  s.version          = '2.0.0'
   s.summary          = 'Search UI for Mapbox Search API'
 
 # This description is used to generate tags and improve search results.
@@ -23,5 +23,5 @@ Card style custom UI with full search functionality powered by Mapbox Search API
 
   s.vendored_frameworks = "**/#{s.name}.xcframework"
 
-  s.dependency 'MapboxSearch', "2.0.0-alpha.1"
+  s.dependency 'MapboxSearch', "2.0.0"
 end

README.md

@@ -82,8 +82,8 @@ Once you've installed the prerequisites, no additional steps are needed: Open th
 
 You can find the following documentation pages helpful:
 - [Search SDK for iOS guide](https://docs.mapbox.com/ios/search/guides/)
-- [MapboxSearch reference](https://docs.mapbox.com/ios/search/api/core/2.0.0-alpha.1/)
-- [MapboxSearchUI reference](https://docs.mapbox.com/ios/search/api/ui/2.0.0-alpha.1/)
+- [MapboxSearch reference](https://docs.mapbox.com/ios/search/api/core/2.0.0/)
+- [MapboxSearchUI reference](https://docs.mapbox.com/ios/search/api/ui/2.0.0/)
 
 ## Project structure overview
 
@@ -108,13 +108,13 @@ MapboxSearchDemoApplication provides a Demo app wih MapboxSearchUI.framework pre
 ##### MapboxSearch
 To integrate latest preview version of `MapboxSearch` into your Xcode project using CocoaPods, specify it in your `Podfile`:  
 ```
-pod 'MapboxSearch', ">= 2.0.0-alpha.1", "< 3.0"
+pod 'MapboxSearch', ">= 2.0.0", "< 3.0"
 ```
 
 ##### MapboxSearchUI
 To integrate latest preview version of `MapboxSearchUI` into your Xcode project using CocoaPods, specify it in your `Podfile`:  
 ```
-pod 'MapboxSearchUI', ">= 2.0.0-alpha.1", "< 3.0"
+pod 'MapboxSearchUI', ">= 2.0.0", "< 3.0"
 ```
 
 ### Swift Package Manager

Search Documentation.docc/Installation.md

@@ -59,7 +59,7 @@ To add the Mapbox Search SDK dependency with CocoaPods, you will need to configu
     ```ruby
     use_frameworks!
     target "TargetNameForYourApp" do
-      pod 'MapboxSearchUI', ">= 2.0.0-alpha.1", "< 3.0"
+      pod 'MapboxSearchUI', ">= 2.0.0", "< 3.0"
     end
     ```
 
@@ -68,7 +68,7 @@ To add the Mapbox Search SDK dependency with CocoaPods, you will need to configu
     ```ruby
     use_frameworks!
     target "TargetNameForYourApp" do
-      pod 'MapboxSearch', ">= 2.0.0-alpha.1", "< 3.0"
+      pod 'MapboxSearch', ">= 2.0.0", "< 3.0"
     end
     ```
 

Sources/MapboxSearch/PublicAPI/Engine/ApiType.swift

@@ -5,7 +5,6 @@ import Foundation
 /// Determine which Mapbox API to use for a SearchEngine instance
 public enum ApiType {
     /// The Mapbox Geocoding (a.k.a V5) API - https://docs.mapbox.com/api/search/geocoding/
-    @available(*, deprecated, message: "Please migrate to ApiType.searchBox. This will be removed in the next release.")
     case geocoding
 
     /// The Mapbox Single Box Search (a.k.a Federation API) - https://docs.mapbox.com/api/search/search/