Merge remote-tracking branch 'upstream/main' into issue/94011

Author: mvanbeusekom

.ci/flutter_master.version

@@ -1 +1 @@
-377d7d768df19a730b8296165919773cc22be1fe
+87f5f4685c6239d66455f7253210de29a82182ab

.cirrus.yml

@@ -1,4 +1,4 @@
-gcp_credentials: ENCRYPTED[!cc769765170bebc37e0556e2da5915ca64ee37f4ec8c966ec147e2f59578b476c99e457eafce4e2f8b1a4e305f7096b8!]
+gcp_credentials: ENCRYPTED[!2c88dee9c9d9805b214c9f7ad8f3bc8fae936cdb0f881d562101151c408c7e024a41222677d5831df90c60d2dd6cd80a!]
 
 # Don't run on release tags since it creates O(n^2) tasks where n is the
 # number of plugins

packages/google_maps_flutter/google_maps_flutter/AUTHORS

@@ -64,3 +64,4 @@ Aleksandr Yurkovskiy <[email protected]>
 Anton Borries <[email protected]>
 Alex Li <[email protected]>
 Rahul Raj <[email protected]>
+Taha Tesser <[email protected]>

packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md

@@ -1,7 +1,8 @@
-## NEXT
+## 2.1.2
 
 * Removes dependencies from `pubspec.yaml` that are only needed in `example/pubspec.yaml`
 * Updates Android compileSdkVersion to 31.
+* Internal code cleanup for stricter analysis options.
 
 ## 2.1.1
 

packages/google_maps_flutter/google_maps_flutter/analysis_options.yaml

@@ -78,9 +78,9 @@ class GoogleMapInspector {
   }
 
   Future<Map<String, dynamic>?> getTileOverlayInfo(String id) async {
-    return (await _channel.invokeMapMethod<String, dynamic>(
+    return await _channel.invokeMapMethod<String, dynamic>(
         'map#getTileOverlayInfo', <String, String>{
       'tileOverlayId': id,
-    }));
+    });
   }
 }