Bump GL-Native to v10.16.5, Common to v23.9.0 (#2270) (#2271)

* Bump GL-Native to v10.16.5, Common to v23.9.0 * Fix unit tests
mapbox · Feb 22, 2024 · 8633237 · 8633237
1 parent b5550de
commit 8633237
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 Mapbox welcomes participation and contributions from everyone.
 
+# 10.16.5
+## Features ✨ and improvements 🏁
+
+## Bug fixes 🐞
+* Address crashes on certain Android devices by disabling the texture pool.
+* Fix snapshotter race conditions to ensure new request could effectively trigger map rendering.
+
+## Dependencies
+* Update gl-native to v10.16.5 and common to v23.9.0.
 
 # 10.16.4 January 08, 2024
 ## Features ✨ and improvements 🏁

diff --git a/LICENSE.md b/LICENSE.md
@@ -358,7 +358,7 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 
 ===========================================================================
 
-### MapboxCoreMaps,10.16.4,Mapbox ToS,Mapbox,https://www.mapbox.com/
+### MapboxCoreMaps,10.16.5,Mapbox ToS,Mapbox,https://www.mapbox.com/
 
 ```
 Mapbox Core Maps version 10.0

diff --git a/buildSrc/src/main/kotlin/Project.kt b/buildSrc/src/main/kotlin/Project.kt
@@ -115,8 +115,8 @@ object Versions {
   const val mapboxGestures = "0.9.1" // Required to support compile SDK 30
   const val mapboxJavaServices = "5.4.1"
   const val mapboxBase = "0.8.0"
-  const val mapboxGlNative = "10.16.4"
-  const val mapboxCommon = "23.8.6"
+  const val mapboxGlNative = "10.16.5"
+  const val mapboxCommon = "23.9.0"
   const val androidxCore = "1.6.0" // Latest version that supports compile SDK 30
   const val androidxFragmentTesting = "1.3.6" // Latest version that supports compile SDK 30
   const val androidxAnnotation = "1.1.0"

diff --git a/module-telemetry/src/test/java/com/mapbox/maps/module/telemetry/MapTelemetryTest.kt b/module-telemetry/src/test/java/com/mapbox/maps/module/telemetry/MapTelemetryTest.kt
@@ -76,8 +76,8 @@ class MapTelemetryTest {
     mockkStatic(EventsService::class)
     mockkStatic(TelemetryService::class)
     mockkStatic(TelemetryUtils::class)
-    every { TelemetryUtils.setEventsCollectionState(any(), any()) } returns Unit
     every { TelemetryUtils.getEventsCollectionState() } returns true
+    every { TelemetryUtils.setEventsCollectionState(any(), any()) } returns Unit
     every { TelemetryUtils.getClientServerEventsCollectionState(any()) } returns TelemetryCollectionState.ENABLED
 
     every { EventsService.getOrCreate(any()) } returns eventsService

diff --git a/sdk/src/test/java/com/mapbox/maps/MapViewTypedArrayTest.kt b/sdk/src/test/java/com/mapbox/maps/MapViewTypedArrayTest.kt
@@ -42,12 +42,16 @@ class MapViewTypedArrayTest(
     context = mockk()
     val typedArray = mockk<TypedArray>()
     val resources = mockk<Resources>()
+    val mapOptions = mockk<MapOptions>()
+    val cameraOptions = mockk<CameraOptions>()
     val displayMetrics: DisplayMetrics = mockk()
     mockkObject(ResourcesAttributeParser)
     mockkObject(MapAttributeParser)
     mockkObject(CameraAttributeParser)
     every { context.resources } returns resources
     every { resources.displayMetrics } returns displayMetrics
+    every { MapAttributeParser.parseMapOptions(any(), any()) } returns mapOptions
+    every { CameraAttributeParser.parseCameraOptions(any()) } returns cameraOptions
     every { ResourcesAttributeParser.parseResourcesOptions(any(), any()) } returns mockk()
     every { MapAttributeParser.parseMapOptions(any(), any()) } returns mockk()
     every { CameraAttributeParser.parseCameraOptions(any()) } returns mockk()

diff --git a/sdk/src/testPublic/com/mapbox/maps/MapboxMapTest.kt b/sdk/src/testPublic/com/mapbox/maps/MapboxMapTest.kt
@@ -39,7 +39,6 @@ class MapboxMapTest {
 
   @Before
   fun setUp() {
-    mockkStatic(Map::class)
     mockkStatic("com.mapbox.maps.MapboxLogger")
     every { logI(any(), any()) } just Runs
     every { Map.clearData(any(), any()) } just runs