fix: [MDS-728] Bump minimum Flutter version to 3.13.5 (#260)

coingaming · Oct 3, 2023 · 5c3ff61 · 5c3ff61
1 parent 9ef3476
commit 5c3ff61
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 21 deletions.
diff --git a/.github/workflows/analyze_and_test.yml b/.github/workflows/analyze_and_test.yml
@@ -12,7 +12,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.10.6'
+          flutter-version: '3.13.5'
           channel: stable
 
       - name: Install Dependencies

diff --git a/.github/workflows/s3_deploy.yml b/.github/workflows/s3_deploy.yml
@@ -19,7 +19,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.10.6'
+          flutter-version: '3.13.5'
           channel: stable
 
       - name: Install Dependencies

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,11 @@
+{
+  "dart.flutterSdkPath": ".fvm/flutter_sdk",
+  // Remove .fvm files from search
+  "search.exclude": {
+    "**/.fvm": true
+  },
+  // Remove from file watching
+  "files.watcherExclude": {
+    "**/.fvm": true
+  }
+}
diff --git a/example/lib/src/storybook/stories/accordion.dart b/example/lib/src/storybook/stories/accordion.dart
@@ -22,7 +22,7 @@ class AccordionStory extends Story {
                 Option(label: "sm", value: MoonAccordionSize.sm),
                 Option(label: "md", value: MoonAccordionSize.md),
                 Option(label: "lg", value: MoonAccordionSize.lg),
-                Option(label: "xl", value: MoonAccordionSize.xl)
+                Option(label: "xl", value: MoonAccordionSize.xl),
               ],
             );
 

diff --git a/example/lib/src/storybook/stories/bottom_sheet.dart b/example/lib/src/storybook/stories/bottom_sheet.dart
@@ -99,7 +99,7 @@ class BottomSheetStory extends Story {
                               onTap: () => Navigator.of(context).pop(),
                             ),
                           ),
-                        )
+                        ),
                       ],
                     ),
                     Divider(

diff --git a/example/lib/src/storybook/stories/button.dart b/example/lib/src/storybook/stories/button.dart
@@ -24,7 +24,7 @@ class ButtonStory extends Story {
                 Option(label: "sm", value: MoonButtonSize.sm),
                 Option(label: "md", value: MoonButtonSize.md),
                 Option(label: "lg", value: MoonButtonSize.lg),
-                Option(label: "xl", value: MoonButtonSize.xl)
+                Option(label: "xl", value: MoonButtonSize.xl),
               ],
             );
 
@@ -241,7 +241,7 @@ class ButtonStory extends Story {
                           BoxShadow(
                             blurRadius: 3,
                             offset: Offset(0, 2),
-                          )
+                          ),
                         ],
                         gradient: LinearGradient(
                           begin: Alignment.topLeft,

diff --git a/example/lib/src/storybook/stories/carousel.dart b/example/lib/src/storybook/stories/carousel.dart
@@ -183,7 +183,7 @@ class CarouselStory extends Story {
                             MoonDotIndicator(
                               selectedDot: selectedDot,
                               dotCount: 5,
-                            )
+                            ),
                           ],
                         );
                       },

diff --git a/example/lib/src/storybook/stories/icons.dart b/example/lib/src/storybook/stories/icons.dart
@@ -2,7 +2,6 @@ import 'package:example/src/storybook/common/icons/icons_list.dart';
 import 'package:example/src/storybook/common/widgets/text_divider.dart';
 import 'package:flutter/material.dart';
 import 'package:moon_design/moon_design.dart';
