Merge remote-tracking branch 'upstream/main' into gradle_7.6.3

flutter · auto-submit · Dec 13, 2023 · May 1, 2023 · May 2, 2023 · May 3, 2023
commit fd223a1cf5b3d7f6cd3a89b5c2fe63a6b31ccbd5
diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version
@@ -1 +1 @@
-f35d049e0d8e0f1b3754293f36761fa3d985fca1
+97190973d6f502e264a330d252ca0c709071f11d
diff --git a/packages/animations/CHANGELOG.md b/packages/animations/CHANGELOG.md
@@ -1,9 +1,10 @@
-## 2.0.11
+## NEXT
 
 * Updates example app Gradle version to 7.6.3.
 
 ## 2.0.10
 
+
 * Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.
 
 ## 2.0.9

diff --git a/packages/animations/pubspec.yaml b/packages/animations/pubspec.yaml
@@ -2,7 +2,7 @@ name: animations
 description: Fancy pre-built animations that can easily be integrated into any Flutter application.
 repository: https://github.com/flutter/packages/tree/main/packages/animations
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+animations%22
-version: 2.0.11
+version: 2.0.10
 
 environment:
   sdk: ">=3.2.0 <4.0.0"

diff --git a/packages/go_router/CHANGELOG.md b/packages/go_router/CHANGELOG.md
@@ -1,7 +1,11 @@
-## 12.1.3
+## NEXT
 
 * Updates example app Gradle version to 7.6.3.
 
+## 12.1.3
+
+* Fixes a typo in `navigation.md`.
+
 ## 12.1.2
 
 * Fixes an incorrect use of `extends` for Dart 3 compatibility.

diff --git a/packages/google_identity_services_web/CHANGELOG.md b/packages/google_identity_services_web/CHANGELOG.md
@@ -1,6 +1,14 @@
-## 0.3.0
+## NEXT
 
 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
+
+## 0.3.0+1
+
+* Corrects 0.3.0 changelog entry about the minimum Flutter/Dart dependencies.
+
+## 0.3.0
+
+* Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.
 * Migrates from `package:js`/`dart:html` to `package:web` so this package can
   compile to WASM.
 * Performs the following **breaking API changes (in bold)** and other fixes to

diff --git a/packages/google_identity_services_web/example/pubspec.yaml b/packages/google_identity_services_web/example/pubspec.yaml
@@ -4,15 +4,15 @@ publish_to: 'none'
 version: 0.0.1
 
 environment:
-  flutter: ^3.16.0
-  sdk: ^3.2.0
+  flutter: ">=3.16.0"
+  sdk: ">=3.2.0 <4.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
   google_identity_services_web:
     path: ../
-  http: ^1.1.2
+  http: ">=0.13.0 <2.0.0"
   web: ">=0.3.0 <0.5.0"
 
 dev_dependencies:

diff --git a/packages/google_identity_services_web/pubspec.yaml b/packages/google_identity_services_web/pubspec.yaml
@@ -2,10 +2,10 @@ name: google_identity_services_web
 description: A Dart JS-interop layer for Google Identity Services. Google's new sign-in SDK for Web that supports multiple types of credentials.
 repository: https://github.com/flutter/packages/tree/main/packages/google_identity_services_web
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_identiy_services_web%22
-version: 0.3.0
+version: 0.3.0+1
 
 environment:
-  sdk: ^3.2.0
+  sdk: ">=3.2.0 <4.0.0"
 
 dependencies:
   meta: ^1.3.0

diff --git a/packages/google_sign_in/google_sign_in/CHANGELOG.md b/packages/google_sign_in/google_sign_in/CHANGELOG.md
@@ -1,8 +1,16 @@
-## 6.1.7
+## NEXT
 
 * Updates example app Gradle version to 7.6.3.
+
+## 6.2.1
+
 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
 
+## 6.2.0
+
+* Adds support for macOS.
+* Updates minimum supported SDK version to Flutter 3.16.
+
 ## 6.1.6
 
 * Updates README to direct to google_sign_in_ios README for iOS integration instructions.

diff --git a/packages/google_sign_in/google_sign_in/pubspec.yaml b/packages/google_sign_in/google_sign_in/pubspec.yaml
@@ -3,7 +3,11 @@ description: Flutter plugin for Google Sign-In, a secure authentication system
   for signing in with a Google account.
 repository: https://github.com/flutter/packages/tree/main/packages/google_sign_in/google_sign_in
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
+<<<<<<< HEAD
 version: 6.1.7
+=======
+version: 6.2.0
+>>>>>>> upstream/main
 
 environment:
   sdk: ">=3.2.0 <4.0.0"

