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

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

Merged
merged 2 commits into from
Oct 3, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/analyze_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/s3_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -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
}
}
2 changes: 1 addition & 1 deletion example/lib/src/storybook/stories/accordion.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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),
],
);

Expand Down
2 changes: 1 addition & 1 deletion example/lib/src/storybook/stories/bottom_sheet.dart
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class BottomSheetStory extends Story {
onTap: () => Navigator.of(context).pop(),
),
),
)
),
],
),
Divider(
Expand Down
4 changes: 2 additions & 2 deletions example/lib/src/storybook/stories/button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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),
],
);

Expand Down Expand Up @@ -241,7 +241,7 @@ class ButtonStory extends Story {
BoxShadow(
blurRadius: 3,
offset: Offset(0, 2),
)
),
],
gradient: LinearGradient(
begin: Alignment.topLeft,
Expand Down
2 changes: 1 addition & 1 deletion example/lib/src/storybook/stories/carousel.dart
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ class CarouselStory extends Story {
MoonDotIndicator(
selectedDot: selectedDot,
dotCount: 5,
)
),
],
);
},
Expand Down
5 changes: 2 additions & 3 deletions example/lib/src/storybook/stories/icons.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -39,8 +38,8 @@ class _IconsGridWithTitle extends StatelessWidget {

@override
Widget build(BuildContext context) {
return MultiSliver(
children: [
return SliverMainAxisGroup(
slivers: [
SliverToBoxAdapter(
child: TextDivider(
text: title,
Expand Down
2 changes: 1 addition & 1 deletion example/lib/src/storybook/stories/text_area.dart
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class TextAreaStory extends Story {
MoonFilledButton(
label: const Text("Submit"),
onTap: () => Form.of(context).validate(),
)
),
],
);
},
Expand Down
4 changes: 2 additions & 2 deletions example/lib/src/storybook/stories/text_input.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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),
],
);

Expand Down Expand Up @@ -288,7 +288,7 @@ class TextInputStory extends Story {
MoonFilledButton(
label: const Text("Submit"),
onTap: () => Form.of(context).validate(),
)
),
],
);
},
Expand Down
2 changes: 1 addition & 1 deletion example/lib/src/storybook/stories/text_input_group.dart
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ class TextInputGroupStory extends Story {
MoonFilledButton(
label: const Text("Submit"),
onTap: () => Form.of(context).validate(),
)
),
],
);
},
Expand Down
3 changes: 1 addition & 2 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion lib/src/widgets/avatar/avatar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ class MoonAvatar extends StatelessWidget {
borderRadius: BorderRadius.circular(effectiveBadgeSize / 2),
),
),
)
),
],
),
),
Expand Down
4 changes: 2 additions & 2 deletions lib/src/widgets/switch/switch.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -469,7 +469,7 @@ class _MoonSwitchState extends State<MoonSwitch> with SingleTickerProviderStateM
),
),
),
)
),
],
),
Align(
Expand Down
2 changes: 1 addition & 1 deletion lib/src/widgets/tab_bar/tab_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ class _IndicatorTabBuilderState extends State<_IndicatorTabBuilder> with SingleT
);
},
),
)
),
],
),
);
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down