Skip to content

Commit

Permalink
chore: upgrade flutter to 3.13.9 (AppFlowy-IO#3936)
Browse files Browse the repository at this point in the history
  • Loading branch information
LucasXu0 authored Nov 14, 2023
1 parent 1c500fb commit 6a9866b
Show file tree
Hide file tree
Showing 116 changed files with 312 additions and 260 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/flutter_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:

env:
CARGO_TERM_COLOR: always
FLUTTER_VERSION: "3.10.4"
FLUTTER_VERSION: "3.13.9"
RUST_TOOLCHAIN: "1.70"
CARGO_MAKE_VERSION: "0.36.6"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobile_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
- "!frontend/appflowy_tauri/**"

env:
FLUTTER_VERSION: "3.10.1"
FLUTTER_VERSION: "3.13.9"
RUST_TOOLCHAIN: "1.70"

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- "*"

env:
FLUTTER_VERSION: "3.10.1"
FLUTTER_VERSION: "3.13.9"
RUST_TOOLCHAIN: "1.70"

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

env:
CARGO_TERM_COLOR: always
FLUTTER_VERSION: "3.10.1"
FLUTTER_VERSION: "3.13.9"
RUST_TOOLCHAIN: "1.70"

jobs:
Expand Down
4 changes: 2 additions & 2 deletions frontend/appflowy_flutter/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<h1 align="center" style="margin:0"> AppFlowy_Flutter</h1>
<div align="center">
<img src="https://img.shields.io/badge/Flutter-v3.10.1-blue"/>
<img src="https://img.shields.io/badge/Rust-v1.65-orange"/>
<img src="https://img.shields.io/badge/Flutter-v3.13.19-blue"/>
<img src="https://img.shields.io/badge/Rust-v1.70-orange"/>
</div>

> Documentation for Contributors
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ void main() {
false,
false,
false,
false
false,
];
for (final (index, content) in checkboxCells.indexed) {
await tester.assertCheckboxCell(
Expand All @@ -54,7 +54,7 @@ void main() {
'10',
'11',
'12',
''
'',
];
for (final (index, content) in numberCells.indexed) {
await tester.assertCellContent(
Expand Down Expand Up @@ -152,7 +152,7 @@ void main() {
'Jun 16, 2023',
'',
'',
''
'',
];
for (final (index, content) in dateCells.indexed) {
await tester.assertDateCellInGrid(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ void main() {
expect(node.delta!.toJson(), [
{
'insert': text,
'attributes': {'href': url}
'attributes': {'href': url},
}
]);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/header/document_header_node_widget.dart';
import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:emoji_mart/emoji_mart.dart';
import 'package:flutter/material.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emo
import 'package:appflowy/plugins/inline_actions/widgets/inline_actions_handler.dart';
import 'package:appflowy_editor/appflowy_editor.dart' hide Log;
import 'package:easy_localization/easy_localization.dart';
import 'package:emoji_mart/emoji_mart.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';
import 'package:flutter_test/flutter_test.dart';

import 'util.dart';
Expand Down
2 changes: 1 addition & 1 deletion frontend/appflowy_flutter/integration_test/util/emoji.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:emoji_mart/emoji_mart.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';
import 'package:flutter_test/flutter_test.dart';

import 'base.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class MyMockClient extends Mock implements http.Client {
if (requestType == 'POST' &&
requestUri == OpenAIRequestType.textCompletion.uri) {
final responseHeaders = <String, String>{
'content-type': 'text/event-stream'
'content-type': 'text/event-stream',
};
final responseBody = Stream.fromIterable([
utf8.encode(
Expand Down
2 changes: 1 addition & 1 deletion frontend/appflowy_flutter/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ SPEC CHECKSUMS:
device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
file_picker: ce3938a0df3cc1ef404671531facef740d03f920
file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de
flowy_infra_ui: 0455e1fa8c51885aa1437848e361e99419f34ebc
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1430;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class MobileViewItemBottomSheetBody extends StatelessWidget {
? MobileViewItemBottomSheetBodyAction.removeFromFavorites
: MobileViewItemBottomSheetBodyAction.addToFavorites,
),
)
),
],
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class MobileViewItemBottomSheetHeader extends StatelessWidget {
onPressed: () {
context.pop();
},
)
),
],
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class DetailsPlaceholderScreenState extends State<DetailsPlaceholderScreen> {
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
),
),
]
],
],
),
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class MobileFavoritePageFolder extends StatelessWidget {
),
BlocProvider(
create: (_) => FavoriteBloc()..add(const FavoriteEvent.initial()),
)
),
],
child: MultiBlocListener(
listeners: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class MobileFolders extends StatelessWidget {
),
BlocProvider(
create: (_) => FavoriteBloc()..add(const FavoriteEvent.initial()),
)
),
],
child: MultiBlocListener(
listeners: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class MobileHomePageHeader extends StatelessWidget {
icon: const Icon(
Icons.arrow_drop_down,
),
)
),
],
),
FlowyText.regular(
Expand All @@ -76,7 +76,7 @@ class MobileHomePageHeader extends StatelessWidget {
fontSize: 12,
color: theme.colorScheme.onSurface,
overflow: TextOverflow.ellipsis,
)
),
],
),
),
Expand All @@ -87,7 +87,7 @@ class MobileHomePageHeader extends StatelessWidget {
icon: const FlowySvg(
FlowySvgs.m_setting_m,
),
)
),
],
),
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class MobileHomeTrashPage extends StatelessWidget {
trashBloc: trashBloc,
type: _TrashActionType.restoreAll,
),
)
),
],
),
);
Expand Down Expand Up @@ -214,7 +214,7 @@ class _DeletedFilesListView extends StatelessWidget {
gravity: ToastGravity.BOTTOM,
);
},
)
),
],
),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class MobilePersonalFolder extends StatelessWidget {
MobilePaneActionType.more,
]),
),
)
),
],
);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class _MobileRecentFolderState extends State<MobileRecentFolder> {
// the recent views are in reverse order
recentViews: recentViews,
),
const VSpace(12.0)
const VSpace(12.0),
],
);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ class _SingleMobileInnerViewItemState extends State<SingleMobileInnerViewItem> {
fontSize: 18.0,
overflow: TextOverflow.ellipsis,
),
)
),
];

