Skip to content

Commit 59d468b

Browse files
authored
Merge pull request #125 from nubank/bump-flutter-3.32.0
Bump flutter 3.32.0
2 parents a7c0655 + b29abef commit 59d468b

7 files changed

Lines changed: 14 additions & 20 deletions

File tree

.circleci/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ version: 2
22

33
job_defaults: &defaults
44
docker:
5-
- image: ghcr.io/cirruslabs/flutter:3.10.5
5+
- image: ghcr.io/cirruslabs/flutter:3.32.0
66

77
jobs:
88
format-check:
99
<<: *defaults
1010
steps:
1111
- checkout
12+
- run: flutter pub get
1213
- run: dart format -o none --set-exit-if-changed .
1314
analyze:
1415
<<: *defaults

analysis_options.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ analyzer:
3535
# Ignore analyzer hints for updating pubspecs when using Future or
3636
# Stream and not importing dart:async
3737
# Please see https://github.com/flutter/flutter/pull/24528 for details.
38-
sdk_version_async_exported_from_core: ignore
3938
# Review lints ignore after migrating all to package next
4039
constant_identifier_names: ignore
4140
use_build_context_synchronously: ignore
@@ -108,12 +107,10 @@ linter:
108107
- hash_and_equals
109108
- implementation_imports
110109
# - invariant_booleans # too many false positives: https://github.com/dart-lang/linter/issues/811
111-
- iterable_contains_unrelated_type
112110
# - join_return_with_assignment # not yet tested
113111
- library_names
114112
- library_prefixes
115113
# - lines_longer_than_80_chars # not yet tested
116-
- list_remove_unrelated_type
117114
# - library_private_types_in_public_api
118115
# - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/sdk/issues/34181
119116
- no_adjacent_strings_in_list
@@ -124,7 +121,6 @@ linter:
124121
# - one_member_abstracts # too many false positives
125122
# - only_throw_errors # https://github.com/flutter/flutter/issues/5792
126123
- overridden_fields
127-
- package_api_docs
128124
- package_names
129125
- package_prefixed_library_names
130126
# - parameter_assignments # we do this commonly

example/lib/samples/modules/friend_request/screens/list_requests_screen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ListRequestScreen extends StatelessWidget {
1515
@override
1616
Widget build(BuildContext context) {
1717
final bloc = Provider.of<FriendRequestBloc>(context);
18-
final bodyStyle = Theme.of(context).textTheme.bodyText1;
18+
final bodyStyle = Theme.of(context).textTheme.bodyLarge;
1919

2020
return Scaffold(
2121
appBar: AppBar(

example/lib/samples/modules/friend_request/screens/success_screen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class SuccessScreen extends StatelessWidget {
1515
@override
1616
Widget build(BuildContext context) {
1717
final bloc = Provider.of<FriendRequestBloc>(context);
18-
final headingStle = Theme.of(context).textTheme.headline4;
18+
final headingStle = Theme.of(context).textTheme.headlineMedium;
1919

2020
return Scaffold(
2121
appBar: AppBar(

example/lib/samples/screens/home_screen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class HomeScreen extends StatelessWidget {
88
Widget build(BuildContext context) {
99
debugPrint('BUILDING HOME');
1010
final nuvigator = Nuvigator.of(context);
11-
final headingStle = Theme.of(context).textTheme.headline3;
11+
final headingStle = Theme.of(context).textTheme.displaySmall;
1212

1313
return Scaffold(
1414
appBar: AppBar(

example/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818

1919
dev_dependencies:
2020
build_runner: ^2.0.3
21-
flutter_lints: ^2.0.0
21+
flutter_lints: ^2.0.1
2222
flutter_test:
2323
sdk: flutter
2424

test/nuvigator_test.dart

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,11 @@ Future<NuvigatorStateTracker> pumpApp(
106106
// ignore: omit_local_variable_types
107107
final GlobalKey<NuvigatorState<INuRouter>> secondNestedNuvigatorKey =
108108
GlobalKey(debugLabel: 'NUVIGATOR_TESTER');
109-
await tester.pumpWidget(TickerMode(
110-
enabled: false,
111-
child: baseNuvigator(
112-
nuvigatorKey,
113-
nestedNuvigatorKey,
114-
secondNestedNuvigatorKey,
115-
shouldRebuild: shouldRebuild,
116-
),
109+
await tester.pumpWidget(baseNuvigator(
110+
nuvigatorKey,
111+
nestedNuvigatorKey,
112+
secondNestedNuvigatorKey,
113+
shouldRebuild: shouldRebuild,
117114
));
118115
await tester.pumpAndSettle();
119116
return NuvigatorStateTracker(
@@ -549,7 +546,7 @@ void main() {
549546
});
550547

551548
testWidgets(
552-
'Should Nuvigator when shouldRebuild is provided',
549+
'Should rebuild secondNested Nuvigator when shouldRebuild is provided',
553550
(tester) async {
554551
final tracker = await pumpApp(
555552
tester,
@@ -588,7 +585,7 @@ void main() {
588585
tracker.rootNuvigator!.pop();
589586
await tester.pumpAndSettle();
590587

591-
// Should rebuild NuRouter (going back to secondNestedScreen1)
588+
// Should rebuild secondNested Nuvigator (going back to secondNestedScreen1)
592589
expect(find.text('SecondNestedScreen1'), findsOneWidget);
593590

594591
expect(
@@ -603,7 +600,7 @@ void main() {
603600

604601
expect(
605602
tracker.secondNestedStack.map((e) => e!.settings.name),
606-
['secondNestedScreen1', 'secondNestedScreen2'],
603+
['secondNestedScreen1'],
607604
);
608605
},
609606
);

0 commit comments

Comments
 (0)