diff --git a/packages/google_sign_in/google_sign_in_web/CHANGELOG.md b/packages/google_sign_in/google_sign_in_web/CHANGELOG.md
@@ -1,3 +1,11 @@
+## NEXT
+
+* Updates minimum supported SDK version to Flutter 3.16.0/Dart 3.2.0.
+
+## 0.12.3
+
+* Migrates to `package:web`.
+
 ## 0.12.2+1
 
 * Re-publishes `0.12.2` with a small fix to the CodeClient initialization.

diff --git a/packages/google_sign_in/google_sign_in_web/example/pubspec.yaml b/packages/google_sign_in/google_sign_in_web/example/pubspec.yaml
@@ -21,8 +21,8 @@ dev_dependencies:
   http: ">=0.13.0 <2.0.0"
   integration_test:
     sdk: flutter
-  js: ^0.6.3
   mockito: 5.4.3
+  web: ">=0.3.0 <0.5.0"
 
 flutter:
   uses-material-design: true
diff --git a/packages/google_sign_in/google_sign_in_web/pubspec.yaml b/packages/google_sign_in/google_sign_in_web/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system
   for signing in with a Google account on Android, iOS and Web.
 repository: https://github.com/flutter/packages/tree/main/packages/google_sign_in/google_sign_in_web
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
-version: 0.12.2+1
+version: 0.12.3
 
 environment:
   sdk: ">=3.2.0 <4.0.0"

diff --git a/packages/pointer_interceptor/pointer_interceptor/CHANGELOG.md b/packages/pointer_interceptor/pointer_interceptor/CHANGELOG.md
@@ -1,6 +1,7 @@
-## NEXT
+## 0.10.0
 
-* Adds iOS implementation.
+* Transitions to federated architecture.
+* Adds iOS implementation to federated package.
 
 ## 0.9.3+7
 

diff --git a/packages/pointer_interceptor/pointer_interceptor/pubspec.yaml b/packages/pointer_interceptor/pointer_interceptor/pubspec.yaml
@@ -2,9 +2,7 @@ name: pointer_interceptor
 description: A widget to prevent clicks from being swallowed by underlying HtmlElementViews on the web.
 repository: https://github.com/flutter/packages/tree/main/packages/pointer_interceptor/pointer_interceptor
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pointer_interceptor%22
-version: 0.9.3+7
-# while transitioning to federated structure, removed ability to published temporarily.
-publish_to: none
+version: 0.10.0
 
 environment:
   sdk: ">=3.1.0 <4.0.0"
@@ -24,11 +22,9 @@ dependencies:
     sdk: flutter
   flutter_web_plugins:
     sdk: flutter
-  pointer_interceptor_ios:
-    path: ../pointer_interceptor_ios
+  pointer_interceptor_ios: ^0.10.0
   pointer_interceptor_platform_interface: ^0.10.0
-  pointer_interceptor_web:
-    path: ../pointer_interceptor_web
+  pointer_interceptor_web: ^0.10.0
 
 dev_dependencies:
   flutter_test:

diff --git a/packages/two_dimensional_scrollables/CHANGELOG.md b/packages/two_dimensional_scrollables/CHANGELOG.md
@@ -1,7 +1,7 @@
-## 0.0.6
-
-* Updates example app Gradle version to 7.6.3.
+## NEXT
 
+* Updates minimum supported SDK version to Flutter 3.16.0/Dart 3.2.0.
+
 ## 0.0.5
 
 * Exposes addAutomaticKeepAlives in TableCellBuilderDelegate and TableCellListDelegate

diff --git a/packages/two_dimensional_scrollables/pubspec.yaml b/packages/two_dimensional_scrollables/pubspec.yaml
@@ -1,6 +1,6 @@
 name: two_dimensional_scrollables
 description: Widgets that scroll using the two dimensional scrolling foundation.
-version: 0.0.6
+version: 0.0.5
 repository: https://github.com/flutter/packages/tree/main/packages/two_dimensional_scrollables
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+two_dimensional_scrollables%22+
 

diff --git a/packages/url_launcher/url_launcher/CHANGELOG.md b/packages/url_launcher/url_launcher/CHANGELOG.md
@@ -1,6 +1,11 @@
+## NEXT
+
+* Updates minimum supported SDK version to Flutter 3.16.0/Dart 3.2.0.
+
 ## 6.2.2
 
-* Updates example app Gradle version to 7.6.3.
+* Adds a link about web limitations to the `url_launcher_web` package in the
+  `url_launcher` `README.md` and `launchUrl` method.
 
 ## 6.2.1
 

