From 55196e7c9dc1d96b701ccd7580df335c2ecc31d6 Mon Sep 17 00:00:00 2001 From: "lauren n. liberda" Date: Fri, 9 Aug 2024 01:48:42 +0200 Subject: [PATCH 1/7] chore: upgrade flutter to 3.24 --- .github/workflows/versions.env | 2 +- lib/pages/chat/add_widget_tile_view.dart | 2 +- lib/pages/chat/chat_view.dart | 2 +- lib/pages/chat_list/chat_list_view.dart | 2 +- pubspec.lock | 40 ++++++++++++------------ pubspec.yaml | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/versions.env b/.github/workflows/versions.env index eaa595930..8bc2c377f 100644 --- a/.github/workflows/versions.env +++ b/.github/workflows/versions.env @@ -1,2 +1,2 @@ -FLUTTER_VERSION=3.22.3 +FLUTTER_VERSION=3.24.0 JAVA_VERSION=17 diff --git a/lib/pages/chat/add_widget_tile_view.dart b/lib/pages/chat/add_widget_tile_view.dart index d7ac53ef2..18153faba 100644 --- a/lib/pages/chat/add_widget_tile_view.dart +++ b/lib/pages/chat/add_widget_tile_view.dart @@ -59,7 +59,7 @@ class AddWidgetTileView extends StatelessWidget { ), ), ), - ButtonBar( + OverflowBar( children: [ TextButton( onPressed: controller.addWidget, diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart index 422175f0f..9b07eaf31 100644 --- a/lib/pages/chat/chat_view.dart +++ b/lib/pages/chat/chat_view.dart @@ -141,7 +141,7 @@ class ChatView extends StatelessWidget { return PopScope( canPop: controller.selectedEvents.isEmpty && !controller.showEmojiPicker, - onPopInvoked: (pop) async { + onPopInvokedWithResult: (pop, _) async { if (pop) return; if (controller.selectedEvents.isNotEmpty) { controller.clearSelectedEvents(); diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart index a106e5dd7..71c559d70 100644 --- a/lib/pages/chat_list/chat_list_view.dart +++ b/lib/pages/chat_list/chat_list_view.dart @@ -32,7 +32,7 @@ class ChatListView extends StatelessWidget { canPop: controller.selectMode == SelectMode.normal && !controller.isSearchMode && controller.activeSpaceId == null, - onPopInvoked: (pop) { + onPopInvokedWithResult: (pop, _) { if (pop) return; if (controller.activeSpaceId != null) { controller.clearActiveSpace(); diff --git a/pubspec.lock b/pubspec.lock index 7632df4b4..eed883c84 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1090,18 +1090,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -1202,10 +1202,10 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" matrix: dependency: "direct main" description: @@ -1218,10 +1218,10 @@ packages: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" mgrs_dart: dependency: transitive description: @@ -1450,10 +1450,10 @@ packages: dependency: transitive description: name: platform - sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" url: "https://pub.dev" source: hosted - version: "3.1.4" + version: "3.1.5" platform_detect: dependency: transitive description: @@ -1991,26 +1991,26 @@ packages: dependency: transitive description: name: test - sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073" + sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e" url: "https://pub.dev" source: hosted - version: "1.25.2" + version: "1.25.7" test_api: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.2" test_core: dependency: transitive description: name: test_core - sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4" + sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.4" timezone: dependency: transitive description: @@ -2303,10 +2303,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.4" wakelock_plus: dependency: "direct main" description: @@ -2375,10 +2375,10 @@ packages: dependency: "direct overridden" description: name: win32 - sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb" + sha256: "015002c060f1ae9f41a818f2d5640389cc05283e368be19dc8d77cecb43c40c9" url: "https://pub.dev" source: hosted - version: "5.5.0" + version: "5.5.3" win32_registry: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 93ea6e2e9..f850428b8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -161,4 +161,4 @@ dependency_overrides: git: url: https://github.com/TheOneWithTheBraid/keyboard_shortcuts.git ref: null-safety - win32: 5.5.0 + win32: 5.5.3 From 4e2cd81095a30fbc3279e54fbca8700d195bb677 Mon Sep 17 00:00:00 2001 From: "lauren n. liberda" Date: Thu, 22 Aug 2024 16:52:09 +0200 Subject: [PATCH 2/7] chore: upgrade flutter to 3.24.1 --- .github/workflows/versions.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/versions.env b/.github/workflows/versions.env index 8bc2c377f..a7af31db7 100644 --- a/.github/workflows/versions.env +++ b/.github/workflows/versions.env @@ -1,2 +1,2 @@ -FLUTTER_VERSION=3.24.0 +FLUTTER_VERSION=3.24.1 JAVA_VERSION=17 From 3ce4df84251434b2ebc53ff41e44e410670872bb Mon Sep 17 00:00:00 2001 From: krille-chan Date: Sun, 25 Aug 2024 08:50:28 +0200 Subject: [PATCH 3/7] build: Fix build linux after flutter 3.24.1 and add handy_window --- linux/flutter/generated_plugin_registrant.cc | 4 ++ linux/flutter/generated_plugins.cmake | 1 + linux/my_application.cc | 4 +- pubspec.lock | 44 ++++++++++++-------- pubspec.yaml | 1 + snap/snapcraft.yaml | 43 ++++--------------- 6 files changed, 43 insertions(+), 54 deletions(-) diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 18e739cdd..b5155de25 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -37,6 +38,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) flutter_webrtc_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterWebRTCPlugin"); flutter_web_r_t_c_plugin_register_with_registrar(flutter_webrtc_registrar); + g_autoptr(FlPluginRegistrar) handy_window_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "HandyWindowPlugin"); + handy_window_plugin_register_with_registrar(handy_window_registrar); g_autoptr(FlPluginRegistrar) pasteboard_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "PasteboardPlugin"); pasteboard_plugin_register_with_registrar(pasteboard_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index b4a43e1b9..dab6fedfc 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -9,6 +9,7 @@ list(APPEND FLUTTER_PLUGIN_LIST file_selector_linux flutter_secure_storage_linux flutter_webrtc + handy_window pasteboard record_linux sqlcipher_flutter_libs diff --git a/linux/my_application.cc b/linux/my_application.cc index c185bcd78..7bddef81c 100644 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -61,17 +61,17 @@ static void my_application_activate(GApplication* application) { } gtk_window_set_default_size(window, 864, 680); - gtk_widget_show(GTK_WIDGET(window)); g_autoptr(FlDartProject) project = fl_dart_project_new(); fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); FlView* view = fl_view_new(project); - gtk_widget_show(GTK_WIDGET(view)); gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + gtk_widget_show(GTK_WIDGET(window)); + gtk_widget_show(GTK_WIDGET(view)); gtk_widget_grab_focus(GTK_WIDGET(view)); } diff --git a/pubspec.lock b/pubspec.lock index 89313580f..348f73d54 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -848,6 +848,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.1" + handy_window: + dependency: "direct main" + description: + name: handy_window + sha256: "56b813e58a68b0ee2ab22051400b8b1f1b5cfe88b8cd32288623defb3926245a" + url: "https://pub.dev" + source: hosted + version: "0.4.0" highlighter: dependency: transitive description: @@ -1082,18 +1090,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -1194,10 +1202,10 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" matrix: dependency: "direct main" description: @@ -1210,10 +1218,10 @@ packages: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" mgrs_dart: dependency: transitive description: @@ -1442,10 +1450,10 @@ packages: dependency: transitive description: name: platform - sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" url: "https://pub.dev" source: hosted - version: "3.1.4" + version: "3.1.5" platform_detect: dependency: transitive description: @@ -1967,26 +1975,26 @@ packages: dependency: transitive description: name: test - sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073" + sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e" url: "https://pub.dev" source: hosted - version: "1.25.2" + version: "1.25.7" test_api: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.2" test_core: dependency: transitive description: name: test_core - sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4" + sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.4" timezone: dependency: transitive description: @@ -2279,10 +2287,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.5" wakelock_plus: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index ea6feab42..cee396750 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -52,6 +52,7 @@ dependencies: future_loading_dialog: ^0.3.0 geolocator: ^7.6.2 go_router: ^14.0.1 + handy_window: ^0.4.0 hive: ^2.2.3 hive_flutter: ^1.1.0 html: ^0.15.4 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index a32ad5704..63dfbb87d 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: fluffychat title: FluffyChat -base: core22 +base: core24 version: git license: AGPL-3.0 summary: The cutest messenger in the Matrix network @@ -44,9 +44,11 @@ description: | grade: stable confinement: strict -architectures: - - build-on: amd64 - - build-on: arm64 +platforms: + amd64: + build-on: amd64 + arm64: + build-on: arm64 parts: olm: @@ -64,40 +66,13 @@ parts: stage-snaps: - zenity-integration - flutter-git: - source: https://github.com/flutter/flutter.git - source-tag: 3.19.6 - source-depth: 1 - plugin: nil - override-build: | - mkdir -p $CRAFT_PART_INSTALL/usr/bin - mkdir -p $CRAFT_PART_INSTALL/usr/libexec - cp -r $CRAFT_PART_SRC $CRAFT_PART_INSTALL/usr/libexec/flutter - ln -s $CRAFT_PART_INSTALL/usr/libexec/flutter/bin/flutter $CRAFT_PART_INSTALL/usr/bin/flutter - ln -s $SNAPCRAFT_PART_INSTALL/usr/libexec/flutter/bin/dart $SNAPCRAFT_PART_INSTALL/usr/bin/dart - $CRAFT_PART_INSTALL/usr/bin/flutter doctor - build-packages: - - clang - - cmake - - curl - - libgtk-3-dev - - ninja-build - - unzip - - xz-utils - - zip - override-prime: '' - fluffychat: - after: [flutter-git] - plugin: nil + plugin: flutter source: . override-build: | # Workaround for Flutter build error: rm -rf build - - flutter build linux --release -v - mkdir -p $CRAFT_PART_INSTALL/bin/ - cp -r build/linux/*/release/bundle/* $CRAFT_PART_INSTALL/bin/ + craftctl default build-packages: - libjsoncpp-dev - curl @@ -114,7 +89,7 @@ slots: apps: fluffychat: - command: bin/fluffychat + command: fluffychat extensions: [ gnome ] plugs: - audio-playback From ca33a2dbdab8b5c1385c4a82fbbc2c64a72f3f13 Mon Sep 17 00:00:00 2001 From: krille-chan Date: Sat, 31 Aug 2024 15:00:33 +0200 Subject: [PATCH 4/7] build: Prepare flutter 3.24 --- pubspec.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.lock b/pubspec.lock index 348f73d54..baf63d620 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -2290,7 +2290,7 @@ packages: sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.2.4" wakelock_plus: dependency: "direct main" description: From bff1f8c696e002f400f673a051da3f983c21d6c3 Mon Sep 17 00:00:00 2001 From: krille-chan Date: Sat, 31 Aug 2024 15:01:09 +0200 Subject: [PATCH 5/7] build: follow up vm service --- pubspec.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.lock b/pubspec.lock index baf63d620..36ca6b556 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -2287,7 +2287,7 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: "f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc" url: "https://pub.dev" source: hosted version: "14.2.4" From 3e06537d1b6fbdf31e5603d13f3fe7489676f74e Mon Sep 17 00:00:00 2001 From: krille-chan Date: Sat, 31 Aug 2024 15:01:57 +0200 Subject: [PATCH 6/7] chore: Follow up vm service --- pubspec.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.lock b/pubspec.lock index 36ca6b556..33068a8bf 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -2287,7 +2287,7 @@ packages: dependency: transitive description: name: vm_service - sha256: "f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted version: "14.2.4" From d70d8803c27d328d8e600b8991c3fd255ab6245d Mon Sep 17 00:00:00 2001 From: krille-chan Date: Sun, 1 Sep 2024 09:16:37 +0200 Subject: [PATCH 7/7] build: Build linux with Flutter 3.24.1 --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1304de630..204d1e0e0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -110,7 +110,7 @@ jobs: - run: cat .github/workflows/versions.env >> $GITHUB_ENV - uses: subosito/flutter-action@v2 with: - flutter-version: 3.19.6 # Workaround for not working on 3.22 + flutter-version: ${{ env.FLUTTER_VERSION }} cache: true - name: Install dependencies run: sudo apt-get update && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 libssl-dev -y