Skip to content

Commit f8d6aa3

Browse files
committed
Revert "chore: upgrade to flutter 3.0"
This reverts commit 3307e2f.
1 parent 3307e2f commit f8d6aa3

File tree

5 files changed

+15
-23
lines changed

5 files changed

+15
-23
lines changed

frontend/app_flowy/lib/workspace/presentation/home/menu/app/section/section.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ViewSection extends StatelessWidget {
2626
listenWhen: (p, c) => p.selectedView != c.selectedView,
2727
listener: (context, state) {
2828
if (state.selectedView != null) {
29-
WidgetsBinding.instance.addPostFrameCallback((_) {
29+
WidgetsBinding.instance?.addPostFrameCallback((_) {
3030
getIt<HomeStackManager>().setPlugin(state.selectedView!.plugin());
3131
});
3232
}

frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/tool_bar.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ class _ToolbarButtonListState extends State<ToolbarButtonList> with WidgetsBindi
184184
// Listening to the WidgetsBinding instance is necessary so that we can
185185
// hide the arrows when the window gets a new size and thus the toolbar
186186
// becomes scrollable/unscrollable.
187-
WidgetsBinding.instance.addObserver(this);
187+
WidgetsBinding.instance!.addObserver(this);
188188

189189
// Workaround to allow the scroll controller attach to our ListView so that
190190
// we can detect if overflow arrows need to be shown on init.
@@ -226,7 +226,7 @@ class _ToolbarButtonListState extends State<ToolbarButtonList> with WidgetsBindi
226226
@override
227227
void dispose() {
228228
_controller.dispose();
229-
WidgetsBinding.instance.removeObserver(this);
229+
WidgetsBinding.instance!.removeObserver(this);
230230
super.dispose();
231231
}
232232

frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/emoji_picker.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class _EmojiPickerState extends State<EmojiPicker> {
135135
if (!loaded) {
136136
// Load emojis
137137
updateEmojiFuture.then(
138-
(value) => WidgetsBinding.instance.addPostFrameCallback((_) {
138+
(value) => WidgetsBinding.instance!.addPostFrameCallback((_) {
139139
if (!mounted) return;
140140
setState(() {
141141
loaded = true;

frontend/app_flowy/linux/flutter/generated_plugins.cmake

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
88
window_size
99
)
1010

11-
list(APPEND FLUTTER_FFI_PLUGIN_LIST
12-
)
13-
1411
set(PLUGIN_BUNDLED_LIBRARIES)
1512

1613
foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -19,8 +16,3 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
1916
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
2017
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
2118
endforeach(plugin)
22-
23-
foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
24-
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
25-
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
26-
endforeach(ffi_plugin)

frontend/app_flowy/pubspec.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ packages:
168168
name: collection
169169
url: "https://pub.dartlang.org"
170170
source: hosted
171-
version: "1.16.0"
171+
version: "1.15.0"
172172
connectivity_plus:
173173
dependency: "direct main"
174174
description:
@@ -357,7 +357,7 @@ packages:
357357
name: fake_async
358358
url: "https://pub.dartlang.org"
359359
source: hosted
360-
version: "1.3.0"
360+
version: "1.2.0"
361361
ffi:
362362
dependency: transitive
363363
description:
@@ -645,7 +645,7 @@ packages:
645645
name: js
646646
url: "https://pub.dartlang.org"
647647
source: hosted
648-
version: "0.6.4"
648+
version: "0.6.3"
649649
json_annotation:
650650
dependency: transitive
651651
description:
@@ -708,7 +708,7 @@ packages:
708708
name: material_color_utilities
709709
url: "https://pub.dartlang.org"
710710
source: hosted
711-
version: "0.1.4"
711+
version: "0.1.3"
712712
meta:
713713
dependency: transitive
714714
description:
@@ -806,7 +806,7 @@ packages:
806806
name: path
807807
url: "https://pub.dartlang.org"
808808
source: hosted
809-
version: "1.8.1"
809+
version: "1.8.0"
810810
path_drawing:
811811
dependency: transitive
812812
description:
@@ -1091,7 +1091,7 @@ packages:
10911091
name: source_span
10921092
url: "https://pub.dartlang.org"
10931093
source: hosted
1094-
version: "1.8.2"
1094+
version: "1.8.1"
10951095
sprintf:
10961096
dependency: transitive
10971097
description:
@@ -1161,21 +1161,21 @@ packages:
11611161
name: test
11621162
url: "https://pub.dartlang.org"
11631163
source: hosted
1164-
version: "1.20.2"
1164+
version: "1.19.5"
11651165
test_api:
11661166
dependency: transitive
11671167
description:
11681168
name: test_api
11691169
url: "https://pub.dartlang.org"
11701170
source: hosted
1171-
version: "0.4.9"
1171+
version: "0.4.8"
11721172
test_core:
11731173
dependency: transitive
11741174
description:
11751175
name: test_core
11761176
url: "https://pub.dartlang.org"
11771177
source: hosted
1178-
version: "0.4.11"
1178+
version: "0.4.9"
11791179
textfield_tags:
11801180
dependency: "direct main"
11811181
description:
@@ -1294,7 +1294,7 @@ packages:
12941294
name: vector_math
12951295
url: "https://pub.dartlang.org"
12961296
source: hosted
1297-
version: "2.1.2"
1297+
version: "2.1.1"
12981298
video_player:
12991299
dependency: transitive
13001300
description:
@@ -1389,5 +1389,5 @@ packages:
13891389
source: hosted
13901390
version: "8.0.0"
13911391
sdks:
1392-
dart: ">=2.17.0-0 <3.0.0"
1392+
dart: ">=2.15.0-116.0.dev <3.0.0"
13931393
flutter: ">=2.5.0"

0 commit comments

Comments
 (0)