Merge remote-tracking branch 'upstream/main' into update-goldens

Author: LongCatIsLooong

.ci/flutter_master.version

@@ -1 +1 @@
-5a279edc239f4efd91223ddc609c2b5129325feb
+d8a7211061084525a992664d997cff9349fa43d3

packages/image_picker/image_picker_android/android/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java

@@ -148,10 +148,7 @@ public void chooseMultiImageFromGallery_whenPendingResultExists_finishesWithAlre
 
   @Test
   @Config(sdk = 30)
-  public void
-      chooseImageFromGallery_whenHasExternalStoragePermission_launchesChooseFromGalleryIntent() {
-    when(mockPermissionManager.isPermissionGranted(Manifest.permission.READ_EXTERNAL_STORAGE))
-        .thenReturn(true);
+  public void chooseImageFromGallery_launchesChooseFromGalleryIntent() {
 
     ImagePickerDelegate delegate = createDelegate();
     delegate.chooseImageFromGallery(new ImageOutputOptions(null, null, null), false, mockResult);
@@ -163,10 +160,7 @@ public void chooseMultiImageFromGallery_whenPendingResultExists_finishesWithAlre
 
   @Test
   @Config(minSdk = 33)
-  public void
-      chooseImageFromGallery_WithPhotoPicker_whenHasExternalStoragePermission_launchesChooseFromGalleryIntent() {
-    when(mockPermissionManager.isPermissionGranted(Manifest.permission.READ_EXTERNAL_STORAGE))
-        .thenReturn(true);
+  public void chooseImageFromGallery_withPhotoPicker_launchesChooseFromGalleryIntent() {
 
     ImagePickerDelegate delegate = createDelegate();
     delegate.chooseImageFromGallery(new ImageOutputOptions(null, null, null), true, mockResult);
@@ -178,10 +172,7 @@ public void chooseMultiImageFromGallery_whenPendingResultExists_finishesWithAlre
 
   @Test
   @Config(sdk = 30)
-  public void
-      chooseMultiImageFromGallery_whenHasExternalStoragePermission_launchesChooseFromGalleryIntent() {
-    when(mockPermissionManager.isPermissionGranted(Manifest.permission.READ_EXTERNAL_STORAGE))
-        .thenReturn(true);
+  public void chooseMultiImageFromGallery_launchesChooseFromGalleryIntent() {
 
     ImagePickerDelegate delegate = createDelegate();
     delegate.chooseMultiImageFromGallery(
@@ -195,10 +186,7 @@ public void chooseMultiImageFromGallery_whenPendingResultExists_finishesWithAlre
 
   @Test
   @Config(minSdk = 33)
-  public void
-      chooseMultiImageFromGallery_WithPhotoPicker_whenHasExternalStoragePermission_launchesChooseFromGalleryIntent() {
-    when(mockPermissionManager.isPermissionGranted(Manifest.permission.READ_EXTERNAL_STORAGE))
-        .thenReturn(true);
+  public void chooseMultiImageFromGallery_withPhotoPicker_launchesChooseFromGalleryIntent() {
 
     ImagePickerDelegate delegate = createDelegate();
     delegate.chooseMultiImageFromGallery(
@@ -212,10 +200,7 @@ public void chooseMultiImageFromGallery_whenPendingResultExists_finishesWithAlre
 
   @Test
   @Config(sdk = 30)
-  public void
-      chooseVideoFromGallery_whenHasExternalStoragePermission_launchesChooseFromGalleryIntent() {
-    when(mockPermissionManager.isPermissionGranted(Manifest.permission.READ_EXTERNAL_STORAGE))
-        .thenReturn(true);
+  public void chooseVideoFromGallery_launchesChooseFromGalleryIntent() {
 
     ImagePickerDelegate delegate = createDelegate();
     delegate.chooseVideoFromGallery(new VideoOptions(null), true, mockResult);
@@ -227,10 +212,7 @@ public void chooseMultiImageFromGallery_whenPendingResultExists_finishesWithAlre
 
   @Test
   @Config(minSdk = 33)
-  public void
-      chooseVideoFromGallery_WithPhotoPicker_whenHasExternalStoragePermission_launchesChooseFromGalleryIntent() {
-    when(mockPermissionManager.isPermissionGranted(Manifest.permission.READ_EXTERNAL_STORAGE))
-        .thenReturn(true);
+  public void chooseVideoFromGallery_withPhotoPicker_launchesChooseFromGalleryIntent() {
 
     ImagePickerDelegate delegate = createDelegate();
     delegate.chooseVideoFromGallery(new VideoOptions(null), true, mockResult);
@@ -252,7 +234,7 @@ public void takeImageWithCamera_whenPendingResultExists_finishesWithAlreadyActiv
   }
 
   @Test
-  public void takeImageWithCamera_whenHasNoCameraPermission_RequestsForPermission() {
+  public void takeImageWithCamera_whenHasNoCameraPermission_requestsForPermission() {
     when(mockPermissionManager.isPermissionGranted(Manifest.permission.CAMERA)).thenReturn(false);
     when(mockPermissionManager.needRequestCameraPermission()).thenReturn(true);
 
@@ -265,7 +247,7 @@ public void takeImageWithCamera_whenHasNoCameraPermission_RequestsForPermission(
   }
 
   @Test
-  public void takeImageWithCamera_whenCameraPermissionNotPresent_RequestsForPermission() {
+  public void takeImageWithCamera_whenCameraPermissionNotPresent_requestsForPermission() {
     when(mockPermissionManager.needRequestCameraPermission()).thenReturn(false);
 
     ImagePickerDelegate delegate = createDelegate();
@@ -396,7 +378,7 @@ public void onActivityResult_whenPickFromGalleryCanceled_storesNothingInCache()
   }
 
   @Test
-  public void onActivityResult_whenImagePickedFromGallery_andNoResizeNeeded_StoresImageInCache() {
+  public void onActivityResult_whenImagePickedFromGallery_andNoResizeNeeded_storesImageInCache() {
     ImagePickerDelegate delegate = createDelegate();
 
     delegate.onActivityResult(
@@ -501,7 +483,7 @@ public void onActivityResult_whenImageTakenWithCamera_andNoResizeNeeded_finishes
 
   @Test
   public void
-      retrieveLostImage_ShouldBeAbleToReturnLastItemFromResultMapWhenSingleFileIsRecovered() {
+      retrieveLostImage_shouldBeAbleToReturnLastItemFromResultMapWhenSingleFileIsRecovered() {
     Map<String, Object> resultMap = new HashMap<>();
     ArrayList<String> pathList = new ArrayList<>();
     pathList.add("/example/first_item");

packages/pigeon/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 9.0.7
+
+* [swift] Changes all ints to int64.
+  May require code updates to existing code.
+* Adds integration tests for int64.
+
 ## 9.0.6
 
 * [kotlin] Removes safe casting from decode process.

packages/pigeon/lib/generator_tools.dart

@@ -11,7 +11,7 @@ import 'ast.dart';
 /// The current version of pigeon.
 ///
 /// This must match the version in pubspec.yaml.
-const String pigeonVersion = '9.0.6';
+const String pigeonVersion = '9.0.7';
 
 /// Read all the content from [stdin] to a String.
 String readStdin() {

packages/pigeon/lib/swift_generator.dart

@@ -669,15 +669,17 @@ String _camelCase(String text) {
 
 String _castForceUnwrap(String value, TypeDeclaration type, Root root) {
   final String forceUnwrap = type.isNullable ? '' : '!';
+  final String castUnwrap = type.isNullable ? '?' : '';
   if (isEnum(root, type)) {
     final String nullableConditionPrefix =
         type.isNullable ? '$value == nil ? nil : ' : '';
     return '$nullableConditionPrefix${_swiftTypeForDartType(type)}(rawValue: $value as! Int)$forceUnwrap';
   } else if (type.baseName == 'Object') {
     // Special-cased to avoid warnings about using 'as' with Any.
     return value;
+  } else if (type.baseName == 'int') {
+    return '($value is Int) ? Int64($value as! Int) : $value as! Int64$castUnwrap';
   } else {
-    final String castUnwrap = type.isNullable ? '?' : '';
     return '$value as! ${_swiftTypeForDartType(type)}$castUnwrap';
   }
 }
@@ -713,7 +715,7 @@ String? _swiftTypeForBuiltinDartType(TypeDeclaration type) {
     'void': 'Void',
     'bool': 'Bool',
     'String': 'String',
-    'int': 'Int32',
+    'int': 'Int64',
     'double': 'Double',
     'Uint8List': 'FlutterStandardTypedData',
     'Int32List': 'FlutterStandardTypedData',

packages/pigeon/mock_handler_tester/test/message.dart

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.6), do not edit directly.
+// Autogenerated from Pigeon (v9.0.7), 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
 

packages/pigeon/mock_handler_tester/test/test.dart

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.6), do not edit directly.
+// Autogenerated from Pigeon (v9.0.7), 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, unnecessary_import
 // ignore_for_file: avoid_relative_lib_imports

packages/pigeon/pigeons/core_tests.dart

@@ -15,6 +15,7 @@ class AllTypes {
   AllTypes({
     this.aBool = false,
     this.anInt = 0,
+    this.anInt64 = 0,
     this.aDouble = 0,
     required this.aByteArray,
     required this.a4ByteArray,
@@ -28,6 +29,7 @@ class AllTypes {
 
   bool aBool;
   int anInt;
+  int anInt64;
   double aDouble;
   Uint8List aByteArray;
   Int32List a4ByteArray;
@@ -46,6 +48,7 @@ class AllNullableTypes {
   AllNullableTypes(
     this.aNullableBool,
     this.aNullableInt,
+    this.aNullableInt64,
     this.aNullableDouble,
     this.aNullableByteArray,
     this.aNullable4ByteArray,
@@ -62,6 +65,7 @@ class AllNullableTypes {
 
   bool? aNullableBool;
   int? aNullableInt;
+  int? aNullableInt64;
   double? aNullableDouble;
   Uint8List? aNullableByteArray;
   Int32List? aNullable4ByteArray;