Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump min Flutter SDK version to 3.16.0 #343

Merged
merged 4 commits into from
Nov 19, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v4
- uses: subosito/[email protected]
with:
flutter-version: '3.13.0' # Uses the minimum supported version.
flutter-version: '3.16.0' # Uses the minimum supported version.
channel: stable
- name: Install DCM
uses: CQLabs/setup-dcm@v1
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
- uses: actions/checkout@v4
- uses: subosito/[email protected]
with:
flutter-version: '3.13.0' # Uses the minimum supported version.
flutter-version: '3.16.0' # Uses the minimum supported version.
channel: stable
# Get Flutter version
- name: Get Flutter version
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
- uses: actions/checkout@v4
- uses: subosito/[email protected]
with:
flutter-version: '3.13.0' # Uses the minimum supported version.
flutter-version: '3.16.0' # Uses the minimum supported version.
channel: stable
# Get Flutter version
- name: Get Flutter version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/firebase-hosting-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
repository: ${{ github.event.pull_request.head.repo.full_name }}
- uses: subosito/[email protected]
with:
flutter-version: '3.13.0' # Uses the minimum supported version.
flutter-version: '3.16.0' # Uses the minimum supported version.
channel: stable
- run: flutter build web --release --web-renderer=canvaskit
working-directory: ./coffee_maker
Expand Down
2 changes: 2 additions & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ dart_code_metrics:
- avoid-dynamic: false
- avoid-duplicate-test-assertions: false
- prefer-correct-test-file-name: false
- avoid-suspicious-super-overrides: false
- avoid-collection-equality-checks: false

analyzer:
errors:
Expand Down
2 changes: 1 addition & 1 deletion coffee_maker/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: "none"

environment:
sdk: '>=2.19.2 <4.0.0'
flutter: '>=3.13.0'
flutter: '>=3.16.0'

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion coffee_maker_navigator_2/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: "none"

environment:
sdk: '>=3.0.0 <4.0.0'
flutter: '>=3.13.0'
flutter: '>=3.16.0'

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion demo_ui_components/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: "none"

environment:
sdk: '>=2.19.2 <4.0.0'
flutter: '>=3.13.0'
flutter: '>=3.16.0'

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: 0.1.0

environment:
sdk: '>=2.19.2 <4.0.0'
flutter: '>=3.13.0'
flutter: '>=3.16.0'

dependencies:
flutter:
Expand Down
2 changes: 0 additions & 2 deletions melos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,3 @@ scripts:
exec: dcm analyze .
format:
exec: dart format --set-exit-if-changed .
test:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since example folders don't have a "test" folder and only in the root folder of the package, the melos test fails in the CI. However, this is fine to remove since GitHub check also runs flutter test directly in the root package folder.

exec: flutter test
2 changes: 1 addition & 1 deletion playground/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: "none"

environment:
sdk: '>=2.19.2 <4.0.0'
flutter: '>=3.13.0'
flutter: '>=3.16.0'

dependencies:
flutter:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ class PlaygroundRouterDelegate
@override
void dispose() {
_cubitSubscription.cancel();
_pageIndexNotifier.dispose();
_pageListBuilderNotifier.dispose();
super.dispose();
}
}
6 changes: 2 additions & 4 deletions playground_navigator2/lib/router/router_pages/home_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import 'package:flutter/material.dart';
import 'package:playground_navigator2/home/home_screen.dart';

class HomePage extends Page<void> {
const HomePage() : super(key: const ValueKey('HomePage'));
const HomePage()
: super(key: const ValueKey('HomePage'), name: 'Home Screen');

@override
Route<void> createRoute(BuildContext context) {
Expand All @@ -11,7 +12,4 @@ class HomePage extends Page<void> {
builder: (context) => const HomeScreen(),
);
}

@override
String get name => 'Home Screen';
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class SheetPage extends Page<void> {
const SheetPage({
required this.pageIndexNotifier,
required this.pageListBuilderNotifier,
}) : super(key: const ValueKey('SheetPage'));
}) : super(key: const ValueKey('SheetPage'), name: SheetPage.routeName);

final ValueNotifier<int> pageIndexNotifier;
final ValueNotifier<WoltModalSheetPageListBuilder> pageListBuilderNotifier;
Expand All @@ -28,7 +28,4 @@ class SheetPage extends Page<void> {
settings: this,
);
}

@override
String get name => routeName;
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import 'package:flutter/material.dart';
import 'package:playground_navigator2/unknown/unknown_screen.dart';

class UnknownPage extends Page<void> {
const UnknownPage() : super(key: const ValueKey('UnknownPage'));
const UnknownPage()
: super(key: const ValueKey('UnknownPage'), name: 'Unknown Screen');

@override
Route<void> createRoute(BuildContext context) {
Expand All @@ -11,7 +12,4 @@ class UnknownPage extends Page<void> {
builder: (context) => const UnknownScreen(),
);
}

@override
String get name => 'Unknown Screen';
}
2 changes: 1 addition & 1 deletion playground_navigator2/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: "none"

environment:
sdk: '>=2.19.2 <4.0.0'
flutter: '>=3.13.0'
flutter: '>=3.16.0'

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ screenshots:

environment:
sdk: '>=3.0.6 <4.0.0'
flutter: '>=3.13.0'
flutter: ">=3.16.0"

dependencies:
flutter:
Expand Down
14 changes: 7 additions & 7 deletions test/wolt_modal_sheet_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ void main() {
'WoltModalSheet.modalTypeBuilder defaults - wide window size',
(tester) async {
Size viewSize = const Size(800.0, 600.0);
Size sheetPageSize = const Size(524.0, 86.0);
Size sheetPageSize = const Size(524.0, 92.0);

await tester.pumpWidget(buildSheetWithShow());

Expand All @@ -144,11 +144,11 @@ void main() {
expect(tester.getSize(sheetMaterial), sheetPageSize);
expect(
tester.getTopLeft(sheetMaterial),
Offset((viewSize.width / 2) - (sheetPageSize.width / 2), 257.0),
Offset((viewSize.width / 2) - (sheetPageSize.width / 2), 254.0),
);
expect(
tester.getTopRight(sheetMaterial),
Offset((viewSize.width / 2) + (sheetPageSize.width / 2), 257.0),
Offset((viewSize.width / 2) + (sheetPageSize.width / 2), 254.0),
);
},
);
Expand Down Expand Up @@ -190,7 +190,7 @@ void main() {

expect(
tester.getSize(sheetPageMaterialFinder(tester)),
const Size(800.0, 86.0),
const Size(800.0, 92.0),
);

// Tap to dismiss the sheet.
Expand All @@ -210,7 +210,7 @@ void main() {

expect(
tester.getSize(sheetPageMaterialFinder(tester)),
const Size(524.0, 86.0),
const Size(524.0, 92.0),
);

// Tap to dismiss the sheet.
Expand All @@ -230,7 +230,7 @@ void main() {

expect(
tester.getSize(sheetPageMaterialFinder(tester)),
const Size(404.0, 86.0),
const Size(404.0, 92.0),
);

// Tap to dismiss the sheet.
Expand Down Expand Up @@ -293,7 +293,7 @@ void main() {
);
expect(
tester.getSize(find.byType(ColoredBox).last),
equals(const Size(524.0, 86.0)),
equals(const Size(524.0, 92.0)),
);
});

Expand Down
Loading