Skip to content

Commit 9f64f71

Browse files
dart fix, dependencies update for Flutter 3.22 (#58)
* dart fix, dependencies update for Flutter 3.22 * fix github actions
1 parent 35e889a commit 9f64f71

File tree

7 files changed

+27
-28
lines changed

7 files changed

+27
-28
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
java-version: '11'
2020
- uses: subosito/flutter-action@v2
2121
with:
22-
flutter-version: '3.19.0'
22+
flutter-version: '3.22.0'
2323
- name: Install dependencies
2424
run: flutter pub get
2525
- name: Generate l10n
@@ -54,7 +54,7 @@ jobs:
5454
- uses: actions/checkout@v3
5555
- uses: subosito/flutter-action@v2
5656
with:
57-
flutter-version: '3.19.0'
57+
flutter-version: '3.22.0'
5858
channel: 'stable'
5959
- name: Flutter doctor
6060
run: flutter doctor

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Users can also view their previous sessions and follow other users to see, like
2424

2525
### Prerequisites
2626

27-
You need flutter (The best is to use the version 3.19 and above)
27+
You need flutter (The best is to use the version 3.22 and above)
2828

2929
### How to run
3030

lib/presentation/common/core/utils/form_utils.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ class FormUtils {
2222
/// Returns the created button style.
2323
static ButtonStyle createButtonStyle(Color backgroundColor) {
2424
return ButtonStyle(
25-
textStyle: MaterialStateProperty.all(TextStyle(
25+
textStyle: WidgetStateProperty.all(TextStyle(
2626
fontSize: 20,
2727
color: ColorUtils.white,
2828
)),
29-
minimumSize: MaterialStateProperty.all(const Size(150, 50)),
30-
backgroundColor: MaterialStateProperty.all<Color>(backgroundColor),
31-
shape: MaterialStateProperty.all(
29+
minimumSize: WidgetStateProperty.all(const Size(150, 50)),
30+
backgroundColor: WidgetStateProperty.all<Color>(backgroundColor),
31+
shape: WidgetStateProperty.all(
3232
RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
3333
),
3434
);

lib/presentation/common/core/widgets/upload_file.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ class UploadFileWidget extends HookConsumerWidget {
5252
),
5353
ElevatedButton(
5454
style: ButtonStyle(
55-
backgroundColor: MaterialStateProperty.all<Color>(ColorUtils.main),
56-
shape: MaterialStateProperty.all(
55+
backgroundColor: WidgetStateProperty.all<Color>(ColorUtils.main),
56+
shape: WidgetStateProperty.all(
5757
RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
5858
),
5959
),

pubspec.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -641,10 +641,10 @@ packages:
641641
dependency: "direct main"
642642
description:
643643
name: intl
644-
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
644+
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
645645
url: "https://pub.dev"
646646
source: hosted
647-
version: "0.18.1"
647+
version: "0.19.0"
648648
js:
649649
dependency: transitive
650650
description:
@@ -665,26 +665,26 @@ packages:
665665
dependency: transitive
666666
description:
667667
name: leak_tracker
668-
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
668+
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
669669
url: "https://pub.dev"
670670
source: hosted
671-
version: "10.0.0"
671+
version: "10.0.4"
672672
leak_tracker_flutter_testing:
673673
dependency: transitive
674674
description:
675675
name: leak_tracker_flutter_testing
676-
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
676+
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
677677
url: "https://pub.dev"
678678
source: hosted
679-
version: "2.0.1"
679+
version: "3.0.3"
680680
leak_tracker_testing:
681681
dependency: transitive
682682
description:
683683
name: leak_tracker_testing
684-
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
684+
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
685685
url: "https://pub.dev"
686686
source: hosted
687-
version: "2.0.1"
687+
version: "3.0.1"
688688
lints:
689689
dependency: transitive
690690
description:
@@ -737,10 +737,10 @@ packages:
737737
dependency: transitive
738738
description:
739739
name: meta
740-
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
740+
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
741741
url: "https://pub.dev"
742742
source: hosted
743-
version: "1.11.0"
743+
version: "1.12.0"
744744
mgrs_dart:
745745
dependency: transitive
746746
description:
@@ -1070,10 +1070,10 @@ packages:
10701070
dependency: transitive
10711071
description:
10721072
name: test_api
1073-
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
1073+
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
10741074
url: "https://pub.dev"
10751075
source: hosted
1076-
version: "0.6.1"
1076+
version: "0.7.0"
10771077
typed_data:
10781078
dependency: transitive
10791079
description:
@@ -1142,10 +1142,10 @@ packages:
11421142
dependency: transitive
11431143
description:
11441144
name: vm_service
1145-
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
1145+
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
11461146
url: "https://pub.dev"
11471147
source: hosted
1148-
version: "13.0.0"
1148+
version: "14.2.1"
11491149
wakelock:
11501150
dependency: "direct main"
11511151
description:
@@ -1243,5 +1243,5 @@ packages:
12431243
source: hosted
12441244
version: "3.1.2"
12451245
sdks:
1246-
dart: ">=3.3.0-279.1.beta <4.0.0"
1247-
flutter: ">=3.16.0"
1246+
dart: ">=3.3.0 <4.0.0"
1247+
flutter: ">=3.18.0-18.0.pre.54"

pubspec.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies:
3535
flutter_localizations:
3636
sdk: flutter
3737
geolocator: ^10.1.0
38-
intl: ^0.18.0
38+
intl: ^0.19.0
3939

4040

4141
# The following adds the Cupertino Icons font to your application.
@@ -70,7 +70,6 @@ dependencies:
7070
share_plus: ^6.3.4
7171
comment_box: ^0.0.18
7272
image_cropper: ^5.0.1
73-
7473
dev_dependencies:
7574
flutter_test:
7675
sdk: flutter

test/presentation/core/utils/form_utils_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void main() {
1111
final backgroundColor = ColorUtils.main;
1212
final buttonStyle = FormUtils.createButtonStyle(backgroundColor);
1313
expect(buttonStyle, isInstanceOf<ButtonStyle>());
14-
expect(buttonStyle.backgroundColor?.resolve(<MaterialState>{}),
14+
expect(buttonStyle.backgroundColor?.resolve(<WidgetState>{}),
1515
equals(backgroundColor));
1616
});
1717

0 commit comments

Comments
 (0)