Merge remote-tracking branch 'upstream/main' into update-goldens

Author: LongCatIsLooong

.ci/flutter_master.version

@@ -1 +1 @@
-d8a7211061084525a992664d997cff9349fa43d3
+67e5f663d075f31b251e22bb9a6b2c5c6744f448

.ci/scripts/create_simulator.sh

@@ -3,8 +3,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-device=com.apple.CoreSimulator.SimDeviceType.iPhone-13
-os=com.apple.CoreSimulator.SimRuntime.iOS-16-0
+# The name here must match remove_simulator.sh
+readonly DEVICE_NAME=Flutter-iPhone
+readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-13
+readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-16-0
 
 xcrun simctl list
-xcrun simctl create Flutter-iPhone "$device" "$os" | xargs xcrun simctl boot
+xcrun simctl create "$DEVICE_NAME" "$DEVICE" "$OS" | xargs xcrun simctl boot

.ci/scripts/remove_simulator.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+# 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.
+
+# The name here must match create_simulator.sh
+readonly DEVICE_NAME=Flutter-iPhone
+
+xcrun simctl shutdown "$DEVICE_NAME"
+xcrun simctl delete "$DEVICE_NAME"
+xcrun simctl list

.ci/targets/ios_platform_tests.yaml

@@ -22,3 +22,5 @@ tasks:
     # So we run `drive-examples` after `native-test`; changing the order will result ci failure.
     script: script/tool_runner.sh
     args: ["drive-examples", "--ios", "--exclude=script/configs/exclude_integration_ios.yaml"]
+  - name: remove simulator
+    script: .ci/scripts/remove_simulator.sh

.ci/targets/macos_custom_package_tests.yaml

@@ -5,3 +5,5 @@ tasks:
     script: .ci/scripts/create_simulator.sh
   - name: custom package tests
     script: .ci/scripts/custom_package_tests.sh
+  - name: remove simulator
+    script: .ci/scripts/remove_simulator.sh

.cirrus.yml

@@ -97,7 +97,7 @@ task:
         license_script: $PLUGIN_TOOL_COMMAND license-check
         # The major and minor version here should match the lowest version
         # analyzed in legacy_version_analyze.
-        pubspec_script: ./script/tool_runner.sh pubspec-check --min-min-flutter-version=3.0.0
+        pubspec_script: ./script/tool_runner.sh pubspec-check --min-min-flutter-version=3.0.0 --allow-dependencies=script/configs/allowed_unpinned_deps.yaml --allow-pinned-dependencies=script/configs/allowed_pinned_deps.yaml
         readme_script:
           - ./script/tool_runner.sh readme-check
           # Re-run with --require-excerpts, skipping packages that still need

packages/camera/camera/pubspec.yaml

@@ -35,6 +35,6 @@ dev_dependencies:
     sdk: flutter
   flutter_test:
     sdk: flutter
-  mockito: ^5.0.0
+  mockito: 5.3.2
   plugin_platform_interface: ^2.0.0
   video_player: ^2.0.0

packages/camera/camera_android_camerax/pubspec.yaml

@@ -30,5 +30,5 @@ dev_dependencies:
   build_runner: ^2.1.4
   flutter_test:
     sdk: flutter
-  mockito: ^5.3.2
+  mockito: 5.3.2
   pigeon: ^3.2.6

packages/camera/camera_web/example/pubspec.yaml

@@ -21,4 +21,4 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
-  mocktail: ^0.3.0
+  mocktail: 0.3.0

packages/file_selector/file_selector_ios/pubspec.yaml

@@ -25,6 +25,6 @@ dev_dependencies:
   build_runner: 2.1.11
   flutter_test:
     sdk: flutter
-  mockito: ^5.1.0
+  mockito: 5.3.2
   pigeon: ^3.2.5
 

packages/file_selector/file_selector_macos/pubspec.yaml

@@ -26,5 +26,5 @@ dev_dependencies:
   build_runner: ^2.3.2
   flutter_test:
     sdk: flutter
-  mockito: ^5.3.2
+  mockito: 5.3.2
   pigeon: ^4.2.14

packages/file_selector/file_selector_windows/pubspec.yaml

@@ -26,5 +26,5 @@ dev_dependencies:
   build_runner: 2.1.11
   flutter_test:
     sdk: flutter
