From 48875a0cc4d30a4862150ff6235d54d13950bffe Mon Sep 17 00:00:00 2001 From: David Iglesias Date: Thu, 25 Jan 2024 15:31:31 -0800 Subject: [PATCH 1/3] [dashboard] Fix Log-In button not showing up. (#3443) Cocoon's dependabot seems to be ignoring "patch" (`+z`) releases in packages with version < `1.0.0`. That's caused them to miss [a fix in how the Google Sign In button renders into the app](https://github.com/flutter/packages/pull/5660) that was released as a "patch" version (`0.12.3+1`). This PR updates the cocoon dependency to the fixed version of the package, so the Google Sign In button renders normally again. (It also uses a new API introduced in 0.12.3 to access `web_only` components much more easily than before, which allows to remove an intermediate dependency). ## Issues * Fixes https://github.com/flutter/flutter/issues/142195 --- .../lib/widgets/sign_in_button/sign_in_button_web.dart | 6 ++---- dashboard/pubspec.yaml | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) 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 index 20971b586..55470237f 100644 --- 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,9 +3,7 @@ // 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 { @@ -13,6 +11,6 @@ class SignInButton extends StatelessWidget { @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 index ea3d34669..c9149dbdb 100644 --- a/dashboard/pubspec.yaml +++ b/dashboard/pubspec.yaml @@ -19,8 +19,7 @@ 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 From b43a53e1e564de6709e897c877f89b8765563355 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 00:13:22 +0000 Subject: [PATCH 2/3] Bump url_launcher from 6.2.3 to 6.2.4 in /dashboard (#3444) Bumps [url_launcher](https://github.com/flutter/packages/tree/main/packages/url_launcher) from 6.2.3 to 6.2.4.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=url_launcher&package-manager=pub&previous-version=6.2.3&new-version=6.2.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- dashboard/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dashboard/pubspec.yaml b/dashboard/pubspec.yaml index c9149dbdb..5ac7bdf1a 100644 --- a/dashboard/pubspec.yaml +++ b/dashboard/pubspec.yaml @@ -24,7 +24,7 @@ dependencies: 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 From 21a8d58d919324fa21ef36e5425a65b9eb644b39 Mon Sep 17 00:00:00 2001 From: keyonghan <54558023+keyonghan@users.noreply.github.com> Date: Fri, 26 Jan 2024 09:11:46 -0800 Subject: [PATCH 3/3] Add doc about `contexts` property (#3442) Adding doc for `contexts`. --- CI_YAML.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/CI_YAML.md b/CI_YAML.md index a8efb1eef..da6a0b298 100644 --- 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 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 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