// hover action
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class _AppearanceSettingGroupState extends State<AppearanceSettingGroup> {
color: theme.colorScheme.onSurface,
),
),
const Icon(Icons.chevron_right)
const Icon(Icons.chevron_right),
],
),
onTap: () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class _EditUsernameBottomSheetState extends State<EditUsernameBottomSheet> {
onPressed: () {
widget.context.pop();
},
)
),
],
),
const SizedBox(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class PersonalInfoSettingGroup extends StatelessWidget {
},
);
},
)
),
],
);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ class FlowyMobileStateContainer extends StatelessWidget {
],
);
},
)
]
),
],
],
),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class _BottomSheetTitle extends StatelessWidget {
onPressed: () {
context.pop();
},
)
),
],
);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:appflowy/plugins/base/emoji/emoji_picker_header.dart';
import 'package:appflowy/plugins/base/emoji/emoji_search_bar.dart';
import 'package:appflowy/plugins/base/emoji/emoji_skin_tone.dart';
import 'package:emoji_mart/emoji_mart.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';

// use a global value to store the selected emoji to prevent reloading every time.
EmojiData? _cachedEmojiData;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:appflowy_editor/appflowy_editor.dart';
import 'package:emoji_mart/emoji_mart.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';

class FlowyEmojiHeader extends StatelessWidget {
const FlowyEmojiHeader({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:emoji_mart/emoji_mart.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';

class FlowyEmojiPickerI18n extends EmojiPickerI18n {
@override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/base/emoji/emoji_skin_tone.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:emoji_mart/emoji_mart.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';
import 'package:flutter/material.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';

typedef EmojiKeywordChangedCallback = void Function(String keyword);
typedef EmojiSkinToneChanged = void Function(EmojiSkinTone skinTone);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:emoji_mart/emoji_mart.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';
import 'package:flutter/material.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';

// use a temporary global value to store last selected skin tone
EmojiSkinTone? lastSelectedEmojiSkinTone;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class _FlowyIconPickerState extends State<FlowyIconPicker>
LocaleKeys.emoji_emojiTab.tr(),
),
),
)
),
],
),
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ class CellController<T, D> extends Equatable {
@override
List<Object> get props => [
_cellCache.get(_cacheKey) ?? "",
_cellContext.rowId + _cellContext.fieldInfo.id
_cellContext.rowId + _cellContext.fieldInfo.id,
];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ class FieldController {
}
final List<FieldInfo> newFields = fieldInfos;
final Map<String, FieldIdPB> deletedFieldMap = {
for (final fieldOrder in deletedFields) fieldOrder.fieldId: fieldOrder
for (final fieldOrder in deletedFields) fieldOrder.fieldId: fieldOrder,
};

newFields.retainWhere((field) => (deletedFieldMap[field.id] == null));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class RowList {
final List<RowInfo> newRows = [];
final DeletedIndexs deletedIndex = [];
final Map<String, String> deletedRowByRowId = {
for (var rowId in rowIds) rowId: rowId
for (final rowId in rowIds) rowId: rowId,
};

_rowInfos.asMap().forEach((index, RowInfo rowInfo) {
Expand Down
Loading

0 comments on commit 6a9866b

Please sign in to comment.