-  mockito: ^5.1.0
+  mockito: 5.3.2
   pigeon: ^3.2.5

packages/flutter_markdown/pubspec.yaml

@@ -20,5 +20,5 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  mockito: ^5.0.0
+  mockito: 5.3.2
   standard_message_codec: ^0.0.1+3

packages/flutter_migrate/pubspec.yaml

@@ -22,7 +22,7 @@ dependencies:
 
 dev_dependencies:
   collection: 1.16.0
-  file_testing: ^3.0.0
+  file_testing: 3.0.0
   lints: ^2.0.0
   test: ^1.16.0
   test_api: ^0.4.13

packages/go_router/example/pubspec.yaml

@@ -8,7 +8,7 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  adaptive_dialog: ^1.2.0
+  adaptive_dialog: 1.8.2
   adaptive_navigation: ^0.0.4
   collection: ^1.15.0
   cupertino_icons: ^1.0.2
@@ -17,7 +17,7 @@ dependencies:
   go_router:
     path: ..
   logging: ^1.0.0
-  provider: ^6.0.0
+  provider: 6.0.5
   shared_preferences: ^2.0.11
   url_launcher: ^6.0.7
 

packages/go_router_builder/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.7
+
+* Supports default values for `Set`, `List` and `Iterable` route parameters.
+
 ## 1.1.6
 
 * Generates the const enum map for enums used in `List`, `Set` and `Iterable`.

packages/go_router_builder/example/lib/all_types.dart

@@ -25,6 +25,8 @@ part 'all_types.g.dart';
   TypedGoRoute<StringRoute>(path: 'string-route/:requiredStringField'),
   TypedGoRoute<UriRoute>(path: 'uri-route/:requiredUriField'),
   TypedGoRoute<IterableRoute>(path: 'iterable-route'),
