[Port] Bump GL-Native and Common to 11.7.0-rc.2 (#2746) (#2748)

mapbox · Sep 16, 2024 · 322d938 · 322d938
1 parent 685a21e
commit 322d938
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,11 @@ Mapbox welcomes participation and contributions from everyone.
 * Fix a crash when calling `CameraAnimationsPlugin.easeTo()` with empty camera options or `CameraAnimationsPlugin.playAnimatorsSequentially()` / `CameraAnimationsPlugin.playAnimatorsTogether()` with an empty array of animators.
 * Fix ongoing animations being canceled when `CameraAnimationsPlugin.flyTo()` with empty camera options is called.
 * Fix simultaneous scale and rotation gestures not working when the first registered rotation is a scale one.
+* Fix crash on Android tilestore where null data was returned.
+* Fix the incorrect behaviour when using `SymbolLayer.symbolZOrder` property.
+* Fix retrieval of tilesets for 3d tiles in offline mode.
+* Fix rendering errors of patterns on high zoom levels.
+* Fix a bug where style changes weren't reflected after the source layer of a layer was changed.
 
 # 11.7.0-beta.1 September 03, 2024
 ## Features ✨ and improvements 🏁

diff --git a/LICENSE.md b/LICENSE.md
@@ -264,12 +264,6 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 
 ===========================================================================
 
-Mapbox Maps Android uses portions of the Cronet.
-
-License: [Chromium and built-in dependencies](https://storage.cloud.google.com/chromium-cronet/android/119.0.6045.31/Release/cronet/LICENSE)
-
-===========================================================================
-
 Mapbox Maps Android uses portions of the Experimental annotation.
 
 URL: [https://developer.android.com/jetpack/androidx/releases/annotation#1.3.0](https://developer.android.com/jetpack/androidx/releases/annotation#1.3.0)
@@ -426,30 +420,6 @@ License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENS
 
 ===========================================================================
 
-Mapbox Maps Android uses portions of the play-services-base.
-
-License: [Android Software Development Kit License](https://developer.android.com/studio/terms.html)
-
-===========================================================================
-
-Mapbox Maps Android uses portions of the play-services-basement.
-
-License: [Android Software Development Kit License](https://developer.android.com/studio/terms.html)
-
-===========================================================================
-
-Mapbox Maps Android uses portions of the play-services-cronet.
-
-License: [Android Software Development Kit License](https://developer.android.com/studio/terms.html)
-
-===========================================================================
-
-Mapbox Maps Android uses portions of the play-services-tasks.
-
-License: [Android Software Development Kit License](https://developer.android.com/studio/terms.html)
-
-===========================================================================
-
 Mapbox Maps Android uses portions of the Saved State.
 
 URL: [https://developer.android.com/jetpack/androidx/releases/savedstate#1.2.0](https://developer.android.com/jetpack/androidx/releases/savedstate#1.2.0)
@@ -474,7 +444,7 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 
 ===========================================================================
 
-### MapboxCoreMaps,11.8.0-beta.1,Mapbox ToS,Mapbox,https://www.mapbox.com/
+### MapboxCoreMaps,11.7.0-rc.2,Mapbox ToS,Mapbox,https://www.mapbox.com/
 
 ```
 Mapbox Core Maps version 10.0

diff --git a/app/src/androidTest/java/com/mapbox/maps/testapp/observable/ObservableEventsTest.kt b/app/src/androidTest/java/com/mapbox/maps/testapp/observable/ObservableEventsTest.kt
@@ -123,9 +123,8 @@ class ObservableEventsTest : BaseMapTest() {
       assertNotNull(eventData.message)
       assertNotNull(eventData.timestamp.time)
       assertEquals(MapLoadingErrorType.STYLE, eventData.type)
-      // TODO replace when v11.7.0-rc.1 will be out
       assertEquals(
-        "Failed to load style: Couldn't connect to server: Exception in CronetUrlRequest: net::ERR_NAME_NOT_RESOLVED, ErrorCode=1, InternalErrorCode=-105, Retryable=false",
+        "Failed to load style: Unable to resolve host \"wrongurl\": No address associated with hostname",
         eventData.message
       )
       latch.countDown()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@ pluginJacoco = "0.8.12"
 pluginGradle = "7.4.2"
 pluginLicense = "0.9.0"
 pluginMapboxAccessToken = "0.4.0"
-pluginMapboxSdkRegistry = "1.2.2"
+pluginMapboxSdkRegistry = "1.2.4"
 pluginMapboxSdkVersions = "1.1.3"
 pluginPitest = "0.2.8"
 pluginTaskTree = "2.1.0"
@@ -35,8 +35,8 @@ japicmp = "0.4.1"
 # Dependencies
 
 mapboxBase = "0.11.0"
-mapboxGlNative = "11.8.0-SNAPSHOT.0909T0708Z.6c22615"
-mapboxCommon = "24.8.0-SNAPSHOT.0905T1055Z.7828821"
+mapboxGlNative = "11.7.0-rc.2"
+mapboxCommon = "24.7.0-rc.2"
 mapboxGestures = "0.8.0"
 mapboxJavaServices = "5.4.1"