From 9f64f71cc4ce09c62b9064fed8887ff7e8677688 Mon Sep 17 00:00:00 2001 From: Benjamin Canape Date: Wed, 15 May 2024 19:17:36 +0200 Subject: [PATCH] dart fix, dependencies update for Flutter 3.22 (#58) * dart fix, dependencies update for Flutter 3.22 * fix github actions --- .github/workflows/ci.yml | 4 +-- README.md | 2 +- .../common/core/utils/form_utils.dart | 8 ++--- .../common/core/widgets/upload_file.dart | 4 +-- pubspec.lock | 32 +++++++++---------- pubspec.yaml | 3 +- .../core/utils/form_utils_test.dart | 2 +- 7 files changed, 27 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 58a41f8f..d193b909 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: java-version: '11' - uses: subosito/flutter-action@v2 with: - flutter-version: '3.19.0' + flutter-version: '3.22.0' - name: Install dependencies run: flutter pub get - name: Generate l10n @@ -54,7 +54,7 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@v2 with: - flutter-version: '3.19.0' + flutter-version: '3.22.0' channel: 'stable' - name: Flutter doctor run: flutter doctor diff --git a/README.md b/README.md index c1bae4cb..427848c3 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Users can also view their previous sessions and follow other users to see, like ### Prerequisites -You need flutter (The best is to use the version 3.19 and above) +You need flutter (The best is to use the version 3.22 and above) ### How to run diff --git a/lib/presentation/common/core/utils/form_utils.dart b/lib/presentation/common/core/utils/form_utils.dart index af86b8e8..9aa314b7 100644 --- a/lib/presentation/common/core/utils/form_utils.dart +++ b/lib/presentation/common/core/utils/form_utils.dart @@ -22,13 +22,13 @@ class FormUtils { /// Returns the created button style. static ButtonStyle createButtonStyle(Color backgroundColor) { return ButtonStyle( - textStyle: MaterialStateProperty.all(TextStyle( + textStyle: WidgetStateProperty.all(TextStyle( fontSize: 20, color: ColorUtils.white, )), - minimumSize: MaterialStateProperty.all(const Size(150, 50)), - backgroundColor: MaterialStateProperty.all(backgroundColor), - shape: MaterialStateProperty.all( + minimumSize: WidgetStateProperty.all(const Size(150, 50)), + backgroundColor: WidgetStateProperty.all(backgroundColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), ), ); diff --git a/lib/presentation/common/core/widgets/upload_file.dart b/lib/presentation/common/core/widgets/upload_file.dart index d8b38bbb..433275a0 100644 --- a/lib/presentation/common/core/widgets/upload_file.dart +++ b/lib/presentation/common/core/widgets/upload_file.dart @@ -52,8 +52,8 @@ class UploadFileWidget extends HookConsumerWidget { ), ElevatedButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all(ColorUtils.main), - shape: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all(ColorUtils.main), + shape: WidgetStateProperty.all( RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), ), ), diff --git a/pubspec.lock b/pubspec.lock index 31f1074a..441574e0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -641,10 +641,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" js: dependency: transitive description: @@ -665,26 +665,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.4" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.3" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" lints: dependency: transitive description: @@ -737,10 +737,10 @@ packages: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.12.0" mgrs_dart: dependency: transitive description: @@ -1070,10 +1070,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" typed_data: dependency: transitive description: @@ -1142,10 +1142,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.1" wakelock: dependency: "direct main" description: @@ -1243,5 +1243,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.3.0-279.1.beta <4.0.0" - flutter: ">=3.16.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/pubspec.yaml b/pubspec.yaml index dfb42a63..40a2e67e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -35,7 +35,7 @@ dependencies: flutter_localizations: sdk: flutter geolocator: ^10.1.0 - intl: ^0.18.0 + intl: ^0.19.0 # The following adds the Cupertino Icons font to your application. @@ -70,7 +70,6 @@ dependencies: share_plus: ^6.3.4 comment_box: ^0.0.18 image_cropper: ^5.0.1 - dev_dependencies: flutter_test: sdk: flutter diff --git a/test/presentation/core/utils/form_utils_test.dart b/test/presentation/core/utils/form_utils_test.dart index cde63486..cb0673e4 100644 --- a/test/presentation/core/utils/form_utils_test.dart +++ b/test/presentation/core/utils/form_utils_test.dart @@ -11,7 +11,7 @@ void main() { final backgroundColor = ColorUtils.main; final buttonStyle = FormUtils.createButtonStyle(backgroundColor); expect(buttonStyle, isInstanceOf()); - expect(buttonStyle.backgroundColor?.resolve({}), + expect(buttonStyle.backgroundColor?.resolve({}), equals(backgroundColor)); });