From 302668a22fa35a50176d85efd94e96b52717ab05 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Tue, 26 Jul 2022 09:26:27 -0700 Subject: [PATCH 1/6] Change typed_routing.dart back to route_data.dart --- packages/go_router/lib/go_router.dart | 2 +- packages/go_router/lib/src/builder.dart | 2 +- .../go_router/lib/src/{typed_routing.dart => route_data.dart} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename packages/go_router/lib/src/{typed_routing.dart => route_data.dart} (100%) diff --git a/packages/go_router/lib/go_router.dart b/packages/go_router/lib/go_router.dart index 4d0390172fa..0734cb8b996 100644 --- a/packages/go_router/lib/go_router.dart +++ b/packages/go_router/lib/go_router.dart @@ -13,5 +13,5 @@ export 'src/misc/refresh_stream.dart'; export 'src/pages/custom_transition_page.dart'; export 'src/platform.dart' show UrlPathStrategy; export 'src/router.dart'; -export 'src/typed_routing.dart' show GoRouteData, TypedGoRoute; +export 'src/route_data.dart' show GoRouteData, TypedGoRoute; export 'src/typedefs.dart' show GoRouterPageBuilder, GoRouterRedirect; diff --git a/packages/go_router/lib/src/builder.dart b/packages/go_router/lib/src/builder.dart index 28ef9b76a78..4e27220066f 100644 --- a/packages/go_router/lib/src/builder.dart +++ b/packages/go_router/lib/src/builder.dart @@ -12,7 +12,7 @@ import 'misc/error_screen.dart'; import 'pages/cupertino.dart'; import 'pages/custom_transition_page.dart'; import 'pages/material.dart'; -import 'typed_routing.dart'; +import 'route_data.dart'; import 'typedefs.dart'; /// Builds the top-level Navigator for GoRouter. diff --git a/packages/go_router/lib/src/typed_routing.dart b/packages/go_router/lib/src/route_data.dart similarity index 100% rename from packages/go_router/lib/src/typed_routing.dart rename to packages/go_router/lib/src/route_data.dart From 981799c1cd0a578126bbfdf02b6fda575ab10e94 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Tue, 26 Jul 2022 09:35:12 -0700 Subject: [PATCH 2/6] sort imports --- packages/go_router/lib/go_router.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/go_router/lib/go_router.dart b/packages/go_router/lib/go_router.dart index 0734cb8b996..efb52fd5501 100644 --- a/packages/go_router/lib/go_router.dart +++ b/packages/go_router/lib/go_router.dart @@ -12,6 +12,6 @@ export 'src/misc/inherited_router.dart'; export 'src/misc/refresh_stream.dart'; export 'src/pages/custom_transition_page.dart'; export 'src/platform.dart' show UrlPathStrategy; -export 'src/router.dart'; export 'src/route_data.dart' show GoRouteData, TypedGoRoute; +export 'src/router.dart'; export 'src/typedefs.dart' show GoRouterPageBuilder, GoRouterRedirect; From 14e127415d808b044a8415ddad3e95914d298f41 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Tue, 26 Jul 2022 09:58:43 -0700 Subject: [PATCH 3/6] Use flutter_plugin_tools 0.8.9 --- .ci/scripts/prepare_tool.sh | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/scripts/prepare_tool.sh b/.ci/scripts/prepare_tool.sh index a133aaf7927..2f3d3c9dca3 100755 --- a/.ci/scripts/prepare_tool.sh +++ b/.ci/scripts/prepare_tool.sh @@ -8,4 +8,4 @@ git fetch origin main # Pinned version of the plugin tools, to avoid breakage in this repository # when pushing updates from flutter/plugins. -dart pub global activate flutter_plugin_tools 0.8.7 +dart pub global activate flutter_plugin_tools 0.8.9 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 318c7853f43..38f74fa30f0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: with: fetch-depth: 0 # Fetch all history so the tool can get all the tags to determine version. - name: Set up tools - run: dart pub global activate flutter_plugin_tools 0.8.7 + run: dart pub global activate flutter_plugin_tools 0.8.9 # # This workflow should be the last to run. So wait for all the other tests to succeed. - name: Wait on all tests From 3bda58cc8a271600590b942f9c874310333a4123 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Tue, 26 Jul 2022 09:58:59 -0700 Subject: [PATCH 4/6] Bump go_router version to 4.2.2 --- packages/go_router/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/go_router/pubspec.yaml b/packages/go_router/pubspec.yaml index 1433f92d905..4c8da3d9c5f 100644 --- a/packages/go_router/pubspec.yaml +++ b/packages/go_router/pubspec.yaml @@ -1,7 +1,7 @@ name: go_router description: A declarative router for Flutter based on Navigation 2 supporting deep linking, data-driven routes and more -version: 4.2.1 +version: 4.2.2 repository: https://github.com/flutter/packages/tree/main/packages/go_router issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+go_router%22 From 3be46fbb7e0ae432196419b653d10e64037b5156 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Tue, 26 Jul 2022 10:13:06 -0700 Subject: [PATCH 5/6] Update CHANGELOG --- packages/go_router/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/go_router/CHANGELOG.md b/packages/go_router/CHANGELOG.md index 9ce2c9e015b..a6b16dbefa4 100644 --- a/packages/go_router/CHANGELOG.md +++ b/packages/go_router/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.2.2 + +- Fixes a bug where go_router_builder wasn't detecting annotations + ## 4.2.1 - Refactors internal classes and methods From ee07a826adc40bf3f654cea662da1d879a6345e1 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Tue, 26 Jul 2022 11:15:54 -0700 Subject: [PATCH 6/6] Update CHANGELOG.md --- packages/go_router/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/go_router/CHANGELOG.md b/packages/go_router/CHANGELOG.md index a6b16dbefa4..2ddd57a06ea 100644 --- a/packages/go_router/CHANGELOG.md +++ b/packages/go_router/CHANGELOG.md @@ -1,6 +1,6 @@ ## 4.2.2 -- Fixes a bug where go_router_builder wasn't detecting annotations +- Fixes a bug where go_router_builder wasn't detecting annotations. ## 4.2.1