Update versions for 2.6.1, include layer updates (#876)

* Update versions for 2.6.1, include layer updates

* Move to SPM

---------

Co-authored-by: Release SDK bot for Maps SDK team <[email protected]>

Author: pjleonard37

CHANGELOG.md

@@ -1,5 +1,16 @@
-### 2.6.0
+### 2.6.1
+
+* Update Maps SDK to 11.10.1 (iOS) and 11.10.2 (Android), introducing several bug fixes: 
+  * Fix LUT not being applied to in-place updated images.
+  * Fix in-place updates for SDF images.
+  * Fix background layer not being updated if raster image was updated in-place or if color theme changed.
+  * Vector icons supported in location indicator layer.
+    * Important: `top-image`, `bearing-image`, and `shadow-image` properties on LocationIndicatorLayer are now paint properties instead of layout properties.
+  * Fix mipmaps for images updated in place.
+  * Ensure background color is correctly set.
+  * Fixing missing vector images after style change
 
+### 2.6.0
 
 > [!IMPORTANT]
 > The iOS minimum deployment target is now iOS 14.0.

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.10.0-rc.1). 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.10.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:11.10.0"
+    implementation "com.mapbox.maps:android:11.10.2"
 
     implementation "androidx.annotation:annotation:1.5.0"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"

example/integration_test/style/layer/location_indicator_layer_test.dart

@@ -19,13 +19,11 @@ void main() {
       minZoom: 1.0,
       maxZoom: 20.0,
       slot: LayerSlot.BOTTOM,
-      bearingImage: "abc",
-      shadowImage: "abc",
-      topImage: "abc",
       accuracyRadius: 1.0,
       accuracyRadiusBorderColor: Colors.red.value,
       accuracyRadiusColor: Colors.red.value,
       bearing: 1.0,
+      bearingImage: "abc",
       bearingImageSize: 1.0,
       emphasisCircleColor: Colors.red.value,
       emphasisCircleGlowRange: [0.0, 1.0],
@@ -34,7 +32,9 @@ void main() {
       location: [0.0, 1.0, 2.0],
       locationIndicatorOpacity: 1.0,
       perspectiveCompensation: 1.0,
+      shadowImage: "abc",
       shadowImageSize: 1.0,
+      topImage: "abc",
       topImageSize: 1.0,
     ));
     var layer =
@@ -43,13 +43,11 @@ void main() {
     expect(layer.maxZoom, 20);
     expect(layer.slot, LayerSlot.BOTTOM);
     expect(layer.visibility, Visibility.NONE);
-    expect(layer.bearingImage, "abc");
-    expect(layer.shadowImage, "abc");
-    expect(layer.topImage, "abc");
     expect(layer.accuracyRadius, 1.0);
     expect(layer.accuracyRadiusBorderColor, Colors.red.value);
     expect(layer.accuracyRadiusColor, Colors.red.value);
     expect(layer.bearing, 1.0);
+    expect(layer.bearingImage, "abc");
     expect(layer.bearingImageSize, 1.0);
     expect(layer.emphasisCircleColor, Colors.red.value);
     expect(layer.emphasisCircleGlowRange, [0.0, 1.0]);
@@ -58,7 +56,9 @@ void main() {
     expect(layer.location, [0.0, 1.0, 2.0]);
     expect(layer.locationIndicatorOpacity, 1.0);
     expect(layer.perspectiveCompensation, 1.0);
+    expect(layer.shadowImage, "abc");
     expect(layer.shadowImageSize, 1.0);
+    expect(layer.topImage, "abc");
     expect(layer.topImageSize, 1.0);
   });
 
@@ -79,13 +79,11 @@ void main() {
       minZoom: 1.0,
       maxZoom: 20.0,
       slot: LayerSlot.BOTTOM,
-      bearingImageExpression: ['image', "abc"],
-      shadowImageExpression: ['image', "abc"],
-      topImageExpression: ['image', "abc"],
       accuracyRadiusExpression: ['number', 1.0],
       accuracyRadiusBorderColorExpression: ['rgba', 255, 0, 0, 1],
       accuracyRadiusColorExpression: ['rgba', 255, 0, 0, 1],
       bearingExpression: ['number', 1.0],
+      bearingImageExpression: ['image', "abc"],
       bearingImageSizeExpression: ['number', 1.0],
       emphasisCircleColorExpression: ['rgba', 255, 0, 0, 1],
       emphasisCircleGlowRangeExpression: [
@@ -100,7 +98,9 @@ void main() {
       ],
       locationIndicatorOpacityExpression: ['number', 1.0],
       perspectiveCompensationExpression: ['number', 1.0],
+      shadowImageExpression: ['image', "abc"],
       shadowImageSizeExpression: ['number', 1.0],
+      topImageExpression: ['image', "abc"],
       topImageSizeExpression: ['number', 1.0],
     ));
     var layer =
@@ -114,13 +114,11 @@ void main() {
       ["get", "type"],
       "Feature"
     ]);
-    expect(layer.bearingImageExpression, ['image', "abc"]);
-    expect(layer.shadowImageExpression, ['image', "abc"]);
-    expect(layer.topImageExpression, ['image', "abc"]);
     expect(layer.accuracyRadius, 1.0);
     expect(layer.accuracyRadiusBorderColorExpression, ['rgba', 255, 0, 0, 1]);
     expect(layer.accuracyRadiusColorExpression, ['rgba', 255, 0, 0, 1]);
     expect(layer.bearing, 1.0);
+    expect(layer.bearingImageExpression, ['image', "abc"]);
     expect(layer.bearingImageSize, 1.0);
     expect(layer.emphasisCircleColorExpression, ['rgba', 255, 0, 0, 1]);
     expect(layer.emphasisCircleGlowRange, [0.0, 1.0]);
@@ -129,7 +127,9 @@ void main() {
     expect(layer.location, [0.0, 1.0, 2.0]);
     expect(layer.locationIndicatorOpacity, 1.0);
     expect(layer.perspectiveCompensation, 1.0);
+    expect(layer.shadowImageExpression, ['image', "abc"]);
     expect(layer.shadowImageSize, 1.0);
+    expect(layer.topImageExpression, ['image', "abc"]);
     expect(layer.topImageSize, 1.0);
   });
 }

example/ios/Runner.xcodeproj/project.pbxproj

@@ -241,7 +241,7 @@
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			packageReferences = (
-				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
 			);
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
 			projectDirPath = "";
@@ -768,7 +768,7 @@
 /* End XCConfigurationList section */
 
 /* Begin XCLocalSwiftPackageReference section */
-		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
 		};

example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.dependency 'Flutter'
   s.platform = :ios, '14.0'
 
-  s.dependency 'MapboxMaps', '~> 11.10.0'
+  s.dependency 'MapboxMaps', '11.10.1'
   s.dependency 'Turf', '4.0.0'
 
   # Flutter.framework does not contain a i386 slice.

example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -12,7 +12,7 @@ let package = Package(
         .library(name: "mapbox-maps-flutter", targets: ["mapbox_maps_flutter"])
     ],
     dependencies: [
-        .package(url: "https://github.com/mapbox/mapbox-maps-ios.git", exact: "11.10.0"),
+        .package(url: "https://github.com/mapbox/mapbox-maps-ios.git", exact: "11.10.1"),
     ],
     targets: [
         .target(