Merge branch 'main' into df-searchv2-ndk27-example

Author: DzmitryFomchyn

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog for the Mapbox Search SDK for Android
 
+## 2.15.0
+
+### New features
+- Added serialization of the `SearchResultMetadata.rating` value for the `HistoryRecord`.
+
+### Mapbox dependencies
+- Search Native SDK `2.15.0`
+- Common SDK `24.15.0`
+- Maps SDK `11.15.0`
+
+
+
 ## 2.15.0-rc.1
 
 ### New features

MapboxSearch/gradle.properties

@@ -21,7 +21,7 @@ android.enableJetifier=false
 kotlin.code.style=official
 
 # SDK version attributes
-VERSION_NAME=2.15.0-rc.1
+VERSION_NAME=2.15.0
 
 # Artifact attributes
 mapboxArtifactUserOrg=mapbox

MapboxSearch/gradle/versions.gradle

@@ -44,9 +44,9 @@ ext {
 
     version = [
             // Mapbox
-            mapboxSearchNative      : '2.15.0-rc.1',
-            mapboxCommon            : '24.15.0-rc.1',
-            mapboxMaps              : '11.15.0-rc.1',
+            mapboxSearchNative      : '2.15.0',
+            mapboxCommon            : '24.15.0',
+            mapboxMaps              : '11.15.0',
             mapboxTurf              : '6.15.0',
             mapboxBase              : '0.8.0',
             mapboxTestDsl           : '0.1.5',

MapboxSearch/sdk/src/main/java/com/mapbox/search/utils/serialization/SearchResultMetadataDAO.kt

@@ -1,6 +1,7 @@
 package com.mapbox.search.utils.serialization
 
 import com.google.gson.annotations.SerializedName
+import com.mapbox.annotation.MapboxExperimental
 import com.mapbox.search.SearchResultMetadata
 
 internal data class SearchResultMetadataDAO(
@@ -14,12 +15,14 @@ internal data class SearchResultMetadataDAO(
     @SerializedName("otherPhotos") val otherPhotos: List<ImageInfoDAO>? = null,
     @SerializedName("openHours") val openHours: OpenHoursDAO? = null,
     @SerializedName("parking") val parking: ParkingDataDAO? = null,
-    @SerializedName("cpsJson") val cpsJson: String? = null
+    @SerializedName("cpsJson") val cpsJson: String? = null,
+    @SerializedName("rating") val rating: Float? = null,
 ) : DataAccessObject<SearchResultMetadata?> {
 
     override val isValid: Boolean
         get() = openHours?.isValid != false && parking?.isValid != false
 
+    @OptIn(MapboxExperimental::class)
     override fun createData(): SearchResultMetadata? {
         val validPrimaryPhotos = primaryPhotos?.filter { it.isValid }?.map { it.createData() }
         val validOtherPhotos = otherPhotos?.filter { it.isValid }?.map { it.createData() }
@@ -37,7 +40,8 @@ internal data class SearchResultMetadataDAO(
                 otherPhotos = validOtherPhotos,
                 openHours = openHours?.createData(),
                 parking = parking?.createData(),
-                cpsJson = cpsJson
+                cpsJson = cpsJson,
+                rating = rating,
             )
         }
     }
@@ -57,7 +61,8 @@ internal data class SearchResultMetadataDAO(
                     otherPhotos = otherPhotos?.map { ImageInfoDAO.create(it) },
                     openHours = OpenHoursDAO.create(openHours),
                     parking = ParkingDataDAO.create(parking),
-                    cpsJson = cpsJson
+                    cpsJson = cpsJson,
+                    rating = rating,
                 )
             }
         }