bump search sdk version to 1.0.0-beta.37 (#6436)

Author: Zayankovsky

gradle/dependencies.gradle

@@ -24,7 +24,7 @@ ext {
       mapboxCore                : '5.0.2',
       mapboxNavigator           : "${mapboxNavigatorVersion}",
       mapboxCommonNative        : '23.1.0-beta.2',
-      mapboxSearchSdk           : '1.0.0-beta.36',
+      mapboxSearchSdk           : '1.0.0-beta.37',
       mapboxCrashMonitor        : '2.0.0',
       mapboxAnnotationPlugin    : '0.8.0',
       mapboxBaseAndroid         : '0.8.0',

libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/MainActionStrip.kt

@@ -15,7 +15,7 @@ import com.mapbox.androidauto.car.search.PlaceSearchScreen
 import com.mapbox.androidauto.car.search.SearchCarContext
 import com.mapbox.androidauto.car.settings.CarSettingsScreen
 import com.mapbox.androidauto.car.settings.SettingsCarContext
-import com.mapbox.search.MapboxSearchSdk
+import com.mapbox.search.ServiceProvider
 
 class MainActionStrip(
     private val screen: Screen,
@@ -86,7 +86,7 @@ class MainActionStrip(
         .build()
 
     private fun favoritesScreen(): PlacesListOnMapScreen {
-        val placesProvider = FavoritesApi(MapboxSearchSdk.serviceProvider.favoritesDataProvider())
+        val placesProvider = FavoritesApi(ServiceProvider.INSTANCE.favoritesDataProvider())
         val feedbackPoll = mainCarContext.feedbackPollProvider
             .getSearchFeedbackPoll(mainCarContext.carContext)
         return PlacesListOnMapScreen(

libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/search/PlaceRecordMapper.kt

@@ -14,7 +14,7 @@ object PlaceRecordMapper {
             coordinate = searchResult.coordinate,
             description = searchResult.descriptionText
                 ?: mapDescriptionFromAddress(searchResult.address),
-            categories = searchResult.categories
+            categories = searchResult.categories.orEmpty(),
         )
     }
 

libnavui-androidauto/src/main/java/com/mapbox/androidauto/internal/car/search/CarPlaceSearchImpl.kt

@@ -3,10 +3,8 @@ package com.mapbox.androidauto.internal.car.search
 import com.mapbox.androidauto.car.search.CarPlaceSearchOptions
 import com.mapbox.androidauto.internal.logAndroidAuto
 import com.mapbox.androidauto.internal.logAndroidAutoFailure
-import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.search.ApiType
-import com.mapbox.search.MapboxSearchSdk
 import com.mapbox.search.ResponseInfo
 import com.mapbox.search.SearchEngine
 import com.mapbox.search.SearchEngineSettings
@@ -21,7 +19,6 @@ import kotlin.coroutines.resume
 /**
  * Default implementation of the [CarPlaceSearch].
  */
-@OptIn(ExperimentalPreviewMapboxNavigationAPI::class)
 class CarPlaceSearchImpl(
     private val options: CarPlaceSearchOptions,
     private val locationProvider: CarSearchLocationProvider,
@@ -31,7 +28,7 @@ class CarPlaceSearchImpl(
 
     override fun onAttached(mapboxNavigation: MapboxNavigation) {
         locationProvider.onAttached(mapboxNavigation)
-        searchEngine = MapboxSearchSdk.createSearchEngineWithBuiltInDataProviders(
+        searchEngine = SearchEngine.createSearchEngineWithBuiltInDataProviders(
             apiType = ApiType.SBS,
             settings = SearchEngineSettings(
                 options.accessToken

libnavui-androidauto/src/test/java/com/mapbox/androidauto/internal/car/search/CarPlaceSearchImplTest.kt

@@ -4,14 +4,13 @@ import com.mapbox.androidauto.car.search.CarPlaceSearchOptions
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.testing.LoggingFrontendTestRule
 import com.mapbox.navigation.testing.MainCoroutineRule
-import com.mapbox.search.MapboxSearchSdk
 import com.mapbox.search.SearchEngine
 import com.mapbox.search.SearchEngineSettings
 import com.mapbox.search.SearchSelectionCallback
 import com.mapbox.search.SearchSuggestionsCallback
 import io.mockk.every
 import io.mockk.mockk
-import io.mockk.mockkStatic
+import io.mockk.mockkObject
 import io.mockk.slot
 import io.mockk.unmockkAll
 import io.mockk.verify
@@ -42,9 +41,9 @@ class CarPlaceSearchImplTest {
 
     @Before
     fun setup() {
-        mockkStatic(MapboxSearchSdk::class)
+        mockkObject(SearchEngine)
         every {
-            MapboxSearchSdk.createSearchEngineWithBuiltInDataProviders(
+            SearchEngine.createSearchEngineWithBuiltInDataProviders(
                 any(),
                 any(),
                 any(),
@@ -94,7 +93,7 @@ class CarPlaceSearchImplTest {
     fun `onAttached will create search engine with options access token`() {
         val settingsSlot = slot<SearchEngineSettings>()
         every {
-            MapboxSearchSdk.createSearchEngineWithBuiltInDataProviders(
+            SearchEngine.createSearchEngineWithBuiltInDataProviders(
                 any(),
                 capture(settingsSlot),
                 any(),
@@ -112,7 +111,7 @@ class CarPlaceSearchImplTest {
     fun `onAttached will create search engine with navigation access token when option is null`() {
         val settingsSlot = slot<SearchEngineSettings>()
         every {
-            MapboxSearchSdk.createSearchEngineWithBuiltInDataProviders(
+            SearchEngine.createSearchEngineWithBuiltInDataProviders(
                 any(),
                 capture(settingsSlot),
                 any(),