[webview_flutter] update pigeon to 11 (flutter#4821)

updates pigeon version to 11 to remove need for primitive enum wrappers - removes unnused enum wrappers.

Some work toward flutter#133455

Author: tarrinneal

packages/local_auth/local_auth_ios/pigeons/messages.dart

@@ -85,8 +85,8 @@ class AuthResultDetails {
 /// Pigeon equivalent of the subset of BiometricType used by iOS.
 enum AuthBiometric { face, fingerprint }
 
-// TODO(stuartmorgan): Remove this when
-// https://github.com/flutter/flutter/issues/87307 is implemented.
+// TODO(stuartmorgan): Enums need be wrapped in a data class because thay can't
+// be used as collection arguments. See https://github.com/flutter/flutter/issues/133728
 class AuthBiometricWrapper {
   AuthBiometricWrapper({required this.value});
   final AuthBiometric value;

packages/webview_flutter/webview_flutter_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.9.5
+
+* Updates pigeon to 11 and removes unneeded enum wrappers.
+
 ## 3.9.4
 
 * Adds pub topics to package metadata.

packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/FileChooserParamsFlutterApiImpl.java

@@ -34,25 +34,21 @@ public FileChooserParamsFlutterApiImpl(
     this.instanceManager = instanceManager;
   }
 
-  private static GeneratedAndroidWebView.FileChooserModeEnumData toFileChooserEnumData(int mode) {
-    final GeneratedAndroidWebView.FileChooserModeEnumData.Builder builder =
-        new GeneratedAndroidWebView.FileChooserModeEnumData.Builder();
+  private static GeneratedAndroidWebView.FileChooserMode toFileChooserEnumData(int mode) {
 
     switch (mode) {
       case WebChromeClient.FileChooserParams.MODE_OPEN:
-        builder.setValue(GeneratedAndroidWebView.FileChooserMode.OPEN);
-        break;
+        return GeneratedAndroidWebView.FileChooserMode.OPEN;
+
       case WebChromeClient.FileChooserParams.MODE_OPEN_MULTIPLE:
-        builder.setValue(GeneratedAndroidWebView.FileChooserMode.OPEN_MULTIPLE);
-        break;
+        return GeneratedAndroidWebView.FileChooserMode.OPEN_MULTIPLE;
+
       case WebChromeClient.FileChooserParams.MODE_SAVE:
-        builder.setValue(GeneratedAndroidWebView.FileChooserMode.SAVE);
-        break;
+        return GeneratedAndroidWebView.FileChooserMode.SAVE;
+
       default:
         throw new IllegalArgumentException(String.format("Unsupported FileChooserMode: %d", mode));
     }
-
-    return builder.build();
   }
 
   /**

packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/GeneratedAndroidWebView.java

@@ -57,8 +57,8 @@ public void flutterApiCreate() {
     final long identifier =
         Objects.requireNonNull(
             instanceManager.getIdentifierForStrongReference(mockFileChooserParams));
-    final ArgumentCaptor<GeneratedAndroidWebView.FileChooserModeEnumData> modeCaptor =
-        ArgumentCaptor.forClass(GeneratedAndroidWebView.FileChooserModeEnumData.class);
+    final ArgumentCaptor<GeneratedAndroidWebView.FileChooserMode> modeCaptor =
+        ArgumentCaptor.forClass(GeneratedAndroidWebView.FileChooserMode.class);
 
     verify(spyFlutterApi)
         .create(
@@ -68,7 +68,6 @@ public void flutterApiCreate() {
             modeCaptor.capture(),
             eq("filenameHint"),
             any());
-    assertEquals(
-        modeCaptor.getValue().getValue(), GeneratedAndroidWebView.FileChooserMode.OPEN_MULTIPLE);
+    assertEquals(modeCaptor.getValue(), GeneratedAndroidWebView.FileChooserMode.OPEN_MULTIPLE);
   }
 }

packages/webview_flutter/webview_flutter_android/android/src/test/java/io/flutter/plugins/webviewflutter/FileChooserParamsTest.java

@@ -1025,14 +1025,14 @@ class FileChooserParamsFlutterApiImpl extends FileChooserParamsFlutterApi {
     int instanceId,
     bool isCaptureEnabled,
     List<String?> acceptTypes,
-    FileChooserModeEnumData mode,
+    FileChooserMode mode,
     String? filenameHint,
   ) {
     instanceManager.addHostCreatedInstance(
       FileChooserParams.detached(
         isCaptureEnabled: isCaptureEnabled,
         acceptTypes: acceptTypes.cast(),
-        mode: mode.value,
+        mode: mode,
         filenameHint: filenameHint,
         binaryMessenger: binaryMessenger,
         instanceManager: instanceManager,

packages/webview_flutter/webview_flutter_android/lib/src/android_webview.g.dart

@@ -57,12 +57,6 @@ enum FileChooserMode {
   save,
 }
 
-// TODO(bparrishMines): Enums need be wrapped in a data class because thay can't
-// be used as primitive arguments. See https://github.com/flutter/flutter/issues/87307
-class FileChooserModeEnumData {
-  late FileChooserMode value;
-}
-
 class WebResourceRequestData {
   WebResourceRequestData(
     this.url,
@@ -393,7 +387,7 @@ abstract class FileChooserParamsFlutterApi {
     int instanceId,
     bool isCaptureEnabled,
     List<String> acceptTypes,
-    FileChooserModeEnumData mode,
+    FileChooserMode mode,
     String? filenameHint,
   );
 }

packages/webview_flutter/webview_flutter_android/lib/src/android_webview_api_impls.dart

@@ -2,7 +2,7 @@ name: webview_flutter_android
 description: A Flutter plugin that provides a WebView widget on Android.
 repository: https://github.com/flutter/packages/tree/main/packages/webview_flutter/webview_flutter_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+webview%22
-version: 3.9.4
+version: 3.9.5
 
 environment:
   sdk: ">=2.19.0 <4.0.0"
@@ -27,7 +27,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   mockito: 5.4.1
-  pigeon: ^9.2.4
+  pigeon: ^11.0.0
 
 topics:
   - html

packages/webview_flutter/webview_flutter_android/pigeons/android_webview.dart

@@ -1085,7 +1085,7 @@ void main() {
         0,
         false,
         const <String>['my', 'list'],
-        FileChooserModeEnumData(value: FileChooserMode.openMultiple),
+        FileChooserMode.openMultiple,
         'filenameHint',
       );