From 9ec71a640e450892bffdf3773b799bd29c7f286b Mon Sep 17 00:00:00 2001
From: Hari07 <22373191+Hari-07@users.noreply.github.com>
Date: Mon, 9 Jun 2025 17:48:10 +0400
Subject: [PATCH 01/10] All platform implementation changes from the main PR

---
 .../google_maps_flutter_android/CHANGELOG.md   |  4 ++++
 .../integration_test/google_maps_tests.dart    |  1 +
 .../example/pubspec.yaml                       |  4 ++--
 .../google_maps_flutter_android/pubspec.yaml   |  8 ++++----
 .../google_maps_flutter_ios/CHANGELOG.md       |  3 ++-
 .../example/ios14/pubspec.yaml                 |  4 ++--
 .../example/ios15/pubspec.yaml                 |  4 ++--
 .../maps_example_dart/lib/place_marker.dart    |  4 ++--
 .../shared/maps_example_dart/pubspec.yaml      |  4 ++--
 .../google_maps_flutter_ios/pubspec.yaml       |  6 +++---
 .../google_maps_flutter_web/CHANGELOG.md       |  3 ++-
 .../example/integration_test/markers_test.dart | 15 +++++++++++++++
 .../example/pubspec.yaml                       |  4 ++--
 .../lib/src/convert.dart                       | 18 ++++++++++++++----
 .../google_maps_flutter_web/pubspec.yaml       |  8 ++++----
 15 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md
index 6071bc8027f..deb12b0f615 100644
--- a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md
+++ b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.16.2
+
+* Deprecates `zIndex` parameter in Marker in favor of `zIndexInt`.
+
 ## 2.16.1
 
 * Removes obsolete code related to supporting SDK <21.
diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/integration_test/google_maps_tests.dart b/packages/google_maps_flutter/google_maps_flutter_android/example/integration_test/google_maps_tests.dart
index 952c381df53..4f54bfa1cc1 100644
--- a/packages/google_maps_flutter/google_maps_flutter_android/example/integration_test/google_maps_tests.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_android/example/integration_test/google_maps_tests.dart
@@ -2009,6 +2009,7 @@ Marker _copyMarkerWithClusterManagerId(
     position: marker.position,
     rotation: marker.rotation,
     visible: marker.visible,
+    // The deprecated parameter is used here to avoid losing precision.
     zIndex: marker.zIndex,
     onTap: marker.onTap,
     onDragStart: marker.onDragStart,
diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml
index 46b41e3f9f4..b57b2cda04b 100644
--- a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: none
 
 environment:
   sdk: ^3.6.0
-  flutter: ">=3.27.0"
+  flutter: '>=3.27.0'
 
 dependencies:
   cupertino_icons: ^1.0.5
@@ -18,7 +18,7 @@ dependencies:
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../
-  google_maps_flutter_platform_interface: ^2.11.0
+  google_maps_flutter_platform_interface: ^2.12.1
 
 dev_dependencies:
   build_runner: ^2.1.10
diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml
index 84779722eb1..a279776c788 100644
--- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml
@@ -2,11 +2,11 @@ name: google_maps_flutter_android
 description: Android implementation of the google_maps_flutter plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
-version: 2.16.1
+version: 2.16.2
 
 environment:
   sdk: ^3.6.0
-  flutter: ">=3.27.0"
+  flutter: '>=3.27.0'
 
 flutter:
   plugin:
@@ -21,7 +21,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_plugin_android_lifecycle: ^2.0.1
-  google_maps_flutter_platform_interface: ^2.11.0
+  google_maps_flutter_platform_interface: ^2.12.1
   stream_transform: ^2.0.0
 
 dev_dependencies:
@@ -30,7 +30,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   mockito: ^5.4.4
-  pigeon: ^22.6.0
+  pigeon: ^22.7.4
   plugin_platform_interface: ^2.1.7
 
 topics:
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md
index faa4b3b62a9..0339b8535ca 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md
@@ -1,5 +1,6 @@
-## NEXT
+## 2.15.3
 
+* Deprecates `zIndex` parameter in Marker in favor of `zIndexInt`.
 * Updates minimum supported SDK version to Flutter 3.27/Dart 3.6.
 
 ## 2.15.2
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/pubspec.yaml
index 55e93119742..f401f526133 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: none
 
 environment:
   sdk: ^3.6.0
-  flutter: ">=3.27.0"
+  flutter: '>=3.27.0'
 
 dependencies:
   cupertino_icons: ^1.0.5
@@ -18,7 +18,7 @@ dependencies:
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../../
-  google_maps_flutter_platform_interface: ^2.11.0
+  google_maps_flutter_platform_interface: ^2.12.1
   maps_example_dart:
     path: ../shared/maps_example_dart/
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/pubspec.yaml
index 55e93119742..f401f526133 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: none
 
 environment:
   sdk: ^3.6.0
-  flutter: ">=3.27.0"
+  flutter: '>=3.27.0'
 
 dependencies:
   cupertino_icons: ^1.0.5
@@ -18,7 +18,7 @@ dependencies:
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../../
-  google_maps_flutter_platform_interface: ^2.11.0
+  google_maps_flutter_platform_interface: ^2.12.1
   maps_example_dart:
     path: ../shared/maps_example_dart/
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/lib/place_marker.dart b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/lib/place_marker.dart
index d282602d8dc..4291aec8c15 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/lib/place_marker.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/lib/place_marker.dart
@@ -269,10 +269,10 @@ class PlaceMarkerBodyState extends State<PlaceMarkerBody> {
 
   Future<void> _changeZIndex(MarkerId markerId) async {
     final Marker marker = markers[markerId]!;
-    final double current = marker.zIndex;
+    final int current = marker.zIndexInt;
     setState(() {
       markers[markerId] = marker.copyWith(
-        zIndexParam: current == 12.0 ? 0.0 : current + 1.0,
+        zIndexIntParam: current == 12 ? 0 : current + 1,
       );
     });
   }
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml
index ccfab1b92ff..4c831fb965d 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: none
 
 environment:
   sdk: ^3.6.0
-  flutter: ">=3.27.0"
+  flutter: '>=3.27.0'
 
 dependencies:
   cupertino_icons: ^1.0.5
@@ -18,7 +18,7 @@ dependencies:
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../../../
-  google_maps_flutter_platform_interface: ^2.11.0
+  google_maps_flutter_platform_interface: ^2.12.1
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml
index 08ef36c1402..778a83eb281 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml
@@ -2,11 +2,11 @@ name: google_maps_flutter_ios
 description: iOS implementation of the google_maps_flutter plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
-version: 2.15.2
+version: 2.15.3
 
 environment:
   sdk: ^3.6.0
-  flutter: ">=3.27.0"
+  flutter: '>=3.27.0'
 
 flutter:
   plugin:
@@ -19,7 +19,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  google_maps_flutter_platform_interface: ^2.11.0
+  google_maps_flutter_platform_interface: ^2.12.1
   stream_transform: ^2.0.0
 
 dev_dependencies:
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md
index 41a9103221b..913a2463762 100644
--- a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md
+++ b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md
@@ -1,5 +1,6 @@
-## NEXT
+## 0.5.13
 
+* Deprecates `zIndex` parameter in Marker in favor of `zIndexInt`.
 * Updates minimum supported SDK version to Flutter 3.27/Dart 3.6.
 
 ## 0.5.12
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/markers_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/markers_test.dart
index 45b218f139c..39e28509de7 100644
--- a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/markers_test.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/markers_test.dart
@@ -536,5 +536,20 @@ void main() {
       expect(icon2.anchor!.x, width * anchorOffset.dx);
       expect(icon2.anchor!.y, height * anchorOffset.dy);
     });
+
+    testWidgets('interpret correct zIndex in convertsion',
+        (WidgetTester tester) async {
+      const MarkerId markerId = MarkerId('1');
+
+      final Set<Marker> markers = <Marker>{
+        const Marker(markerId: markerId, zIndexInt: 4),
+      };
+
+      await controller.addMarkers(markers);
+
+      final gmaps.Marker? gmMarker = controller.markers[markerId]?.marker;
+      expect(gmMarker, isNotNull);
+      expect(gmMarker!.zIndex, 4);
+    });
   });
 }
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml
index f1f0b079fc6..7bb1653c2a5 100644
--- a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml
@@ -3,12 +3,12 @@ publish_to: none
 
 environment:
   sdk: ^3.6.0
