Merge remote-tracking branch 'upstream/main' into handle_deprecated_radio_examples

alexskobozev · alexskobozev · commit c6cdb2217511 · 2025-10-02T12:40:10.000+04:00
diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version
@@ -1 +1 @@
-96fe3b3df509d451116124f0abbd288e36a03805
+7811e8982355a88cb964671bd7d711b3a04540f0
diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.10.10+8
+
+* Restores compileSdk version to flutter.compileSdkVersion.
+
 ## 0.10.10+7
 
 * Updates minimum supported SDK version to Flutter 3.35.
diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle
@@ -31,7 +31,7 @@ buildFeatures {
         buildConfig true
     }
     namespace = "io.flutter.plugins.camera"
-    compileSdk = 36
+    compileSdk = flutter.compileSdkVersion
 
     defaultConfig {
         minSdkVersion 24
diff --git a/packages/camera/camera_android/pubspec.yaml b/packages/camera/camera_android/pubspec.yaml
@@ -3,7 +3,7 @@ description: Android implementation of the camera plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
 
-version: 0.10.10+7
+version: 0.10.10+8
 
 environment:
   sdk: ^3.9.0
diff --git a/packages/file_selector/file_selector/example/android/app/build.gradle b/packages/file_selector/file_selector/example/android/app/build.gradle
@@ -28,12 +28,12 @@ android {
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 
     sourceSets {
diff --git a/packages/file_selector/file_selector_android/CHANGELOG.md b/packages/file_selector/file_selector_android/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.5.2
+
+* Updates Java compatibility version to 17.
+* Updates minimum supported SDK version to Flutter 3.35/Dart 3.9.
+
 ## 0.5.1+17
 
 * Updates Pigeon to 26.x.
diff --git a/packages/file_selector/file_selector_android/android/build.gradle b/packages/file_selector/file_selector_android/android/build.gradle
@@ -26,8 +26,8 @@ android {
     compileSdk = flutter.compileSdkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     defaultConfig {
diff --git a/packages/file_selector/file_selector_android/example/android/app/build.gradle b/packages/file_selector/file_selector_android/example/android/app/build.gradle
@@ -28,8 +28,8 @@ android {
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     defaultConfig {
diff --git a/packages/file_selector/file_selector_android/lib/src/file_selector_api.g.dart b/packages/file_selector/file_selector_android/lib/src/file_selector_api.g.dart
@@ -244,8 +244,9 @@ class FileSelectorApi {
     BinaryMessenger? binaryMessenger,
     String messageChannelSuffix = '',
   }) : pigeonVar_binaryMessenger = binaryMessenger,
-       pigeonVar_messageChannelSuffix =
-           messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
+       pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty
+           ? '.$messageChannelSuffix'
+           : '';
   final BinaryMessenger? pigeonVar_binaryMessenger;
 
   static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
diff --git a/packages/file_selector/file_selector_android/pubspec.yaml b/packages/file_selector/file_selector_android/pubspec.yaml
@@ -2,11 +2,11 @@ name: file_selector_android
 description: Android implementation of the file_selector package.
 repository: https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22
-version: 0.5.1+17
+version: 0.5.2
 
 environment:
-  sdk: ^3.7.0
-  flutter: ">=3.29.0"
+  sdk: ^3.9.0
+  flutter: ">=3.35.0"
 
 flutter:
   plugin:
diff --git a/packages/google_sign_in/google_sign_in/example/lib/src/web_wrapper.dart b/packages/google_sign_in/google_sign_in/example/lib/src/web_wrapper.dart
@@ -2,4 +2,5 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-export 'web_wrapper_stub.dart' if (dart.library.js_util) 'web_wrapper_web.dart';
+export 'web_wrapper_stub.dart'
+    if (dart.library.js_interop) 'web_wrapper_web.dart';
diff --git a/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.m b/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.m
@@ -607,6 +607,11 @@ - (void)registerViewFactory:(nonnull NSObject<FlutterPlatformViewFactory> *)fact
   }
 }
 
+// TODO(stuartmorgan): Make this NSObject<FlutterSceneLifeCycleDelegate> once
+// FlutterSceneLifeCycleDelegate has reached stable.
+- (void)addSceneDelegate:(nonnull NSObject *)delegate {
+}
+
 @end
 
 // This FlutterBinaryMessenger is a protocol, so to make a stub it has to be implemented.
diff --git a/packages/local_auth/local_auth_platform_interface/CHANGELOG.md b/packages/local_auth/local_auth_platform_interface/CHANGELOG.md
@@ -1,5 +1,7 @@
-## NEXT
+## 1.1.0
 
+* Adds `LocalAuthException` to allow for consistent, structured exceptions
+  across platform implementations.
 * Updates minimum supported SDK version to Flutter 3.29/Dart 3.7.
 
 ## 1.0.10
diff --git a/packages/local_auth/local_auth_platform_interface/lib/local_auth_platform_interface.dart b/packages/local_auth/local_auth_platform_interface/lib/local_auth_platform_interface.dart
@@ -7,7 +7,7 @@ import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 import 'default_method_channel_platform.dart';
 import 'types/types.dart';
 
-export 'package:local_auth_platform_interface/types/types.dart';
+export 'types/types.dart';
 
 /// The interface that implementations of local_auth must implement.
 ///
@@ -40,7 +40,13 @@ abstract class LocalAuthPlatform extends PlatformInterface {
   /// Authenticates the user with biometrics available on the device while also
   /// allowing the user to use device authentication - pin, pattern, passcode.
   ///
-  /// Returns true if the user successfully authenticated, false otherwise.
+  /// Returns true if the user successfully authenticated. Returns false if
+  /// the authentication completes, but the user failed the challenge with no
+  /// further effects. Platform implementations should throw a
+  /// [LocalAuthException] for any other outcome, such as errors, cancelation,
+  /// or lockout. This may mean that for some platforms, the implementation will
+  /// never return false (e.g., if the only standard outcomes are success,
+  /// cancelation, or temporary lockout due to too many retries).
   ///
   /// [localizedReason] is the message to show to user while prompting them
   /// for authentication. This is typically along the lines of: 'Please scan
@@ -50,11 +56,6 @@ abstract class LocalAuthPlatform extends PlatformInterface {
   /// customize messages in the dialogs.
   ///
   /// Provide [options] for configuring further authentication related options.
-  ///
-  /// Throws a [PlatformException] if there were technical problems with local
-  /// authentication (e.g. lack of relevant hardware). This might throw
-  /// [PlatformException] with error code [otherOperatingSystem] on the iOS
-  /// simulator.
   Future<bool> authenticate({
     required String localizedReason,
     required Iterable<AuthMessages> authMessages,
diff --git a/packages/local_auth/local_auth_platform_interface/lib/types/auth_exception.dart b/packages/local_auth/local_auth_platform_interface/lib/types/auth_exception.dart
@@ -0,0 +1,125 @@
+// Copyright 2013 The Flutter Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/foundation.dart';
+
+/// An exception thrown by the plugin when there is authentication failure, or
+/// some other error.
+@immutable
+class LocalAuthException implements Exception {
+  /// Creates a new exception with the given information.
+  const LocalAuthException({
+    required this.code,
+    this.description,
+    this.details,
+  });
+
+  /// The type of failure.
+  final LocalAuthExceptionCode code;
+
+  /// A human-readable description of the failure.
+  final String? description;
+
+  /// Any additional details about the failure.
+  final Object? details;
+
+  @override
+  String toString() =>
+      '${objectRuntimeType(this, 'LocalAuthException')}(code ${code.name}, $description, $details)';
+}
+
+/// Types of [LocalAuthException]s, as indicated by [LocalAuthException.code].
+///
+/// Adding new values to this enum in the future will *not* be considered a
+/// breaking change, so clients should not assume they can exhaustively match
+/// exception codes. Clients should always include a default or other fallback.
+enum LocalAuthExceptionCode {
+  /// An authentication operation is already in progress, and has not completed.
+  ///
+  /// A new authentication cannot be started while the Future for a previous
+  /// authentication is still outstanding.
+  authInProgress,
+
+  /// UI needs to be displayed, but could not be.
+  ///
+  /// For example, this can be returned on Android if a call tries to show UI
+  /// when no Activity is available.
+  uiUnavailable,
+
+  /// The operation was canceled by the user.
+  userCanceled,
+
+  /// The operation was canceled due to a device-specific timeout.
+  timeout,
+
+  /// The operation was canceled by a system event.
+  ///
+  /// For example, on mobile this may be returned if the application is
+  /// backgrounded during authentication.
+  systemCanceled,
+
+  /// The device has no credentials configured.
+  ///
+  /// For example, on mobile this would be returned if the device has no
+  /// enrolled biometrics and no fallback authentication mechanism set such as
+  /// a passcode, pin, or pattern.
+  noCredentialsSet,
+
+  /// The device is capable of biometric authentication, but no biometrics are
+  /// enrolled.
+  noBiometricsEnrolled,
+
+  /// The device does not have biometric hardware.
+  noBiometricHardware,
+
+  /// The device has, or can have, biometric hardware, but none is currently
+  /// available.
+  ///
+  /// Examples include:
+  /// - Hardware that is currently in use by another application.
+  /// - Devices that have previously paired with bluetooth biometric hardware,
+  ///   but are not currently paired to it.
+  ///
+  /// Devices that could have removable hardware attached may return either this
+  /// or [noBiometricHardware] depending on the platform implementation.
+  /// Platforms should generally only return this code if the system provides
+  /// information indicating that the device has previously had such hardware.
+  biometricHardwareTemporarilyUnavailable,
+
+  /// Authentication has temporarily been locked out, and should be re-attempted
+  /// later.
+  ///
+  /// For example, devices may return this error after too many failed
+  /// authentication attempts.
+  temporaryLockout,
+
+  /// Biometric authentication has been locked until some other authentication
+  /// has succeeded.
+  ///
+  /// Applications that do not require biometric authentication should generally
+  /// handle this error by re-attempting authentication with fallback to
+  /// non-biometrics allowed. Applications that require biometrics should
+  /// prompt users to resolve the lockout.
+  biometricLockout,
+
+  /// The user indicated via system-provided UI that they want to use a fallback
+  /// authentication option instead of biometrics.
+  ///
+  /// Whether this can be returned depends on the platform implementation and
+  /// the authentication configuration options. Applications should generally
+  /// handle this error by offering the user an alternate authentication option.
+  userRequestedFallback,
+
+  /// The authentication attempt failed due to some device-level error.
+  ///
+  /// The [LocalAuthException.description] should contain more details about the
+  /// error.
+  deviceError,
+
+  /// The authentication attempt failed due to some unknown or unexpected error.
+  ///
+  /// The [LocalAuthException.description] should contain more details about the
+  /// error.
+  unknownError,
+}
diff --git a/packages/local_auth/local_auth_platform_interface/lib/types/auth_options.dart b/packages/local_auth/local_auth_platform_interface/lib/types/auth_options.dart
@@ -21,6 +21,9 @@ class AuthenticationOptions {
   /// take the user to settings to add one. Anything that is not user fixable,
   /// such as no biometric sensor on device, will still result in
   /// a [PlatformException].
+  // This parameter still exists for backwards compatibility with local_auth
+  // 2.x, but implementers targeting local_auth 3.x or later should ignore it,
+  // as it will always be false.
   final bool useErrorDialogs;
 
   /// Used when the application goes into background for any reason while the
diff --git a/packages/local_auth/local_auth_platform_interface/lib/types/types.dart b/packages/local_auth/local_auth_platform_interface/lib/types/types.dart
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+export 'auth_exception.dart';
 export 'auth_messages.dart';
 export 'auth_options.dart';
 export 'biometric_type.dart';
diff --git a/packages/local_auth/local_auth_platform_interface/pubspec.yaml b/packages/local_auth/local_auth_platform_interface/pubspec.yaml
@@ -4,7 +4,7 @@ repository: https://github.com/flutter/packages/tree/main/packages/local_auth/lo
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+local_auth%22
 # NOTE: We strongly prefer non-breaking changes, even at the expense of a
 # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
-version: 1.0.10
+version: 1.1.0
 
 environment:
   sdk: ^3.7.0
diff --git a/packages/local_auth/local_auth_platform_interface/test/default_method_channel_platform_test.dart b/packages/local_auth/local_auth_platform_interface/test/default_method_channel_platform_test.dart
@@ -114,7 +114,6 @@ void main() {
           localizedReason: 'Insecure',
           options: const AuthenticationOptions(
             sensitiveTransaction: false,
-            useErrorDialogs: false,
             biometricOnly: true,
           ),
         );
@@ -123,7 +122,7 @@ void main() {
             'authenticate',
             arguments: <String, dynamic>{
               'localizedReason': 'Insecure',
-              'useErrorDialogs': false,
+              'useErrorDialogs': true,
               'stickyAuth': false,
               'sensitiveTransaction': false,
               'biometricOnly': true,
@@ -157,24 +156,44 @@ void main() {
         await localAuthentication.authenticate(
           authMessages: <AuthMessages>[],
           localizedReason: 'Insecure',
-          options: const AuthenticationOptions(
-            sensitiveTransaction: false,
-            useErrorDialogs: false,
-          ),
+          options: const AuthenticationOptions(sensitiveTransaction: false),
         );
         expect(log, <Matcher>[
           isMethodCall(
             'authenticate',
             arguments: <String, dynamic>{
               'localizedReason': 'Insecure',
-              'useErrorDialogs': false,
+              'useErrorDialogs': true,
               'stickyAuth': false,
               'sensitiveTransaction': false,
               'biometricOnly': false,
             },
           ),
         ]);
       });
+
+      test(
+        'legacy useErrorDialogs is passed for backward compatibility.',
+        () async {
+          await localAuthentication.authenticate(
+            authMessages: <AuthMessages>[],
+            localizedReason: 'Insecure',
+            options: const AuthenticationOptions(useErrorDialogs: false),
+          );
+          expect(log, <Matcher>[
+            isMethodCall(
+              'authenticate',
+              arguments: <String, dynamic>{
+                'localizedReason': 'Insecure',
+                'useErrorDialogs': false,
+                'stickyAuth': false,
+                'sensitiveTransaction': true,
+                'biometricOnly': false,
+              },
+            ),
+          ]);
+        },
+      );
     });
   });
 }
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/darwin/Tests/FWFWebViewFlutterWKWebViewExternalAPITests.swift b/packages/webview_flutter/webview_flutter_wkwebview/darwin/Tests/FWFWebViewFlutterWKWebViewExternalAPITests.swift
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/Runner.xcodeproj/project.pbxproj b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/Runner.xcodeproj/project.pbxproj
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/RunnerTests-Bridging-Header.h b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/RunnerTests-Bridging-Header.h
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/TemporaryObjCStub.h b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/TemporaryObjCStub.h
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/TemporaryObjCStub.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/TemporaryObjCStub.m
diff --git a/script/configs/exclude_integration_android_legacy_emulator.yaml b/script/configs/exclude_integration_android_legacy_emulator.yaml
diff --git a/script/tool/lib/src/gradle_check_command.dart b/script/tool/lib/src/gradle_check_command.dart
diff --git a/script/tool/test/gradle_check_command_test.dart b/script/tool/test/gradle_check_command_test.dart

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-96fe3b3df509d451116124f0abbd288e36a03805`
	`1`	`+7811e8982355a88cb964671bd7d711b3a04540f0`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ buildFeatures {`
`31`	`31`	`buildConfig true`
`32`	`32`	`}`
`33`	`33`	`namespace = "io.flutter.plugins.camera"`
`34`		`- compileSdk = 36`
	`34`	`+ compileSdk = flutter.compileSdkVersion`
`35`	`35`
`36`	`36`	`defaultConfig {`
`37`	`37`	`minSdkVersion 24`
Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,12 @@ android {`
`28`	`28`	`ndkVersion = flutter.ndkVersion`
`29`	`29`
`30`	`30`	`compileOptions {`
`31`		`- sourceCompatibility = JavaVersion.VERSION_11`
`32`		`- targetCompatibility = JavaVersion.VERSION_11`
	`31`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`32`	`+ targetCompatibility = JavaVersion.VERSION_17`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`kotlinOptions {`
`36`		`- jvmTarget = '11'`
	`36`	`+ jvmTarget = '17'`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`sourceSets {`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ android {`
`26`	`26`	`compileSdk = flutter.compileSdkVersion`
`27`	`27`
`28`	`28`	`compileOptions {`
`29`		`- sourceCompatibility = JavaVersion.VERSION_11`
`30`		`- targetCompatibility = JavaVersion.VERSION_11`
	`29`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`30`	`+ targetCompatibility = JavaVersion.VERSION_17`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`defaultConfig {`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ android {`
`28`	`28`	`ndkVersion = flutter.ndkVersion`
`29`	`29`
`30`	`30`	`compileOptions {`
`31`		`- sourceCompatibility = JavaVersion.VERSION_11`
`32`		`- targetCompatibility = JavaVersion.VERSION_11`
	`31`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`32`	`+ targetCompatibility = JavaVersion.VERSION_17`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`defaultConfig {`