Skip to content

Commit 388f94d

Browse files
chore!: upgrade to flutter 3.32.0 (#98)
* chore: upgrade to flutter 3.32.0 * fix: formatting * test: add missing tests * chore: add co-author to branch Co-authored-by: Conrad Gende <[email protected]> --------- Co-authored-by: Conrad Gende <[email protected]>
1 parent f575fc1 commit 388f94d

File tree

9 files changed

+170
-183
lines changed

9 files changed

+170
-183
lines changed

.github/workflows/example.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ jobs:
2020
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
2121
with:
2222
flutter_channel: stable
23+
flutter_version: "3.32.0"
2324
working_directory: example
2425
runs_on: macos-latest

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
flutter-version:
2323
# The version of Flutter to use should use the minimum Dart SDK version supported by the package,
2424
# refer to https://docs.flutter.dev/development/tools/sdk/releases.
25-
- "3.29.0"
25+
- "3.32.0"
2626
- "3.x"
2727
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
2828
with:

analysis_options.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include: package:very_good_analysis/analysis_options.7.0.0.yaml
1+
include: package:very_good_analysis/analysis_options.yaml

example/analysis_options.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include: package:very_good_analysis/analysis_options.7.0.0.yaml
1+
include: package:very_good_analysis/analysis_options.yaml
22
linter:
33
rules:
44
public_member_api_docs: false

example/pubspec.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ version: 0.0.1
44
homepage: https://github.com/VeryGoodOpenSource/mockingjay
55

66
environment:
7-
sdk: ^3.7.0
7+
sdk: ^3.8.0
8+
flutter: ^3.32.0
89

910
dependencies:
1011
bloc: ^9.0.0
11-
equatable: ^2.0.5
12+
equatable: ^2.0.7
1213
flutter:
1314
sdk: flutter
14-
flutter_bloc: ^9.1.0
15+
flutter_bloc: ^9.1.1
1516
universal_io: ^2.2.2
1617

1718
dev_dependencies:
@@ -21,7 +22,7 @@ dev_dependencies:
2122
mockingjay:
2223
path: ../
2324
mocktail: ^1.0.4
24-
very_good_analysis: ^7.0.0
25+
very_good_analysis: ^8.0.0
2526

2627
flutter:
2728
uses-material-design: true

lib/src/matchers.dart

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -284,27 +284,25 @@ class _RouteMatcher<T> extends Matcher {
284284
mismatchDescriptions.add("the route's `arguments` $mismatch");
285285
}
286286
if (!maintainStateMatches) {
287-
final mismatch =
288-
item is! ModalRoute
289-
? 'is not a property on `${item.runtimeType}` and can only be '
290-
'used with `ModalRoute`s'
291-
: whereMaintainState!.describeMismatchAsString(
292-
item.maintainState,
293-
matchState,
294-
verbose: verbose,
295-
);
287+
final mismatch = item is! ModalRoute
288+
? 'is not a property on `${item.runtimeType}` and can only be '
289+
'used with `ModalRoute`s'
290+
: whereMaintainState!.describeMismatchAsString(
291+
item.maintainState,
292+
matchState,
293+
verbose: verbose,
294+
);
296295
mismatchDescriptions.add('`maintainState` $mismatch');
297296
}
298297
if (!fullscreenDialogMatches) {
299-
final mismatch =
300-
item is! PageRoute
301-
? 'is not a property on `${item.runtimeType}` and can only be '
302-
'used with `PageRoute`s'
303-
: whereFullscreenDialog!.describeMismatchAsString(
304-
item.fullscreenDialog,
305-
matchState,
306-
verbose: verbose,
307-
);
298+
final mismatch = item is! PageRoute
299+
? 'is not a property on `${item.runtimeType}` and can only be '
300+
'used with `PageRoute`s'
301+
: whereFullscreenDialog!.describeMismatchAsString(
302+
item.fullscreenDialog,
303+
matchState,
304+
verbose: verbose,
305+
);
308306
mismatchDescriptions.add('`fullscreenDialog` $mismatch');
309307
}
310308

lib/src/mock_navigator.dart

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,12 @@ class _MockNavigatorState extends NavigatorState {
319319
}
320320

321321
@override
322-
void removeRouteBelow(Route<dynamic> anchorRoute) {
323-
return _navigator.removeRouteBelow(anchorRoute);
322+
void removeRoute<T extends Object?>(Route<T> route, [T? result]) {
323+
return _navigator.removeRoute(route, result);
324+
}
325+
326+
@override
327+
void removeRouteBelow<T extends Object?>(Route<T> anchorRoute, [T? result]) {
328+
return _navigator.removeRouteBelow(anchorRoute, result);
324329
}
325330
}

pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ version: 1.0.0
44
homepage: https://github.com/VeryGoodOpenSource/mockingjay
55

66
environment:
7-
sdk: ^3.7.0
8-
flutter: ^3.29.0
7+
sdk: ^3.8.0
8+
flutter: ^3.32.0
99

1010
dependencies:
1111
flutter:
1212
sdk: flutter
1313
flutter_test:
1414
sdk: flutter
15-
matcher: ^0.12.16+1
15+
matcher: ^0.12.17
1616
mocktail: ^1.0.4
1717
test: ^1.25.7
1818

1919
dev_dependencies:
20-
very_good_analysis: ^7.0.0
20+
very_good_analysis: ^8.0.0

0 commit comments

Comments
 (0)