From 81af3c33e0d91154b3afb661c42d33ef9268d5c2 Mon Sep 17 00:00:00 2001 From: Matias de Andrea Date: Wed, 18 Dec 2024 13:35:35 +0100 Subject: [PATCH 1/4] build: update dependencies --- example/pubspec.lock | 8 ++++---- pubspec.lock | 8 ++++---- pubspec.yaml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 287d5de88..7edec56c0 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -99,18 +99,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.8" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.9" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: diff --git a/pubspec.lock b/pubspec.lock index f6ac24361..6234f5774 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -79,18 +79,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.8" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.9" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 0c6f7e786..da4e372c2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,7 +17,7 @@ environment: dependencies: flutter: sdk: flutter - intl: ">=0.19.0 <0.20.0" + intl: ">=0.19.0 <0.21.0" dev_dependencies: flutter_lints: ^4.0.0 From 0082f2a8000cc3c1968d056a079fd70e01147fd2 Mon Sep 17 00:00:00 2001 From: Matias de Andrea Date: Wed, 18 Dec 2024 13:35:56 +0100 Subject: [PATCH 2/4] style: fix lint warnings --- lib/src/fields/form_builder_date_time_picker.dart | 3 --- lib/src/widgets/grouped_radio.dart | 1 - 2 files changed, 4 deletions(-) diff --git a/lib/src/fields/form_builder_date_time_picker.dart b/lib/src/fields/form_builder_date_time_picker.dart index 84c70f3f4..3ba64c737 100644 --- a/lib/src/fields/form_builder_date_time_picker.dart +++ b/lib/src/fields/form_builder_date_time_picker.dart @@ -284,7 +284,6 @@ class _FormBuilderDateTimePickerState extends FormBuilderFieldDecorationState< case InputType.date: return DateFormat.yMd(languageCode); case InputType.both: - default: return DateFormat.yMd(languageCode).add_Hms(); } } @@ -309,8 +308,6 @@ class _FormBuilderDateTimePickerState extends FormBuilderFieldDecorationState< newValue = combine(date, time); } break; - default: - throw 'Unexpected input type ${widget.inputType}'; } if (!mounted) return null; final finalValue = newValue ?? currentValue; diff --git a/lib/src/widgets/grouped_radio.dart b/lib/src/widgets/grouped_radio.dart index a26ac4571..855ff9cda 100644 --- a/lib/src/widgets/grouped_radio.dart +++ b/lib/src/widgets/grouped_radio.dart @@ -237,7 +237,6 @@ class _GroupedRadioState extends State> { child: Row(children: widgetList), ); case OptionsOrientation.wrap: - default: return SingleChildScrollView( child: Wrap( spacing: widget.wrapSpacing, From aa71b05b24e9e29d31e8c74c28bad4041cd2af49 Mon Sep 17 00:00:00 2001 From: Matias de Andrea Date: Wed, 18 Dec 2024 13:37:05 +0100 Subject: [PATCH 3/4] ci: update fvm action version --- .github/workflows/base.yaml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/base.yaml b/.github/workflows/base.yaml index 052d9f36b..dc5a49260 100644 --- a/.github/workflows/base.yaml +++ b/.github/workflows/base.yaml @@ -35,21 +35,10 @@ jobs: with: distribution: 'zulu' java-version: '11' - - - name: Get Flutter version by FVM - uses: kuhnroyal/flutter-fvm-config-action@v2 - id: fvm-config-action - with: - path: ".fvmrc" - - - name: Flutter action - uses: subosito/flutter-action@v2 + - name: Setup Flutter + uses: kuhnroyal/flutter-fvm-config-action/setup@v3 with: - flutter-version: ${{ steps.fvm-config-action.outputs.FLUTTER_VERSION }} - channel: ${{ steps.fvm-config-action.outputs.FLUTTER_CHANNEL }} - architecture: x64 - cache: true - + path: '.fvmrc' - name: Install dependencies run: flutter pub get - name: Format code From a7d1b0bb3752a0e401ce1c32bb90e957dd14a72a Mon Sep 17 00:00:00 2001 From: Matias de Andrea Date: Wed, 18 Dec 2024 13:43:42 +0100 Subject: [PATCH 4/4] build: fix version --- pubspec.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index da4e372c2..43779563e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,7 +17,9 @@ environment: dependencies: flutter: sdk: flutter - intl: ">=0.19.0 <0.21.0" + # This version would be max, the same version used on flutter_localizations + # https://github.com/flutter/flutter/blob/17025dd88227cd9532c33fa78f5250d548d87e9a/packages/flutter_localizations/pubspec.yaml#L14 + intl: ">=0.19.0 <0.20.0" dev_dependencies: flutter_lints: ^4.0.0