diff --git a/packages/web_benchmarks/CHANGELOG.md b/packages/web_benchmarks/CHANGELOG.md
@@ -1,3 +1,20 @@
+## 1.1.0
+
+* Adds `computeAverage` and `computeDelta` methods to support analysis of benchmark results.
+
+## 1.0.1
+
+* Adds `parse` constructors for the `BenchmarkResults` and `BenchmarkScore` classes.
+
+## 1.0.0
+
+* **Breaking change:** replace the `useCanvasKit` parameter in the `serveWebBenchmark`
+method with a new parameter `compilationOptions`, which allows you to:
+  * specify the web renderer to use for the benchmark app (html, canvaskit, or skwasm)
+  * specify whether to use WebAssembly to build the benchmark app
+* **Breaking change:** `serveWebBenchmark` now uses `canvaskit` instead of `html` as the
+default web renderer.
+
 ## 0.1.0+11
 
 * Migrates benchmark recorder from `dart:html` to `package:web` to support WebAssembly.

diff --git a/packages/web_benchmarks/lib/client.dart b/packages/web_benchmarks/lib/client.dart
@@ -53,15 +53,18 @@ Future<void> runBenchmarks(
   final Uri currentUri = Uri.parse(window.location.href);
   // Create a new URI with the current 'page' value set to [initialPage] to
   // ensure the benchmark app is reloaded at the proper location.
-  final Uri newUri = Uri(
+  final String newUri = Uri(
     scheme: currentUri.scheme,
     host: currentUri.host,
     port: currentUri.port,
     path: initialPage,
-  );
+  ).toString();
 
   // Reloading the window will trigger the next benchmark to run.
-  window.location.replace(newUri.toString());
+  await _client.printToConsole(
+    'Client preparing to reload the window to: "$newUri"',
+  );
+  window.location.replace(newUri);
 }
 
 Future<void> _runBenchmark(String? benchmarkName) async {

diff --git a/packages/web_benchmarks/lib/server.dart b/packages/web_benchmarks/lib/server.dart
@@ -9,6 +9,7 @@ import 'package:logging/logging.dart';
 
 import 'src/benchmark_result.dart';
 import 'src/common.dart';
+import 'src/compilation_options.dart';
 import 'src/runner.dart';
 
 export 'src/benchmark_result.dart';
@@ -49,6 +50,7 @@ Future<BenchmarkResults> serveWebBenchmark({
   bool headless = true,
   bool treeShakeIcons = true,
   String initialPage = defaultInitialPage,
+  CompilationOptions compilationOptions = const CompilationOptions(),
 }) async {
   // Reduce logging level. Otherwise, package:webkit_inspection_protocol is way too spammy.
   Logger.root.level = Level.INFO;

diff --git a/packages/web_benchmarks/lib/src/runner.dart b/packages/web_benchmarks/lib/src/runner.dart
@@ -55,6 +55,7 @@ class BenchmarkServer {
     required this.chromeDebugPort,
     required this.headless,
     required this.treeShakeIcons,
+    this.compilationOptions = const CompilationOptions(),
     this.initialPage = defaultInitialPage,
   });
 

diff --git a/packages/web_benchmarks/pubspec.yaml b/packages/web_benchmarks/pubspec.yaml
@@ -2,7 +2,7 @@ name: web_benchmarks
 description: A benchmark harness for performance-testing Flutter apps in Chrome.
 repository: https://github.com/flutter/packages/tree/main/packages/web_benchmarks
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+web_benchmarks%22
-version: 0.1.0+11
+version: 1.1.0
 
 environment:
   sdk: ">=3.2.0 <4.0.0"

diff --git a/packages/web_benchmarks/testing/web_benchmarks_test.dart b/packages/web_benchmarks/testing/web_benchmarks_test.dart
@@ -25,19 +25,28 @@ Future<void> main() async {
       initialPage: 'index.html#about',
     );
   }, timeout: Timeout.none);
+
+  test('Can run a web benchmark with wasm', () async {
+    await _runBenchmarks(
+      benchmarkNames: <String>['simple'],
+      entryPoint: 'lib/benchmarks/runner_simple.dart',
+      compilationOptions: const CompilationOptions(useWasm: true),
+    );
+  }, timeout: Timeout.none);
 }
 
 Future<void> _runBenchmarks({
   required List<String> benchmarkNames,
   required String entryPoint,
   String initialPage = defaultInitialPage,
+  CompilationOptions compilationOptions = const CompilationOptions(),
 }) async {
   final BenchmarkResults taskResult = await serveWebBenchmark(
     benchmarkAppDirectory: Directory('testing/test_app'),
     entryPoint: entryPoint,
-    useCanvasKit: false,
     treeShakeIcons: false,
     initialPage: initialPage,
+    compilationOptions: compilationOptions,
   );
 
   for (final String benchmarkName in benchmarkNames) {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		f35d049e0d8e0f1b3754293f36761fa3d985fca1
		97190973d6f502e264a330d252ca0c709071f11d