Merge branch 'main' into main

Author: CaoGiaHieu-dev

.ci/flutter_master.version

@@ -1 +1 @@
-2773c0c8e15e5a5bfe90e44eef3faa7cc0ba6803
+adffe244f3f112e35736d08d85ab4cdbe8e13aa4

packages/camera/camera/CHANGELOG.md

@@ -1,6 +1,7 @@
-## NEXT
+## 0.11.2
 
 * Fixes overflowed toggles in the camera example.
+* Fixes `CameraLensType` export.
 
 ## 0.11.1
 

packages/camera/camera/lib/camera.dart

@@ -7,6 +7,7 @@ export 'package:camera_platform_interface/camera_platform_interface.dart'
         CameraDescription,
         CameraException,
         CameraLensDirection,
+        CameraLensType,
         ExposureMode,
         FlashMode,
         FocusMode,

packages/camera/camera/pubspec.yaml

@@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing
   Dart.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.11.1
+version: 0.11.2
 
 environment:
   sdk: ^3.6.0
@@ -23,7 +23,7 @@ flutter:
 dependencies:
   camera_android_camerax: ^0.6.13
   camera_avfoundation: ^0.9.18
-  camera_platform_interface: ^2.9.0
+  camera_platform_interface: ^2.10.0
   camera_web: ^0.3.3
   flutter:
     sdk: flutter

packages/camera/camera/test/camera_export_test.dart

@@ -0,0 +1,28 @@
+// 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.
+
+// ignore_for_file: unnecessary_statements
+
+import 'package:camera/camera.dart' as main_file;
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('camera', () {
+    test(
+      'ensure camera.dart exports classes from platform interface',
+      () {
+        main_file.CameraDescription;
+        main_file.CameraException;
+        main_file.CameraLensDirection;
+        main_file.CameraLensType;
+        main_file.ExposureMode;
+        main_file.FlashMode;
+        main_file.FocusMode;
+        main_file.ImageFormatGroup;
+        main_file.ResolutionPreset;
+        main_file.XFile;
+      },
+    );
+  });
+}

packages/google_sign_in/google_sign_in_ios/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 6.0.1
+
+* Returns configuration errors as `PlatformException`s in Dart instead of
+  crashing the app.
+
 ## 6.0.0
 
 * **BREAKING CHANGE**: Switches to implementing version 3.0 of the platform

packages/google_sign_in/google_sign_in_ios/darwin/Tests/GoogleSignInTests.m

@@ -371,26 +371,26 @@ - (void)testSignInError {
   [self waitForExpectationsWithTimeout:5.0 handler:nil];
 }
 
-- (void)testSignInException {
+- (void)testSignInExceptionReturnsError {
   OCMExpect([self configureMock:self.mockSignIn
                 forSignInWithHint:OCMOCK_ANY
                  additionalScopes:OCMOCK_ANY
                        completion:OCMOCK_ANY])
       .andThrow([NSException exceptionWithName:@"MockName" reason:@"MockReason" userInfo:nil]);
 
-  __block FlutterError *error;
-  XCTAssertThrows([self.plugin
-      signInWithScopeHint:@[]
-                    nonce:nil
-               completion:^(FSISignInResult *result, FlutterError *signInError) {
-                 // Unexpected errors, such as runtime exceptions, are returned as FlutterError.
-                 XCTAssertNil(result);
-                 error = signInError;
-               }]);
-
-  XCTAssertEqualObjects(error.code, @"google_sign_in");
-  XCTAssertEqualObjects(error.message, @"MockReason");
-  XCTAssertEqualObjects(error.details, @"MockName");
+  XCTestExpectation *expectation = [self expectationWithDescription:@"completion called"];
+  [self.plugin signInWithScopeHint:@[]
+                             nonce:nil
+                        completion:^(FSISignInResult *result, FlutterError *error) {
+                          // Unexpected errors, such as runtime exceptions, are returned as
+                          // FlutterError.
+                          XCTAssertNil(result);
+                          XCTAssertEqualObjects(error.code, @"google_sign_in");
+                          XCTAssertEqualObjects(error.message, @"MockReason");
+                          XCTAssertEqualObjects(error.details, @"MockName");
+                          [expectation fulfill];
+                        }];
+  [self waitForExpectationsWithTimeout:5.0 handler:nil];
 }
 
 #pragma mark - refreshedAuthorizationTokens

packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios/Sources/google_sign_in_ios/FLTGoogleSignInPlugin.m

@@ -196,7 +196,6 @@ - (void)signInWithScopeHint:(NSArray<NSString *> *)scopeHint
               }];
   } @catch (NSException *e) {
     completion(nil, [FlutterError errorWithCode:@"google_sign_in" message:e.reason details:e.name]);
-    [e raise];
   }
 }
 

packages/google_sign_in/google_sign_in_ios/pubspec.yaml

@@ -2,7 +2,7 @@ name: google_sign_in_ios
 description: iOS implementation of the google_sign_in plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/google_sign_in/google_sign_in_ios
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
-version: 6.0.0
+version: 6.0.1
 
 environment:
   sdk: ^3.6.0

packages/in_app_purchase/in_app_purchase_storekit/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.3
+
+* Adds **Introductory Offer Eligibility** support for StoreKit2
+
 ## 0.4.2
 
 * Add [jwsRepresentation](https://developer.apple.com/documentation/storekit/verificationresult/jwsrepresentation-21vgo) to `SK2PurchaseDetails` as `serverVerificationData` for secure server-side purchase verification. Use this JSON Web Signature (JWS) value to perform your own JWS verification on your server.