Merge branch 'flutter:main' into main

ricardoamador · Jan 26, 2024 · 24d1f77 · 24d1f77
2 parents 77669d7 + 21a8d58
commit 24d1f77
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/CI_YAML.md b/CI_YAML.md
@@ -121,8 +121,8 @@ owner in [TESTOWNERS](https://github.com/flutter/flutter/blob/master/TESTOWNERS)
 Targets support specifying properties that can be passed throughout infrastructure. The
 following are a list of keys that are reserved for special use.
 
-**Properties is a Map<String, String> and any special values must be JSON encoded
-(i.e. no trailing commas). Additionally, these strings must be compatible with YAML multiline strings**
+**Properties** is a Map<String, String> and any special values must be JSON encoded
+(i.e. no trailing commas). Additionally, these strings must be compatible with YAML multiline strings
 
 **$flutter/osx_sdk**: xcode configs including sdk and runtime. **Note**: support on legacy `xcode`/`runtime`
 properties and `xcode` dependency has been deprecated.
@@ -188,6 +188,17 @@ Example
 presubmit_max_attempts: "3"
 ```
 
+**contexts** The list of contexts that will guide [recipes](https://flutter.googlesource.com/recipes/+/refs/heads/main/recipe_modules/flutter_deps/api.py#665) to add to [ExitStack](https://docs.python.org/3/library/contextlib.html#contextlib.ExitStack).
+
+Example
+```yaml
+contexts: >-
+        [
+          "android_virtual_device"
+        ]
+```
+This will initialize and prepare the virtual device used for tests. Other supported contexts include: `osx_sdk`, `depot_tools_on_path`, etc.
+
 ### Updating targets
 
 #### Properties

diff --git a/dashboard/lib/widgets/sign_in_button/sign_in_button_web.dart b/dashboard/lib/widgets/sign_in_button/sign_in_button_web.dart
@@ -3,16 +3,14 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-
-import 'package:google_sign_in_platform_interface/google_sign_in_platform_interface.dart';
-import 'package:google_sign_in_web/google_sign_in_web.dart';
+import 'package:google_sign_in_web/web_only.dart' as gsi_web;
 
 /// Widget that users can click to initiate the Sign In process.
 class SignInButton extends StatelessWidget {
   const SignInButton({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return (GoogleSignInPlatform.instance as GoogleSignInPlugin).renderButton();
+    return gsi_web.renderButton();
   }
 }
diff --git a/dashboard/pubspec.yaml b/dashboard/pubspec.yaml
@@ -19,13 +19,12 @@ dependencies:
   fixnum: 1.1.0 # Rolled by dependabot
   flutter_app_icons: 0.0.9 # Rolled by dependabot
   google_sign_in: 6.2.1 # Rolled by dependabot
-  google_sign_in_platform_interface: any # Match google_sign_in
-  google_sign_in_web: 0.12.3 # Rolled by dependabot
+  google_sign_in_web: 0.12.3+2 # Rolled by dependabot
   http: 1.2.0 # Rolled by dependabot
   protobuf: 3.1.0 # Rolled by dependabot
   provider: 6.1.1 # Rolled by dependabot
   truncate: 3.0.1 # Rolled by dependabot
-  url_launcher: 6.2.3 # Rolled by dependabot
+  url_launcher: 6.2.4 # Rolled by dependabot
   url_launcher_platform_interface: 2.3.1 # Rolled by dependabot
   url_launcher_web: 2.2.3 # Rolled by dependabot