-  flutter: ">=3.27.0"
+  flutter: '>=3.27.0'
 
 dependencies:
   flutter:
     sdk: flutter
-  google_maps_flutter_platform_interface: ^2.10.0
+  google_maps_flutter_platform_interface: ^2.12.1
   google_maps_flutter_web:
     path: ../
   web: ^1.0.0
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart
index 88ae0fb849c..ae498403117 100644
--- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart
@@ -272,7 +272,7 @@ gmaps.InfoWindowOptions? _infoWindowOptionsFromMarker(Marker marker) {
 
   return gmaps.InfoWindowOptions()
     ..content = container
-    ..zIndex = marker.zIndex;
+    ..zIndex = marker.effectiveZIndex;
   // TODO(ditman): Compute the pixelOffset of the infoWindow, from the size of the Marker,
   // and the marker.infoWindow.anchor property.
 }
@@ -453,8 +453,8 @@ Future<gmaps.Icon?> _gmIconFromBitmapDescriptor(
   return icon;
 }
 
-// Computes the options for a new [gmaps.Marker] from an incoming set of options
-// [marker], and the existing marker registered with the map: [currentMarker].
+/// Computes the options for a new [gmaps.Marker] from an incoming set of options
+/// [marker], and the existing marker registered with the map: [currentMarker].
 Future<gmaps.MarkerOptions> _markerOptionsFromMarker(
   Marker marker,
   gmaps.Marker? currentMarker,
@@ -465,7 +465,7 @@ Future<gmaps.MarkerOptions> _markerOptionsFromMarker(
       marker.position.longitude,
     )
     ..title = sanitizeHtml(marker.infoWindow.title ?? '')
-    ..zIndex = marker.zIndex
+    ..zIndex = marker.effectiveZIndex
     ..visible = marker.visible
     ..opacity = marker.alpha
     ..draggable = marker.draggable
@@ -730,3 +730,13 @@ gmaps.LatLng _pixelToLatLng(gmaps.Map map, int x, int y) {
 
   return projection.fromPointToLatLng(point)!;
 }
+
+extension on Marker {
+  // We compare with zero because zIndexInt if non zero should get higher priority than zIndex
+  num? get effectiveZIndex {
+    if (zIndexInt != 0) {
+      return zIndexInt;
+    }
+    return zIndex;
+  }
+}
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml
index 5cbffaec962..09f30205438 100644
--- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml
@@ -2,11 +2,11 @@ name: google_maps_flutter_web
 description: Web platform implementation of google_maps_flutter
 repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_web
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
-version: 0.5.12
+version: 0.5.13
 
 environment:
   sdk: ^3.6.0
-  flutter: ">=3.27.0"
+  flutter: '>=3.27.0'
 
 flutter:
   plugin:
@@ -23,10 +23,10 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   google_maps: ^8.0.0
-  google_maps_flutter_platform_interface: ^2.10.0
+  google_maps_flutter_platform_interface: ^2.12.1
   sanitize_html: ^2.0.0
   stream_transform: ^2.0.0
-  web: ">=0.5.1 <2.0.0"
+  web: '>=0.5.1 <2.0.0'
 
 dev_dependencies:
   flutter_test:

From 2b3db6460eb4670682d4b1815176b413675e1a5d Mon Sep 17 00:00:00 2001
From: Hari07 <22373191+Hari-07@users.noreply.github.com>
Date: Mon, 9 Jun 2025 19:06:58 +0400
Subject: [PATCH 02/10] Fix quotes on flutter version string

---
 .../google_maps_flutter_android/example/pubspec.yaml            | 2 +-
 .../google_maps_flutter_android/pubspec.yaml                    | 2 +-
 .../google_maps_flutter_ios/example/ios14/pubspec.yaml          | 2 +-
 .../google_maps_flutter_ios/example/ios15/pubspec.yaml          | 2 +-
 .../example/shared/maps_example_dart/pubspec.yaml               | 2 +-
 .../google_maps_flutter/google_maps_flutter_ios/pubspec.yaml    | 2 +-
 .../google_maps_flutter_web/example/pubspec.yaml                | 2 +-
 .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml
index b57b2cda04b..b4a80525da8 100644
--- a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: none
 
 environment:
   sdk: ^3.6.0
-  flutter: '>=3.27.0'
+  flutter: ">=3.27.0"
 
 dependencies:
   cupertino_icons: ^1.0.5
diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml
index a279776c788..f30183ca99f 100644
--- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml
@@ -6,7 +6,7 @@ version: 2.16.2
 
 environment:
   sdk: ^3.6.0
-  flutter: '>=3.27.0'
+  flutter: ">=3.27.0"
 
 flutter:
   plugin:
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/pubspec.yaml
index f401f526133..96319023995 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: none
 
 environment:
   sdk: ^3.6.0
-  flutter: '>=3.27.0'
+  flutter: ">=3.27.0"
 
 dependencies:
   cupertino_icons: ^1.0.5
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/pubspec.yaml
index f401f526133..96319023995 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: none
 
 environment:
   sdk: ^3.6.0
-  flutter: '>=3.27.0'
+  flutter: ">=3.27.0"
 
 dependencies:
   cupertino_icons: ^1.0.5
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml
index 4c831fb965d..d1404b7077b 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: none
 
 environment:
   sdk: ^3.6.0
-  flutter: '>=3.27.0'
+  flutter: ">=3.27.0"
 
 dependencies:
   cupertino_icons: ^1.0.5
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml
index 778a83eb281..062a7e0bb9c 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml
@@ -6,7 +6,7 @@ version: 2.15.3
 
 environment:
   sdk: ^3.6.0
-  flutter: '>=3.27.0'
+  flutter: ">=3.27.0"
 
 flutter:
   plugin:
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml
index 7bb1653c2a5..6d404825bc7 100644
--- a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml
@@ -3,7 +3,7 @@ publish_to: none
 
 environment:
   sdk: ^3.6.0
-  flutter: '>=3.27.0'
+  flutter: ">=3.27.0"
 
 dependencies:
   flutter:
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml
index 09f30205438..f8d725e7bb6 100644
--- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml
@@ -6,7 +6,7 @@ version: 0.5.13
 
 environment:
   sdk: ^3.6.0
-  flutter: '>=3.27.0'
+  flutter: ">=3.27.0"
 
 flutter:
   plugin:

From fd18f228bd50b18fe86dc51549d7da5cb4f0a09b Mon Sep 17 00:00:00 2001
From: Hari07 <22373191+Hari-07@users.noreply.github.com>
Date: Mon, 9 Jun 2025 19:12:08 +0400
Subject: [PATCH 03/10] Another quotes fix

---
 .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml
index f8d725e7bb6..46185d46b1f 100644
--- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml
@@ -26,7 +26,7 @@ dependencies:
   google_maps_flutter_platform_interface: ^2.12.1
   sanitize_html: ^2.0.0
   stream_transform: ^2.0.0
-  web: '>=0.5.1 <2.0.0'
+  web: ">=0.5.1 <2.0.0"
 
 dev_dependencies:
   flutter_test:

From 5fdb91bfd1dbbda2350fc36194b37dec30fceca8 Mon Sep 17 00:00:00 2001
From: Hari07 <22373191+Hari-07@users.noreply.github.com>
Date: Mon, 9 Jun 2025 19:17:03 +0400
Subject: [PATCH 04/10] Use build number for web package

---
 .../google_maps_flutter/google_maps_flutter_web/CHANGELOG.md    | 2 +-
 .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md
index 913a2463762..71dc609eadf 100644
--- a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md
+++ b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.5.13
+## 0.5.12+1
 
 * Deprecates `zIndex` parameter in Marker in favor of `zIndexInt`.
 * Updates minimum supported SDK version to Flutter 3.27/Dart 3.6.
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml
index 46185d46b1f..c6e57e37f51 100644
--- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter_web
 description: Web platform implementation of google_maps_flutter
 repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_web
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
-version: 0.5.13
+version: 0.5.12+1
 
 environment:
   sdk: ^3.6.0

From 26b603704ee37e67805077b1fe80037f81ca1e7a Mon Sep 17 00:00:00 2001
From: Hari07 <22373191+Hari-07@users.noreply.github.com>
Date: Mon, 9 Jun 2025 19:20:41 +0400
Subject: [PATCH 05/10] Remove extension in web marker conversion

---
 .../google_maps_flutter_web/lib/src/convert.dart | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart
index ae498403117..956ca751e93 100644
--- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart
@@ -272,7 +272,8 @@ gmaps.InfoWindowOptions? _infoWindowOptionsFromMarker(Marker marker) {
 
   return gmaps.InfoWindowOptions()
     ..content = container
-    ..zIndex = marker.effectiveZIndex;
+    // The deprecated parameter is used here to avoid losing precision.
+    ..zIndex = marker.zIndex;
   // TODO(ditman): Compute the pixelOffset of the infoWindow, from the size of the Marker,
   // and the marker.infoWindow.anchor property.
 }
@@ -465,7 +466,8 @@ Future<gmaps.MarkerOptions> _markerOptionsFromMarker(
       marker.position.longitude,
     )
     ..title = sanitizeHtml(marker.infoWindow.title ?? '')
-    ..zIndex = marker.effectiveZIndex
+    // The deprecated parameter is used here to avoid losing precision.
+    ..zIndex = marker.zIndex
     ..visible = marker.visible
     ..opacity = marker.alpha
     ..draggable = marker.draggable
@@ -730,13 +732,3 @@ gmaps.LatLng _pixelToLatLng(gmaps.Map map, int x, int y) {
 
   return projection.fromPointToLatLng(point)!;
 }
-
-extension on Marker {
-  // We compare with zero because zIndexInt if non zero should get higher priority than zIndex
-  num? get effectiveZIndex {
-    if (zIndexInt != 0) {
-      return zIndexInt;
-    }
-    return zIndex;
-  }
-}

From f7726bf2340145daa73e2098419ea226775814d7 Mon Sep 17 00:00:00 2001
From: Hari07 <22373191+Hari-07@users.noreply.github.com>
Date: Tue, 10 Jun 2025 17:33:43 +0400
Subject: [PATCH 06/10] Change zIndex on ios to integer field

---
 .../google_maps_flutter_ios/ios/Classes/messages.g.h      | 6 +++---
 .../google_maps_flutter_ios/ios/Classes/messages.g.m      | 6 +++---
 .../lib/src/google_maps_flutter_ios.dart                  | 2 +-
 .../google_maps_flutter_ios/lib/src/messages.g.dart       | 8 ++++----
 .../google_maps_flutter_ios/pigeons/messages.dart         | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.h
index 0d1c3935e8a..48d44eac213 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.h
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.h
@@ -1,7 +1,7 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// Autogenerated from Pigeon (v22.7.4), do not edit directly.
+// Autogenerated from Pigeon (v22.6.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #import <Foundation/Foundation.h>
@@ -283,7 +283,7 @@ typedef NS_ENUM(NSUInteger, FGMPlatformMapBitmapScaling) {
                      position:(FGMPlatformLatLng *)position
                      rotation:(double)rotation
                       visible:(BOOL)visible
-                       zIndex:(double)zIndex
+                       zIndex:(NSInteger)zIndex
                      markerId:(NSString *)markerId
              clusterManagerId:(nullable NSString *)clusterManagerId;
 @property(nonatomic, assign) double alpha;
@@ -296,7 +296,7 @@ typedef NS_ENUM(NSUInteger, FGMPlatformMapBitmapScaling) {
 @property(nonatomic, strong) FGMPlatformLatLng *position;
 @property(nonatomic, assign) double rotation;
 @property(nonatomic, assign) BOOL visible;
-@property(nonatomic, assign) double zIndex;
+@property(nonatomic, assign) NSInteger zIndex;
 @property(nonatomic, copy) NSString *markerId;
 @property(nonatomic, copy, nullable) NSString *clusterManagerId;
 @end
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.m
index ccf0735ec94..be83df3604b 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.m
@@ -1,7 +1,7 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// Autogenerated from Pigeon (v22.7.4), do not edit directly.
+// Autogenerated from Pigeon (v22.6.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #import "messages.g.h"
@@ -725,7 +725,7 @@ + (instancetype)makeWithAlpha:(double)alpha
                      position:(FGMPlatformLatLng *)position
                      rotation:(double)rotation
                       visible:(BOOL)visible
-                       zIndex:(double)zIndex
+                       zIndex:(NSInteger)zIndex
                      markerId:(NSString *)markerId
              clusterManagerId:(nullable NSString *)clusterManagerId {
   FGMPlatformMarker *pigeonResult = [[FGMPlatformMarker alloc] init];
@@ -756,7 +756,7 @@ + (FGMPlatformMarker *)fromList:(NSArray<id> *)list {
   pigeonResult.position = GetNullableObjectAtIndex(list, 7);
   pigeonResult.rotation = [GetNullableObjectAtIndex(list, 8) doubleValue];
   pigeonResult.visible = [GetNullableObjectAtIndex(list, 9) boolValue];
-  pigeonResult.zIndex = [GetNullableObjectAtIndex(list, 10) doubleValue];
+  pigeonResult.zIndex = [GetNullableObjectAtIndex(list, 10) integerValue];
   pigeonResult.markerId = GetNullableObjectAtIndex(list, 11);
   pigeonResult.clusterManagerId = GetNullableObjectAtIndex(list, 12);
   return pigeonResult;
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/lib/src/google_maps_flutter_ios.dart b/packages/google_maps_flutter/google_maps_flutter_ios/lib/src/google_maps_flutter_ios.dart
index ab76471fc19..de501b9f71d 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/lib/src/google_maps_flutter_ios.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/lib/src/google_maps_flutter_ios.dart
@@ -678,7 +678,7 @@ class GoogleMapsFlutterIOS extends GoogleMapsFlutterPlatform {
       position: _platformLatLngFromLatLng(marker.position),
       rotation: marker.rotation,
       visible: marker.visible,
-      zIndex: marker.zIndex,
+      zIndex: marker.zIndexInt,
       markerId: marker.markerId.value,
       clusterManagerId: marker.clusterManagerId?.value,
     );
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/lib/src/messages.g.dart b/packages/google_maps_flutter/google_maps_flutter_ios/lib/src/messages.g.dart
index c7b67e500c9..0a91b92465b 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/lib/src/messages.g.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/lib/src/messages.g.dart
@@ -1,7 +1,7 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// Autogenerated from Pigeon (v22.7.4), do not edit directly.
+// Autogenerated from Pigeon (v22.6.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
 
@@ -508,7 +508,7 @@ class PlatformMarker {
     required this.position,
     this.rotation = 0.0,
     this.visible = true,
-    this.zIndex = 0.0,
+    this.zIndex = 0,
     required this.markerId,
     this.clusterManagerId,
   });
@@ -533,7 +533,7 @@ class PlatformMarker {
 
   bool visible;
 
-  double zIndex;
+  int zIndex;
 
   String markerId;
 
@@ -570,7 +570,7 @@ class PlatformMarker {
       position: result[7]! as PlatformLatLng,
       rotation: result[8]! as double,
       visible: result[9]! as bool,
-      zIndex: result[10]! as double,
+      zIndex: result[10]! as int,
       markerId: result[11]! as String,
       clusterManagerId: result[12] as String?,
     );
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pigeons/messages.dart b/packages/google_maps_flutter/google_maps_flutter_ios/pigeons/messages.dart
index dcbe6691bd1..8f66adc44b8 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/pigeons/messages.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/pigeons/messages.dart
@@ -187,7 +187,7 @@ class PlatformMarker {
     required this.position,
     this.rotation = 0.0,
     this.visible = true,
-    this.zIndex = 0.0,
+    this.zIndex = 0,
     this.clusterManagerId,
   });
 
@@ -202,7 +202,7 @@ class PlatformMarker {
   final PlatformLatLng position;
   final double rotation;
   final bool visible;
-  final double zIndex;
+  final int zIndex;
   final String markerId;
   final String? clusterManagerId;
 }

From d619269ce673dbd7fc22e842b132cb48a6fdfc75 Mon Sep 17 00:00:00 2001
From: Hari07 <22373191+Hari-07@users.noreply.github.com>
Date: Tue, 10 Jun 2025 17:36:36 +0400
Subject: [PATCH 07/10] Revert android version change

---
 .../google_maps_flutter_android/CHANGELOG.md                | 2 +-
 .../google_maps_flutter_android/example/pubspec.yaml        | 2 +-
 .../google_maps_flutter_android/pubspec.yaml                | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md
index deb12b0f615..c17bd408f6b 100644
--- a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md
+++ b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 2.16.2
+## NEXT
 
 * Deprecates `zIndex` parameter in Marker in favor of `zIndexInt`.
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml
index b4a80525da8..46b41e3f9f4 100644
--- a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml
@@ -18,7 +18,7 @@ dependencies:
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../
-  google_maps_flutter_platform_interface: ^2.12.1
+  google_maps_flutter_platform_interface: ^2.11.0
 
 dev_dependencies:
   build_runner: ^2.1.10
diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml
index f30183ca99f..84779722eb1 100644
--- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter_android
 description: Android implementation of the google_maps_flutter plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
-version: 2.16.2
+version: 2.16.1
 
 environment:
   sdk: ^3.6.0
@@ -21,7 +21,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_plugin_android_lifecycle: ^2.0.1
-  google_maps_flutter_platform_interface: ^2.12.1
+  google_maps_flutter_platform_interface: ^2.11.0
   stream_transform: ^2.0.0
 
 dev_dependencies:
@@ -30,7 +30,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   mockito: ^5.4.4
-  pigeon: ^22.7.4
+  pigeon: ^22.6.0
   plugin_platform_interface: ^2.1.7
 
 topics:

From 378b108987fc99eb2ad1ac8b2889141f4e16210d Mon Sep 17 00:00:00 2001
From: Hari07 <22373191+Hari-07@users.noreply.github.com>
Date: Tue, 10 Jun 2025 22:57:08 +0400
Subject: [PATCH 08/10] Add an explicit cast

---
 .../ios/Classes/GoogleMapMarkerController.m                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.m
index f86cb3620c2..d542f7f8ebe 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.m
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.m
@@ -121,7 +121,7 @@ - (void)updateFromPlatformMarker:(FGMPlatformMarker *)platformMarker
   [self setConsumeTapEvents:platformMarker.consumeTapEvents];
   [self setPosition:FGMGetCoordinateForPigeonLatLng(platformMarker.position)];
   [self setRotation:platformMarker.rotation];
-  [self setZIndex:platformMarker.zIndex];
+  [self setZIndex:(int)platformMarker.zIndex];
   FGMPlatformInfoWindow *infoWindow = platformMarker.infoWindow;
   [self setInfoWindowAnchor:FGMGetCGPointForPigeonPoint(infoWindow.anchor)];
   if (infoWindow.title) {

From 9ab5e861e377b4723468e98d39eb943765104147 Mon Sep 17 00:00:00 2001
From: Hari07 <22373191+Hari-07@users.noreply.github.com>
Date: Fri, 13 Jun 2025 08:36:03 +0400
Subject: [PATCH 09/10] Remove android changelog

---
 .../google_maps_flutter_android/CHANGELOG.md                  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md
index c17bd408f6b..6071bc8027f 100644
--- a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md
+++ b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md
@@ -1,7 +1,3 @@
-## NEXT
-
-* Deprecates `zIndex` parameter in Marker in favor of `zIndexInt`.
-
 ## 2.16.1
 
 * Removes obsolete code related to supporting SDK <21.

From 4ad3e6eab2329a07b49a3e0ad1110b0fef12cf8f Mon Sep 17 00:00:00 2001
From: Hari07 <22373191+Hari-07@users.noreply.github.com>
Date: Fri, 13 Jun 2025 08:39:50 +0400
Subject: [PATCH 10/10] Update ios version

---
 .../google_maps_flutter/google_maps_flutter_ios/pubspec.yaml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml
index 062a7e0bb9c..519276f1101 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter_ios
 description: iOS implementation of the google_maps_flutter plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
-version: 2.15.3
+version: 2.15.4
 
 environment:
   sdk: ^3.6.0