Merge branch 'main' of github.com:flutter/packages into webview_flutter_android_set-Web-Authentication-Support

Author: bparrishMines

.ci/flutter_master.version

@@ -1 +1 @@
-e03b91f1fe34a3ae734d2d2113986672bdcbd78d
+f3a4b989783497d9c904b7f0363886248c9175e4

packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md

@@ -1,5 +1,6 @@
-## NEXT
+## 2.19.9
 
+* Adds attribution ID for Google Maps SDK usage.
 * Updates minimum supported SDK version to Flutter 3.38/Dart 3.10.
 
 ## 2.19.8

packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java

@@ -7,6 +7,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.Lifecycle;
+import com.google.android.gms.maps.MapsApiSettings;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
@@ -36,6 +37,8 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
             VIEW_TYPE,
             new GoogleMapFactory(
                 binding.getBinaryMessenger(), binding.getApplicationContext(), () -> lifecycle));
+    MapsApiSettings.addInternalUsageAttributionId(
+        binding.getApplicationContext(), "gmp_flutter_googlemapsflutter_android");
   }
 
   @Override

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.19.8
+version: 2.19.9
 
 environment:
   sdk: ^3.10.0

packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.18.2
+
+* Adds attribution ID for Google Maps SDK usage.
+
 ## 2.18.1
 
 * Removes conditional header logic that broke add-to-app builds.

packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGoogleMapsPlugin.m

@@ -4,8 +4,19 @@
 
 #import "FGMGoogleMapsPlugin.h"
 
+@import GoogleMaps;
+
 #pragma mark - GoogleMaps plugin implementation
 
+// Declares a GMSServices method that was added in SDK 9.2, so that it can be
+// conditionally called. It is declared on NSObject to avoid duplicate
+// declaration errors when compiling with newer SDKs.
+// TODO(stuartmorgan): Remove this once all packages sharing this file require
+// SDK 9.2 or later. See https://github.com/flutter/flutter/issues/187106
+@interface NSObject (MapsSDK92Extensions)
++ (void)addInternalUsageAttributionID:(nonnull NSString *)internalUsageAttributionID;
+@end
+
 @implementation FGMGoogleMapsPlugin
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
@@ -14,6 +25,9 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
                                 withId:@"plugins.flutter.dev/google_maps_ios"
       gestureRecognizersBlockingPolicy:
           FlutterPlatformViewGestureRecognizersBlockingPolicyWaitUntilTouchesEnded];
+  if ([GMSServices respondsToSelector:@selector(addInternalUsageAttributionID:)]) {
+    [GMSServices addInternalUsageAttributionID:@"gmp_flutter_googlemapsflutter_ios"];
+  }
 }
 
 @end

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.18.1
+version: 2.18.2
 
 environment:
   sdk: ^3.10.0

packages/google_maps_flutter/google_maps_flutter_ios_sdk10/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.18.2
+
+* Adds attribution ID for Google Maps SDK usage.
+
 ## 2.18.1
 
 * Removes the requirement to use static builds with Swift Package Manager.

packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMGoogleMapsPlugin.m

@@ -4,8 +4,19 @@
 
 #import "FGMGoogleMapsPlugin.h"
 
+@import GoogleMaps;
+
 #pragma mark - GoogleMaps plugin implementation
 
+// Declares a GMSServices method that was added in SDK 9.2, so that it can be
+// conditionally called. It is declared on NSObject to avoid duplicate
+// declaration errors when compiling with newer SDKs.
+// TODO(stuartmorgan): Remove this once all packages sharing this file require
+// SDK 9.2 or later. See https://github.com/flutter/flutter/issues/187106
+@interface NSObject (MapsSDK92Extensions)
++ (void)addInternalUsageAttributionID:(nonnull NSString *)internalUsageAttributionID;
+@end
+
 @implementation FGMGoogleMapsPlugin
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
@@ -14,6 +25,9 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
                                 withId:@"plugins.flutter.dev/google_maps_ios"
       gestureRecognizersBlockingPolicy:
           FlutterPlatformViewGestureRecognizersBlockingPolicyWaitUntilTouchesEnded];
+  if ([GMSServices respondsToSelector:@selector(addInternalUsageAttributionID:)]) {
+    [GMSServices addInternalUsageAttributionID:@"gmp_flutter_googlemapsflutter_ios"];
+  }
 }
 
 @end

packages/google_maps_flutter/google_maps_flutter_ios_sdk10/pubspec.yaml

@@ -2,7 +2,7 @@ name: google_maps_flutter_ios_sdk10
 description: iOS implementation of the google_maps_flutter plugin using Google Maps SDK 10.
 repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios_sdk10
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
-version: 2.18.1
+version: 2.18.2
 
 environment:
   sdk: ^3.10.0