+  TypedGoRoute<IterableRouteWithDefaultValues>(
+      path: 'iterable-route-with-default-values'),
 ])
 @immutable
 class AllTypesBaseRoute extends GoRouteData {
@@ -337,9 +339,23 @@ class IterableRoute extends GoRouteData {
   final Set<CookingRecipe>? enumOnlyInSetField;
 
   @override
-  Widget build(BuildContext context, GoRouterState state) =>
-      const BasePage<String>(
+  Widget build(BuildContext context, GoRouterState state) => IterablePage(
         dataTitle: 'IterableRoute',
+        intIterableField: intIterableField,
+        doubleIterableField: doubleIterableField,
+        stringIterableField: stringIterableField,
+        boolIterableField: boolIterableField,
+        enumIterableField: enumIterableField,
+        intListField: intListField,
+        doubleListField: doubleListField,
+        stringListField: stringListField,
+        boolListField: boolListField,
+        enumListField: enumListField,
+        intSetField: intSetField,
+        doubleSetField: doubleSetField,
+        stringSetField: stringSetField,
+        boolSetField: boolSetField,
+        enumSetField: enumSetField,
       );
 
   Widget drawerTile(BuildContext context) => ListTile(
@@ -349,6 +365,75 @@ class IterableRoute extends GoRouteData {
       );
 }
 
+class IterableRouteWithDefaultValues extends GoRouteData {
+  const IterableRouteWithDefaultValues({
+    this.intIterableField = const <int>[0],
+    this.doubleIterableField = const <double>[0, 1, 2],
+    this.stringIterableField = const <String>['defaultValue'],
+    this.boolIterableField = const <bool>[false],
+    this.enumIterableField = const <SportDetails>[
+      SportDetails.tennis,
+      SportDetails.hockey,
+    ],
+    this.intListField = const <int>[0],
+    this.doubleListField = const <double>[1, 2, 3],
+    this.stringListField = const <String>['defaultValue0', 'defaultValue1'],
+    this.boolListField = const <bool>[true],
+    this.enumListField = const <SportDetails>[SportDetails.football],
+    this.intSetField = const <int>{0, 1},
+    this.doubleSetField = const <double>{},
+    this.stringSetField = const <String>{'defaultValue'},
+    this.boolSetField = const <bool>{true, false},
+    this.enumSetField = const <SportDetails>{SportDetails.hockey},
+  });
+
+  final Iterable<int> intIterableField;
+  final List<int> intListField;
+  final Set<int> intSetField;
+
+  final Iterable<double> doubleIterableField;
+  final List<double> doubleListField;
+  final Set<double> doubleSetField;
+
+  final Iterable<String> stringIterableField;
+  final List<String> stringListField;
+  final Set<String> stringSetField;
+
+  final Iterable<bool> boolIterableField;
+  final List<bool> boolListField;
+  final Set<bool> boolSetField;
+
+  final Iterable<SportDetails> enumIterableField;
+  final List<SportDetails> enumListField;
+  final Set<SportDetails> enumSetField;
+
+  @override
+  Widget build(BuildContext context, GoRouterState state) => IterablePage(
+        dataTitle: 'IterableRouteWithDefaultValues',
+        intIterableField: intIterableField,
+        doubleIterableField: doubleIterableField,
+        stringIterableField: stringIterableField,
+        boolIterableField: boolIterableField,
+        enumIterableField: enumIterableField,
+        intListField: intListField,
+        doubleListField: doubleListField,
+        stringListField: stringListField,
+        boolListField: boolListField,
+        enumListField: enumListField,
+        intSetField: intSetField,
+        doubleSetField: doubleSetField,
+        stringSetField: stringSetField,
+        boolSetField: boolSetField,
+        enumSetField: enumSetField,
+      );
+
+  Widget drawerTile(BuildContext context) => ListTile(
+        title: const Text('IterableRouteWithDefaultValues'),
+        onTap: () => go(context),
+        selected: GoRouter.of(context).location == location,
+      );
+}
+
 class BasePage<T> extends StatelessWidget {
   const BasePage({
     required this.dataTitle,
@@ -437,6 +522,7 @@ class BasePage<T> extends StatelessWidget {
                 SportDetails.hockey,
               },
             ).drawerTile(context),
+            const IterableRouteWithDefaultValues().drawerTile(context),
           ],
         )),
         body: Center(
@@ -475,3 +561,71 @@ class AllTypesApp extends StatelessWidget {
     initialLocation: const AllTypesBaseRoute().location,
   );
 }
+
+class IterablePage extends StatelessWidget {
+  const IterablePage({
+    required this.dataTitle,
+    this.intIterableField,
+    this.doubleIterableField,
+    this.stringIterableField,
+    this.boolIterableField,
+    this.enumIterableField,
+    this.intListField,
+    this.doubleListField,
+    this.stringListField,
+    this.boolListField,
+    this.enumListField,
+    this.intSetField,
+    this.doubleSetField,
+    this.stringSetField,
+    this.boolSetField,
+    this.enumSetField,
+    super.key,
+  });
+
+  final String dataTitle;
+
+  final Iterable<int>? intIterableField;
+  final List<int>? intListField;
+  final Set<int>? intSetField;
+
+  final Iterable<double>? doubleIterableField;
+  final List<double>? doubleListField;
+  final Set<double>? doubleSetField;
+
+  final Iterable<String>? stringIterableField;
+  final List<String>? stringListField;
+  final Set<String>? stringSetField;
+
+  final Iterable<bool>? boolIterableField;
+  final List<bool>? boolListField;
+  final Set<bool>? boolSetField;
+
+  final Iterable<SportDetails>? enumIterableField;
+  final List<SportDetails>? enumListField;
+  final Set<SportDetails>? enumSetField;
+
+  @override
+  Widget build(BuildContext context) {
+    return BasePage<String>(
+      dataTitle: dataTitle,
+      queryParamWithDefaultValue: <String, Iterable<dynamic>?>{
+        'intIterableField': intIterableField,
+        'intListField': intListField,
+        'intSetField': intSetField,
+        'doubleIterableField': doubleIterableField,
+        'doubleListField': doubleListField,
+        'doubleSetField': doubleSetField,
+        'stringIterableField': stringIterableField,
+        'stringListField': stringListField,
+        'stringSetField': stringSetField,
+        'boolIterableField': boolIterableField,
+        'boolListField': boolListField,
+        'boolSetField': boolSetField,
+        'enumIterableField': enumIterableField,
+        'enumListField': enumListField,
+        'enumSetField': enumSetField,
+      }.toString(),
+    );
+  }
+}