bump version to 2.17.0-beta.1 and Maps SDK to 11.17.0-beta.1 (#1061)

Author: evil159

CHANGELOG.md

@@ -1,6 +1,11 @@
-### main
+### 2.17.0-beta.1
 
+  > [!NOTE]
+  > Version numbering has been updated to align with Mapbox's cross-platform SDK versioning scheme. This release skips from 2.12.0 to 2.17.0-beta.1 to synchronize with other Mapbox SDKs (version x.17.0-beta.1), ensuring consistent version numbers across all platforms.
+
+* Update Maps SDK to v11.17.0-beta.1
 * Bump Flutter SDK minimum required version to 3.27.0 and `compileSdk` to 35 on Android.
+* Fix memory leaks on Android.
 
 ### 2.12.0
 

LICENSE

@@ -1,6 +1,6 @@
 ## License
 
-Mapbox Maps for Flutter version 2.12.0
+Mapbox Maps for Flutter version 2.17.0-beta.1
 Mapbox Maps Flutter SDK
 
 Copyright © 2022 - 2025 Mapbox, Inc. All rights reserved.
@@ -134,7 +134,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ## License
 
-Mapbox Maps for iOS version 11.16.0
+Mapbox Maps for iOS version 11.17.0-beta.1
 Mapbox Maps iOS SDK
 
 Copyright © 2021 - 2025 Mapbox, Inc. All rights reserved.
@@ -165,7 +165,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ---
 
-### MapboxCoreMaps,11.16.0,Mapbox ToS,Mapbox,https://www.mapbox.com/
+### MapboxCoreMaps,11.17.0-beta.1,Mapbox ToS,Mapbox,https://www.mapbox.com/
 
 ```
 Mapbox Core Maps version 11.0
@@ -762,18 +762,20 @@ SOFTWARE.
 ### protozero,1.7.1,BSD-2-Clause,Mapbox,https://github.com/mapbox/protozero
 
 ```
-protozero copyright (c) Mapbox.
+Copyright (C) 2022, Mapbox.
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in
-      the documentation and/or other materials provided with the
-      distribution.
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
 IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -1944,7 +1946,7 @@ DEALINGS IN THE SOFTWARE.
 
 ### License
 
-Mapbox Maps for Android version 11.16.0
+Mapbox Maps for Android version 11.17.0-beta.1
 Mapbox Maps Android SDK
 
 Copyright © 2021 - 2025 Mapbox, Inc. All rights reserved.
@@ -2214,6 +2216,12 @@ License: [Chromium and built-in dependencies](https://storage.cloud.google.com/c
 
 ===========================================================================
 
+Mapbox Maps Android uses portions of the error-prone annotations.
+
+License: [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+===========================================================================
+
 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)
@@ -2222,9 +2230,17 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 
 ===========================================================================
 
+Mapbox Maps Android uses portions of the Gradle License Plugin.
+
+URL: [https://github.com/jaredsburrows/gradle-license-plugin](https://github.com/jaredsburrows/gradle-license-plugin)
+
+License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+===========================================================================
+
 Mapbox Maps Android uses portions of the Gson.
 
-License: [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+License: [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
 ===========================================================================
 
@@ -2418,15 +2434,7 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 
 ===========================================================================
 
-Mapbox Maps Android uses portions of the Gradle License Plugin.
-
-URL: [https://github.com/jaredsburrows/gradle-license-plugin](https://github.com/jaredsburrows/gradle-license-plugin)
-
-License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-### MapboxCoreMaps,11.16.0,Mapbox ToS,Mapbox,https://www.mapbox.com/
+### MapboxCoreMaps,11.17.0-beta.1,Mapbox ToS,Mapbox,https://www.mapbox.com/
 
 ```
 Mapbox Core Maps version 11.0
@@ -3082,18 +3090,20 @@ SOFTWARE.
 ### protozero,1.7.1,BSD-2-Clause,Mapbox,https://github.com/mapbox/protozero
 
 ```
-protozero copyright (c) Mapbox.
+Copyright (C) 2022, Mapbox.
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in
-      the documentation and/or other materials provided with the
-      distribution.
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
 IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

README.md

@@ -1,6 +1,6 @@
 # Mapbox Maps SDK Flutter SDK
 
-The Mapbox Maps SDK Flutter SDK is an officially developed solution from Mapbox that enables use of our latest Maps SDK product (v11.16.0). The SDK allows developers to embed highly-customized maps using a Flutter widget on Android and iOS.
+The Mapbox Maps SDK Flutter SDK is an officially developed solution from Mapbox that enables use of our latest Maps SDK product (v11.17.0-beta.1). The SDK allows developers to embed highly-customized maps using a Flutter widget on Android and iOS.
 
 Web and desktop are not supported.
 

android/build.gradle

@@ -59,7 +59,7 @@ if (file("$rootDir/gradle/ktlint.gradle").exists() && file("$rootDir/gradle/lint
 }
 
 dependencies {
-    implementation "com.mapbox.maps:android-ndk27:11.16.0"
+    implementation "com.mapbox.maps:android-ndk27:11.17.0-beta.1"
 
     implementation "androidx.annotation:annotation:1.5.0"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/EventHandler.kt

@@ -56,6 +56,11 @@ class MapboxEventHandler(
       .forEach { subscribeToEvent(it) }
   }
 
+  fun dispose() {
+    cancellables.forEach { it.cancel() }
+    cancellables.clear()
+  }
+
   override fun onMethodCall(methodCall: MethodCall, result: MethodChannel.Result) {
     if (methodCall.method == "subscribeToEvents" && methodCall.arguments is List<*>) {
       cancellables.forEach { it.cancel() }

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapController.kt

@@ -231,8 +231,16 @@ class MapboxMapController(
     return mapView
   }
 
+  private var onFlutterViewAttachedCalled = false
   override fun onFlutterViewAttached(flutterView: View) {
     super.onFlutterViewAttached(flutterView)
+
+    if (onFlutterViewAttachedCalled) {
+      return
+    }
+
+    onFlutterViewAttachedCalled = true
+
     val context = flutterView.context
     val shouldDestroyOnDestroy = when (context is FlutterActivity) {
       true -> context.shouldDestroyEngineWithHost()
@@ -245,6 +253,9 @@ class MapboxMapController(
 
   override fun onFlutterViewDetached() {
     super.onFlutterViewDetached()
+
+    onFlutterViewAttachedCalled = false
+
     lifecycleHelper?.dispose()
     lifecycleHelper = null
     mapView?.setViewTreeLifecycleOwner(null)
@@ -254,6 +265,8 @@ class MapboxMapController(
     if (mapView == null) {
       return
     }
+
+    eventHandler.dispose()
     lifecycleHelper?.dispose()
     lifecycleHelper = null
     mapView?.setViewTreeLifecycleOwner(null)

example/integration_test/map_interface_test.dart

@@ -234,15 +234,15 @@ void main() {
     await app.events.onMapIdle.future;
 
     await mapboxMap.setFeatureState(
-        'source', 'custom', 'point', json.encode({'choose': true}));
+        'source', null, 'point', json.encode({'choose': true}));
     var featureState =
-        await mapboxMap.getFeatureState('source', 'custom', 'point');
+        await mapboxMap.getFeatureState('source', null, 'point');
     var stateMap = json.decode(featureState);
     expect(stateMap.length, 1);
     expect(stateMap['choose'], true);
 
-    await mapboxMap.removeFeatureState('source', 'custom', 'point', 'choose');
-    featureState = await mapboxMap.getFeatureState('source', 'custom', 'point');
+    await mapboxMap.removeFeatureState('source', null, 'point', 'choose');
+    featureState = await mapboxMap.getFeatureState('source', null, 'point');
     stateMap = json.decode(featureState);
     expect(stateMap.length, 0);
   });

example/pubspec.lock

@@ -269,7 +269,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.12.0"
+    version: "2.17.0-beta.1"
   matcher:
     dependency: transitive
     description:

ios/mapbox_maps_flutter.podspec

@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'mapbox_maps_flutter'
-  s.version          = '2.12.0'
+  s.version          = '2.17.0-beta.1'
 
   s.summary          = 'Mapbox Maps SDK Flutter Plugin.'
   s.description      = 'An officially developed solution from Mapbox that enables use of our latest Maps SDK product.'
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.dependency 'Flutter'
   s.platform = :ios, '14.0'
 
-  s.dependency 'MapboxMaps', '11.16.0'
+  s.dependency 'MapboxMaps', '11.17.0-beta.1'
   s.dependency 'Turf', '4.0.0'
 
   # Flutter.framework does not contain a i386 slice.