Skip to content
This repository was archived by the owner on Apr 14, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: "3.32.0"
working_directory: example
runs_on: macos-latest
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
flutter-version:
# The version of Flutter to use should use the minimum Dart SDK version supported by the package,
# refer to https://docs.flutter.dev/development/tools/sdk/releases.
- "3.29.0"
- "3.32.0"
- "3.x"
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include: package:very_good_analysis/analysis_options.7.0.0.yaml
include: package:very_good_analysis/analysis_options.yaml
2 changes: 1 addition & 1 deletion example/analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include: package:very_good_analysis/analysis_options.7.0.0.yaml
include: package:very_good_analysis/analysis_options.yaml
linter:
rules:
public_member_api_docs: false
9 changes: 5 additions & 4 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ version: 0.0.1
homepage: https://github.com/VeryGoodOpenSource/mockingjay

environment:
sdk: ^3.7.0
sdk: ^3.8.0
flutter: ^3.32.0

dependencies:
bloc: ^9.0.0
equatable: ^2.0.5
equatable: ^2.0.7
flutter:
sdk: flutter
flutter_bloc: ^9.1.0
flutter_bloc: ^9.1.1
universal_io: ^2.2.2

dev_dependencies:
Expand All @@ -21,7 +22,7 @@ dev_dependencies:
mockingjay:
path: ../
mocktail: ^1.0.4
very_good_analysis: ^7.0.0
very_good_analysis: ^8.0.0

flutter:
uses-material-design: true
34 changes: 16 additions & 18 deletions lib/src/matchers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -284,27 +284,25 @@ class _RouteMatcher<T> extends Matcher {
mismatchDescriptions.add("the route's `arguments` $mismatch");
}
if (!maintainStateMatches) {
final mismatch =
item is! ModalRoute
? 'is not a property on `${item.runtimeType}` and can only be '
'used with `ModalRoute`s'
: whereMaintainState!.describeMismatchAsString(
item.maintainState,
matchState,
verbose: verbose,
);
final mismatch = item is! ModalRoute
? 'is not a property on `${item.runtimeType}` and can only be '
'used with `ModalRoute`s'
: whereMaintainState!.describeMismatchAsString(
item.maintainState,
matchState,
verbose: verbose,
);
mismatchDescriptions.add('`maintainState` $mismatch');
}
if (!fullscreenDialogMatches) {
final mismatch =
item is! PageRoute
? 'is not a property on `${item.runtimeType}` and can only be '
'used with `PageRoute`s'
: whereFullscreenDialog!.describeMismatchAsString(
item.fullscreenDialog,
matchState,
verbose: verbose,
);
final mismatch = item is! PageRoute
? 'is not a property on `${item.runtimeType}` and can only be '
'used with `PageRoute`s'
: whereFullscreenDialog!.describeMismatchAsString(
item.fullscreenDialog,
matchState,
verbose: verbose,
);
mismatchDescriptions.add('`fullscreenDialog` $mismatch');
}

Expand Down
9 changes: 7 additions & 2 deletions lib/src/mock_navigator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,12 @@ class _MockNavigatorState extends NavigatorState {
}

@override
void removeRouteBelow(Route<dynamic> anchorRoute) {
return _navigator.removeRouteBelow(anchorRoute);
void removeRoute<T extends Object?>(Route<T> route, [T? result]) {
return _navigator.removeRoute(route, result);
}

@override
void removeRouteBelow<T extends Object?>(Route<T> anchorRoute, [T? result]) {
return _navigator.removeRouteBelow(anchorRoute, result);
}
}
8 changes: 4 additions & 4 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ version: 1.0.0
homepage: https://github.com/VeryGoodOpenSource/mockingjay

environment:
sdk: ^3.7.0
flutter: ^3.29.0
sdk: ^3.8.0
flutter: ^3.32.0

dependencies:
flutter:
sdk: flutter
flutter_test:
sdk: flutter
matcher: ^0.12.16+1
matcher: ^0.12.17
mocktail: ^1.0.4
test: ^1.25.7

dev_dependencies:
very_good_analysis: ^7.0.0
very_good_analysis: ^8.0.0
Loading