-import 'package:sliver_tools/sliver_tools.dart';
 import 'package:storybook_flutter/storybook_flutter.dart';
 
 class IconsStory extends Story {
@@ -39,8 +38,8 @@ class _IconsGridWithTitle extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return MultiSliver(
-      children: [
+    return SliverMainAxisGroup(
+      slivers: [
         SliverToBoxAdapter(
           child: TextDivider(
             text: title,

diff --git a/example/lib/src/storybook/stories/text_area.dart b/example/lib/src/storybook/stories/text_area.dart
@@ -128,7 +128,7 @@ class TextAreaStory extends Story {
                           MoonFilledButton(
                             label: const Text("Submit"),
                             onTap: () => Form.of(context).validate(),
-                          )
+                          ),
                         ],
                       );
                     },

diff --git a/example/lib/src/storybook/stories/text_input.dart b/example/lib/src/storybook/stories/text_input.dart
@@ -23,7 +23,7 @@ class TextInputStory extends Story {
                 Option(label: "sm", value: MoonTextInputSize.sm),
                 Option(label: "md", value: MoonTextInputSize.md),
                 Option(label: "lg", value: MoonTextInputSize.lg),
-                Option(label: "xl", value: MoonTextInputSize.xl)
+                Option(label: "xl", value: MoonTextInputSize.xl),
               ],
             );
 
@@ -288,7 +288,7 @@ class TextInputStory extends Story {
                         MoonFilledButton(
                           label: const Text("Submit"),
                           onTap: () => Form.of(context).validate(),
-                        )
+                        ),
                       ],
                     );
                   },

diff --git a/example/lib/src/storybook/stories/text_input_group.dart b/example/lib/src/storybook/stories/text_input_group.dart
@@ -219,7 +219,7 @@ class TextInputGroupStory extends Story {
                           MoonFilledButton(
                             label: const Text("Submit"),
                             onTap: () => Form.of(context).validate(),
-                          )
+                          ),
                         ],
                       );
                     },

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -3,7 +3,7 @@ description: Showcase Moon Design.
 publish_to: none
 version: 0.30.1
 environment:
-  sdk: '>=3.0.5 <4.0.0'
+  sdk: '>=3.1.2 <4.0.0'
 dependencies:
   cupertino_icons: ^1.0.2
   flutter:
@@ -12,7 +12,6 @@ dependencies:
   moon_design:
     path: ../
   package_info_plus: ^3.0.2
-  sliver_tools: ^0.2.9
 dev_dependencies:
   flutter_lints: ^2.0.0
   flutter_test:

diff --git a/lib/src/widgets/avatar/avatar.dart b/lib/src/widgets/avatar/avatar.dart
@@ -224,7 +224,7 @@ class MoonAvatar extends StatelessWidget {
                     borderRadius: BorderRadius.circular(effectiveBadgeSize / 2),
                   ),
                 ),
-              )
+              ),
           ],
         ),
       ),

diff --git a/lib/src/widgets/switch/switch.dart b/lib/src/widgets/switch/switch.dart
@@ -114,7 +114,7 @@ class MoonSwitch extends StatefulWidget {
 
 class _MoonSwitchState extends State<MoonSwitch> with SingleTickerProviderStateMixin {
   late final Map<Type, Action<Intent>> _actions = {
-    ActivateIntent: CallbackAction<Intent>(onInvoke: (_) => _handleTap())
+    ActivateIntent: CallbackAction<Intent>(onInvoke: (_) => _handleTap()),
   };
 
   late Animation<Alignment>? _alignmentAnimation;
@@ -469,7 +469,7 @@ class _MoonSwitchState extends State<MoonSwitch> with SingleTickerProviderStateM
                                       ),
                                     ),
                                   ),
-                                )
+                                ),
                               ],
                             ),
                             Align(

diff --git a/lib/src/widgets/tab_bar/tab_bar.dart b/lib/src/widgets/tab_bar/tab_bar.dart
@@ -473,7 +473,7 @@ class _IndicatorTabBuilderState extends State<_IndicatorTabBuilder> with SingleT
                     );
                   },
                 ),
-              )
+              ),
             ],
           ),
         );

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: https://flutter.moon.io/
 repository: https://github.com/coingaming/moon_flutter
 
 environment:
-  sdk: '>=3.0.5 <4.0.0'
+  sdk: '>=3.1.2 <4.0.0'
   flutter: ">=1.17.0"
 
 dependencies: