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
diff --git a/packages/go_router/CHANGELOG.md b/packages/go_router/CHANGELOG.md
index 9ce2c9e015b..2ddd57a06ea 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
diff --git a/packages/go_router/lib/go_router.dart b/packages/go_router/lib/go_router.dart
index 4d0390172fa..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/route_data.dart' show GoRouteData, TypedGoRoute;
 export 'src/router.dart';
-export 'src/typed_routing.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
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