Skip to content

Commit 67541c5

Browse files
authored
Bump GL-Native to v10.16.5, Common to v23.9.0 (#2270)
* Bump GL-Native to v10.16.5, Common to v23.9.0 * Fix unit tests
1 parent bbdc925 commit 67541c5

File tree

6 files changed

+17
-5
lines changed

6 files changed

+17
-5
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
Mapbox welcomes participation and contributions from everyone.
44

5+
# 10.16.5
6+
## Features ✨ and improvements 🏁
7+
8+
## Bug fixes 🐞
9+
* Address crashes on certain Android devices by disabling the texture pool.
10+
* Fix snapshotter race conditions to ensure new request could effectively trigger map rendering.
11+
12+
## Dependencies
13+
* Update gl-native to v10.16.5 and common to v23.9.0.
514

615
# 10.16.4 January 08, 2024
716
## Features ✨ and improvements 🏁

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
358358

359359
===========================================================================
360360

361-
### MapboxCoreMaps,10.16.4,Mapbox ToS,Mapbox,https://www.mapbox.com/
361+
### MapboxCoreMaps,10.16.5,Mapbox ToS,Mapbox,https://www.mapbox.com/
362362

363363
```
364364
Mapbox Core Maps version 10.0

buildSrc/src/main/kotlin/Project.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ object Versions {
115115
const val mapboxGestures = "0.9.1" // Required to support compile SDK 30
116116
const val mapboxJavaServices = "5.4.1"
117117
const val mapboxBase = "0.8.0"
118-
const val mapboxGlNative = "10.16.4"
119-
const val mapboxCommon = "23.8.6"
118+
const val mapboxGlNative = "10.16.5"
119+
const val mapboxCommon = "23.9.0"
120120
const val androidxCore = "1.6.0" // Latest version that supports compile SDK 30
121121
const val androidxFragmentTesting = "1.3.6" // Latest version that supports compile SDK 30
122122
const val androidxAnnotation = "1.1.0"

module-telemetry/src/test/java/com/mapbox/maps/module/telemetry/MapTelemetryTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ class MapTelemetryTest {
7676
mockkStatic(EventsService::class)
7777
mockkStatic(TelemetryService::class)
7878
mockkStatic(TelemetryUtils::class)
79-
every { TelemetryUtils.setEventsCollectionState(any(), any()) } returns Unit
8079
every { TelemetryUtils.getEventsCollectionState() } returns true
80+
every { TelemetryUtils.setEventsCollectionState(any(), any()) } returns Unit
8181
every { TelemetryUtils.getClientServerEventsCollectionState(any()) } returns TelemetryCollectionState.ENABLED
8282

8383
every { EventsService.getOrCreate(any()) } returns eventsService

sdk/src/test/java/com/mapbox/maps/MapViewTypedArrayTest.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,16 @@ class MapViewTypedArrayTest(
4242
context = mockk()
4343
val typedArray = mockk<TypedArray>()
4444
val resources = mockk<Resources>()
45+
val mapOptions = mockk<MapOptions>()
46+
val cameraOptions = mockk<CameraOptions>()
4547
val displayMetrics: DisplayMetrics = mockk()
4648
mockkObject(ResourcesAttributeParser)
4749
mockkObject(MapAttributeParser)
4850
mockkObject(CameraAttributeParser)
4951
every { context.resources } returns resources
5052
every { resources.displayMetrics } returns displayMetrics
53+
every { MapAttributeParser.parseMapOptions(any(), any()) } returns mapOptions
54+
every { CameraAttributeParser.parseCameraOptions(any()) } returns cameraOptions
5155
every { ResourcesAttributeParser.parseResourcesOptions(any(), any()) } returns mockk()
5256
every { MapAttributeParser.parseMapOptions(any(), any()) } returns mockk()
5357
every { CameraAttributeParser.parseCameraOptions(any()) } returns mockk()

sdk/src/testPublic/com/mapbox/maps/MapboxMapTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class MapboxMapTest {
3939

4040
@Before
4141
fun setUp() {
42-
mockkStatic(Map::class)
4342
mockkStatic("com.mapbox.maps.MapboxLogger")
4443
every { logI(any(), any()) } just Runs
4544
every { Map.clearData(any(), any()) } just runs

0 commit comments

Comments
 (0)