From c2703d215b5451f9540a6088fb5fe8e8cd9917d1 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Tue, 31 Oct 2023 21:10:23 +0800 Subject: [PATCH] bump flutter to 3.13.9 and bridge to 1.79 --- .github/workflows/bridge.yml | 4 +- .github/workflows/flutter-build.yml | 4 +- .github/workflows/history.yml | 4 +- Cargo.lock | 267 +------- Cargo.toml | 2 +- .../lib/desktop/pages/file_manager_page.dart | 6 +- flutter/lib/desktop/pages/remote_page.dart | 12 +- .../lib/mobile/pages/file_manager_page.dart | 6 +- flutter/lib/mobile/pages/remote_page.dart | 6 +- flutter/lib/models/native_model.dart | 2 +- flutter/lib/models/server_model.dart | 6 +- flutter/macos/Podfile | 2 +- flutter/macos/Podfile.lock | 39 +- .../macos/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- flutter/macos/Runner/MainFlutterWindow.swift | 9 +- .../macos/rustdesk.xcodeproj/project.pbxproj | 135 ---- flutter/pubspec.lock | 608 +++++++++--------- flutter/pubspec.yaml | 26 +- flutter/run.sh | 2 +- 20 files changed, 384 insertions(+), 760 deletions(-) delete mode 100644 flutter/macos/rustdesk.xcodeproj/project.pbxproj diff --git a/.github/workflows/bridge.yml b/.github/workflows/bridge.yml index b9285a87a..b691588df 100644 --- a/.github/workflows/bridge.yml +++ b/.github/workflows/bridge.yml @@ -6,8 +6,8 @@ on: workflow_call: env: - FLUTTER_VERSION: "3.10.6" - FLUTTER_RUST_BRIDGE_VERSION: "1.75.3" + FLUTTER_VERSION: "3.13.9" + FLUTTER_RUST_BRIDGE_VERSION: "1.79.0" jobs: generate_bridge: diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index 2aa6e564a..ba5e5ffa7 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -13,8 +13,8 @@ on: env: CARGO_NDK_VERSION: "3.1.2" LLVM_VERSION: "15.0.6" - FLUTTER_VERSION: "3.10.6" - FLUTTER_RUST_BRIDGE_VERSION: "1.75.3" + FLUTTER_VERSION: "3.13.9" + FLUTTER_RUST_BRIDGE_VERSION: "1.79.0" # for arm64 linux FLUTTER_ELINUX_VERSION: "3.10.6" FLUTTER_ELINUX_COMMIT_ID: "410b3ca42f2cd0c485edf517a1666652bab442d4" diff --git a/.github/workflows/history.yml b/.github/workflows/history.yml index 4c23eaa66..0bb61aa58 100644 --- a/.github/workflows/history.yml +++ b/.github/workflows/history.yml @@ -4,9 +4,9 @@ on: [workflow_dispatch] env: LLVM_VERSION: "10.0" - FLUTTER_VERSION: "3.10.6" + FLUTTER_VERSION: "3.13.9" TAG_NAME: "tmp" - FLUTTER_RUST_BRIDGE_VERSION: "1.75.3" + FLUTTER_RUST_BRIDGE_VERSION: "1.79.0" # vcpkg version: 2022.05.10 # for multiarch gcc compatibility VCPKG_COMMIT_ID: "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1" diff --git a/Cargo.lock b/Cargo.lock index 3cde6657f..e03150c06 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -791,56 +791,6 @@ dependencies = [ "system-deps 6.1.2", ] -[[package]] -name = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" -dependencies = [ - "serde 1.0.190", -] - -[[package]] -name = "cargo-platform" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" -dependencies = [ - "serde 1.0.190", -] - -[[package]] -name = "cargo_metadata" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde 1.0.190", - "serde_json 1.0.107", -] - -[[package]] -name = "cbindgen" -version = "0.24.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b922faaf31122819ec80c4047cc684c6979a087366c069611e33649bf98e18d" -dependencies = [ - "clap 3.2.25", - "heck 0.4.1", - "indexmap 1.9.3", - "log", - "proc-macro2 1.0.69", - "quote 1.0.33", - "serde 1.0.190", - "serde_json 1.0.107", - "syn 1.0.109", - "tempfile", - "toml 0.5.11", -] - [[package]] name = "cc" version = "1.0.83" @@ -946,26 +896,11 @@ dependencies = [ "atty", "bitflags 1.3.2", "strsim 0.8.0", - "textwrap 0.11.0", + "textwrap", "unicode-width", "vec_map", ] -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "strsim 0.10.0", - "termcolor", - "textwrap 0.16.0", -] - [[package]] name = "clap" version = "4.4.7" @@ -973,7 +908,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", - "clap_derive", ] [[package]] @@ -984,31 +918,10 @@ checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", - "clap_lex 0.6.0", + "clap_lex", "strsim 0.10.0", ] -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck 0.4.1", - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.38", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - [[package]] name = "clap_lex" version = "0.6.0" @@ -1109,17 +1022,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" -[[package]] -name = "colored" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355" -dependencies = [ - "is-terminal", - "lazy_static", - "winapi 0.3.9", -] - [[package]] name = "combine" version = "4.6.6" @@ -1198,12 +1100,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" -[[package]] -name = "convert_case" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" - [[package]] name = "core-foundation" version = "0.9.3" @@ -1634,17 +1530,6 @@ dependencies = [ "windows 0.32.0", ] -[[package]] -name = "delegate" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "082a24a9967533dc5d743c602157637116fc1b52806d694a5a45e6f32567fcdd" -dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 1.0.109", -] - [[package]] name = "deranged" version = "0.3.9" @@ -1671,7 +1556,7 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "convert_case 0.4.0", + "convert_case", "proc-macro2 1.0.69", "quote 1.0.33", "rustc_version", @@ -1928,26 +1813,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "enum-iterator" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" -dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.38", -] - [[package]] name = "enum-map" version = "2.7.0" @@ -1968,18 +1833,6 @@ dependencies = [ "syn 2.0.38", ] -[[package]] -name = "enum_dispatch" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" -dependencies = [ - "once_cell", - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.38", -] - [[package]] name = "enumflags2" version = "0.7.8" @@ -2130,17 +1983,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "fern" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" -dependencies = [ - "chrono", - "colored", - "log", -] - [[package]] name = "field-offset" version = "0.3.6" @@ -2202,9 +2044,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge" -version = "1.75.3" +version = "1.79.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907f6624c3c6a5a1421b1c1eb9c2881104607730d5f67ce7ae50051efa7a2cf3" +checksum = "0c8be4e3bf1221c2ce3e8006d548f4d3618deda475f192a65e0d55b33796cacc" dependencies = [ "allo-isolate", "anyhow", @@ -2226,39 +2068,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "flutter_rust_bridge_codegen" -version = "1.75.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49fdb2728cabeb86d1271ed4398ee1518b4a3d9f659756cf5021e5c5a91e3f25" -dependencies = [ - "anyhow", - "atty", - "cargo_metadata", - "cbindgen", - "chrono", - "clap 4.4.7", - "convert_case 0.5.0", - "delegate", - "enum-iterator", - "enum_dispatch", - "fern", - "itertools 0.10.5", - "lazy_static", - "log", - "pathdiff", - "quote 1.0.33", - "regex", - "serde 1.0.190", - "serde_yaml", - "strum_macros 0.24.3", - "syn 1.0.109", - "tempfile", - "thiserror", - "toml 0.5.11", - "topological-sort", -] - [[package]] name = "flutter_rust_bridge_macros" version = "1.82.3" @@ -2713,7 +2522,7 @@ checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039" dependencies = [ "anyhow", "heck 0.3.3", - "itertools 0.9.0", + "itertools", "proc-macro-crate 0.1.5", "proc-macro-error", "proc-macro2 1.0.69", @@ -3393,15 +3202,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "0.3.4" @@ -3731,12 +3531,6 @@ dependencies = [ "safemem", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -4377,12 +4171,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - [[package]] name = "osascript" version = "0.3.0" @@ -4522,12 +4310,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - [[package]] name = "pbkdf2" version = "0.11.0" @@ -5419,7 +5201,6 @@ dependencies = [ "errno", "evdev", "flutter_rust_bridge", - "flutter_rust_bridge_codegen", "fon", "fruitbasket", "hbb_common", @@ -5732,9 +5513,6 @@ name = "semver" version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" -dependencies = [ - "serde 1.0.190", -] [[package]] name = "serde" @@ -5817,18 +5595,6 @@ dependencies = [ "serde 1.0.190", ] -[[package]] -name = "serde_yaml" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" -dependencies = [ - "indexmap 1.9.3", - "ryu", - "serde 1.0.190", - "yaml-rust", -] - [[package]] name = "sha1" version = "0.10.6" @@ -6308,12 +6074,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "tfc" version = "0.6.1" @@ -6599,12 +6359,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "topological-sort" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d" - [[package]] name = "tower-service" version = "0.3.2" @@ -7625,15 +7379,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "zbus" version = "3.14.1" diff --git a/Cargo.toml b/Cargo.toml index 95191520b..cea167728 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,7 +69,7 @@ num_cpus = "1.15" bytes = { version = "1.4", features = ["serde"] } default-net = "0.14" wol-rs = "1.0" -flutter_rust_bridge = { version = "=1.75", features = ["uuid"], optional = true} +flutter_rust_bridge = { version = "=1.79", features = ["uuid"], optional = true} errno = "0.3" rdev = { git = "https://github.com/fufesou/rdev" } url = { version = "2.3", features = ["serde"] } diff --git a/flutter/lib/desktop/pages/file_manager_page.dart b/flutter/lib/desktop/pages/file_manager_page.dart index 7fd110853..b8a897a65 100644 --- a/flutter/lib/desktop/pages/file_manager_page.dart +++ b/flutter/lib/desktop/pages/file_manager_page.dart @@ -15,7 +15,7 @@ import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart'; import 'package:flutter_hbb/models/file_model.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; -import 'package:wakelock/wakelock.dart'; +import 'package:wakelock_plus/wakelock_plus.dart'; import '../../consts.dart'; import '../../desktop/widgets/material_mod_popup_menu.dart' as mod_menu; @@ -91,7 +91,7 @@ class _FileManagerPageState extends State }); Get.put(_ffi, tag: 'ft_${widget.id}'); if (!Platform.isLinux) { - Wakelock.enable(); + WakelockPlus.enable(); } debugPrint("File manager page init success with id ${widget.id}"); _ffi.dialogManager.setOverlayState(_overlayKeyState); @@ -104,7 +104,7 @@ class _FileManagerPageState extends State _ffi.close(); _ffi.dialogManager.dismissAll(); if (!Platform.isLinux) { - Wakelock.disable(); + WakelockPlus.disable(); } Get.delete(tag: 'ft_${widget.id}'); }); diff --git a/flutter/lib/desktop/pages/remote_page.dart b/flutter/lib/desktop/pages/remote_page.dart index ffc29b02f..5b67ed77b 100644 --- a/flutter/lib/desktop/pages/remote_page.dart +++ b/flutter/lib/desktop/pages/remote_page.dart @@ -8,7 +8,7 @@ import 'package:flutter_custom_cursor/cursor_manager.dart' as custom_cursor_manager; import 'package:get/get.dart'; import 'package:provider/provider.dart'; -import 'package:wakelock/wakelock.dart'; +import 'package:wakelock_plus/wakelock_plus.dart'; import 'package:flutter_custom_cursor/flutter_custom_cursor.dart'; import 'package:flutter_improved_scrolling/flutter_improved_scrolling.dart'; @@ -123,7 +123,7 @@ class _RemotePageState extends State .showLoading(translate('Connecting...'), onCancel: closeConnection); }); if (!Platform.isLinux) { - Wakelock.enable(); + WakelockPlus.enable(); } _ffi.ffiModel.updateEventListener(sessionId, widget.id); @@ -183,7 +183,7 @@ class _RemotePageState extends State _isWindowBlur = false; } if (!Platform.isLinux) { - Wakelock.enable(); + WakelockPlus.enable(); } } @@ -192,7 +192,7 @@ class _RemotePageState extends State void onWindowMaximize() { super.onWindowMaximize(); if (!Platform.isLinux) { - Wakelock.enable(); + WakelockPlus.enable(); } } @@ -200,7 +200,7 @@ class _RemotePageState extends State void onWindowMinimize() { super.onWindowMinimize(); if (!Platform.isLinux) { - Wakelock.disable(); + WakelockPlus.disable(); } } @@ -228,7 +228,7 @@ class _RemotePageState extends State overlays: SystemUiOverlay.values); } if (!Platform.isLinux) { - await Wakelock.disable(); + await WakelockPlus.disable(); } await Get.delete(tag: widget.id); removeSharedStates(widget.id); diff --git a/flutter/lib/mobile/pages/file_manager_page.dart b/flutter/lib/mobile/pages/file_manager_page.dart index 3fceba240..5344c5da3 100644 --- a/flutter/lib/mobile/pages/file_manager_page.dart +++ b/flutter/lib/mobile/pages/file_manager_page.dart @@ -5,7 +5,7 @@ import 'package:flutter_breadcrumb/flutter_breadcrumb.dart'; import 'package:flutter_hbb/models/file_model.dart'; import 'package:get/get.dart'; import 'package:toggle_switch/toggle_switch.dart'; -import 'package:wakelock/wakelock.dart'; +import 'package:wakelock_plus/wakelock_plus.dart'; import '../../common.dart'; import '../../common/widgets/dialog.dart'; @@ -73,7 +73,7 @@ class _FileManagerPageState extends State { .showLoading(translate('Connecting...'), onCancel: closeConnection); }); gFFI.ffiModel.updateEventListener(gFFI.sessionId, widget.id); - Wakelock.enable(); + WakelockPlus.enable(); } @override @@ -81,7 +81,7 @@ class _FileManagerPageState extends State { model.close().whenComplete(() { gFFI.close(); gFFI.dialogManager.dismissAll(); - Wakelock.disable(); + WakelockPlus.disable(); }); super.dispose(); } diff --git a/flutter/lib/mobile/pages/remote_page.dart b/flutter/lib/mobile/pages/remote_page.dart index 83a3f77c5..1353626e2 100644 --- a/flutter/lib/mobile/pages/remote_page.dart +++ b/flutter/lib/mobile/pages/remote_page.dart @@ -11,7 +11,7 @@ import 'package:flutter_hbb/models/chat_model.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; -import 'package:wakelock/wakelock.dart'; +import 'package:wakelock_plus/wakelock_plus.dart'; import '../../common.dart'; import '../../common/widgets/overlay.dart'; @@ -60,7 +60,7 @@ class _RemotePageState extends State { gFFI.dialogManager .showLoading(translate('Connecting...'), onCancel: closeConnection); }); - Wakelock.enable(); + WakelockPlus.enable(); _physicalFocusNode.requestFocus(); gFFI.ffiModel.updateEventListener(sessionId, widget.id); gFFI.inputModel.listenToMouse(true); @@ -88,7 +88,7 @@ class _RemotePageState extends State { gFFI.dialogManager.dismissAll(); await SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: SystemUiOverlay.values); - await Wakelock.disable(); + await WakelockPlus.disable(); await keyboardSubscription.cancel(); removeSharedStates(widget.id); } diff --git a/flutter/lib/models/native_model.dart b/flutter/lib/models/native_model.dart index cdf7f54b2..ef74a17a2 100644 --- a/flutter/lib/models/native_model.dart +++ b/flutter/lib/models/native_model.dart @@ -15,7 +15,7 @@ import 'package:path_provider/path_provider.dart'; import '../common.dart'; import '../generated_bridge.dart'; -class RgbaFrame extends Struct { +final class RgbaFrame extends Struct { @Uint32() external int len; external Pointer data; diff --git a/flutter/lib/models/server_model.dart b/flutter/lib/models/server_model.dart index 9fb91f463..4c17632f5 100644 --- a/flutter/lib/models/server_model.dart +++ b/flutter/lib/models/server_model.dart @@ -8,7 +8,7 @@ import 'package:flutter_hbb/main.dart'; import 'package:flutter_hbb/models/chat_model.dart'; import 'package:flutter_hbb/models/platform_model.dart'; import 'package:get/get.dart'; -import 'package:wakelock/wakelock.dart'; +import 'package:wakelock_plus/wakelock_plus.dart'; import 'package:window_manager/window_manager.dart'; import '../common.dart'; @@ -380,7 +380,7 @@ class ServerModel with ChangeNotifier { await bind.mainStartService(); updateClientState(); if (Platform.isAndroid) { - Wakelock.enable(); + WakelockPlus.enable(); } } @@ -393,7 +393,7 @@ class ServerModel with ChangeNotifier { notifyListeners(); if (!Platform.isLinux) { // current linux is not supported - Wakelock.disable(); + WakelockPlus.disable(); } } diff --git a/flutter/macos/Podfile b/flutter/macos/Podfile index 22d9caad2..049abe295 100644 --- a/flutter/macos/Podfile +++ b/flutter/macos/Podfile @@ -1,4 +1,4 @@ -platform :osx, '10.12' +platform :osx, '10.14' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/flutter/macos/Podfile.lock b/flutter/macos/Podfile.lock index 3f6ebb9b6..40105d0fe 100644 --- a/flutter/macos/Podfile.lock +++ b/flutter/macos/Podfile.lock @@ -3,7 +3,9 @@ PODS: - FlutterMacOS - desktop_multi_window (0.0.1): - FlutterMacOS - - device_info_plus_macos (0.0.1): + - device_info_plus (0.0.1): + - FlutterMacOS + - file_selector_macos (0.0.1): - FlutterMacOS - flutter_custom_cursor (0.0.1): - FlutterMacOS @@ -27,7 +29,10 @@ PODS: - FlutterMacOS - url_launcher_macos (0.0.1): - FlutterMacOS - - wakelock_macos (0.0.1): + - video_player_avfoundation (0.0.1): + - Flutter + - FlutterMacOS + - wakelock_plus (0.0.1): - FlutterMacOS - window_manager (0.2.0): - FlutterMacOS @@ -37,7 +42,8 @@ PODS: DEPENDENCIES: - desktop_drop (from `Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos`) - desktop_multi_window (from `Flutter/ephemeral/.symlinks/plugins/desktop_multi_window/macos`) - - device_info_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus_macos/macos`) + - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`) + - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`) - flutter_custom_cursor (from `Flutter/ephemeral/.symlinks/plugins/flutter_custom_cursor/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) @@ -47,7 +53,8 @@ DEPENDENCIES: - texture_rgba_renderer (from `Flutter/ephemeral/.symlinks/plugins/texture_rgba_renderer/macos`) - uni_links_desktop (from `Flutter/ephemeral/.symlinks/plugins/uni_links_desktop/macos`) - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) - - wakelock_macos (from `Flutter/ephemeral/.symlinks/plugins/wakelock_macos/macos`) + - video_player_avfoundation (from `Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin`) + - wakelock_plus (from `Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos`) - window_manager (from `Flutter/ephemeral/.symlinks/plugins/window_manager/macos`) - window_size (from `Flutter/ephemeral/.symlinks/plugins/window_size/macos`) @@ -60,8 +67,10 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos desktop_multi_window: :path: Flutter/ephemeral/.symlinks/plugins/desktop_multi_window/macos - device_info_plus_macos: - :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus_macos/macos + device_info_plus: + :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos + file_selector_macos: + :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos flutter_custom_cursor: :path: Flutter/ephemeral/.symlinks/plugins/flutter_custom_cursor/macos FlutterMacOS: @@ -80,8 +89,10 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/uni_links_desktop/macos url_launcher_macos: :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos - wakelock_macos: - :path: Flutter/ephemeral/.symlinks/plugins/wakelock_macos/macos + video_player_avfoundation: + :path: Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin + wakelock_plus: + :path: Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos window_manager: :path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos window_size: @@ -90,21 +101,23 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898 desktop_multi_window: 566489c048b501134f9d7fb6a2354c60a9126486 - device_info_plus_macos: 1ad388a1ef433505c4038e7dd9605aadd1e2e9c7 + device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f + file_selector_macos: 468fb6b81fac7c0e88d71317f3eec34c3b008ff9 flutter_custom_cursor: 629957115075c672287bd0fa979d863ccf6024f7 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce - path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852 + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38 sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea texture_rgba_renderer: cbed959a3c127122194a364e14b8577bd62dc8f2 uni_links_desktop: 45900fb319df48fcdea2df0756e9c2626696b026 - url_launcher_macos: c04e4fa86382d4f94f6b38f14625708be3ae52e2 - wakelock_macos: bc3f2a9bd8d2e6c89fee1e1822e7ddac3bd004a9 + url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95 + video_player_avfoundation: 8563f13d8fc8b2c29dc2d09e60b660e4e8128837 + wakelock_plus: 4783562c9a43d209c458cb9b30692134af456269 window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8 window_size: 339dafa0b27a95a62a843042038fa6c3c48de195 -PODFILE CHECKSUM: c7161fcf45d4fd9025dc0f48a76d6e64e52f8176 +PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 COCOAPODS: 1.12.1 diff --git a/flutter/macos/Runner.xcodeproj/project.pbxproj b/flutter/macos/Runner.xcodeproj/project.pbxproj index c73e666c7..8aac49dd1 100644 --- a/flutter/macos/Runner.xcodeproj/project.pbxproj +++ b/flutter/macos/Runner.xcodeproj/project.pbxproj @@ -210,7 +210,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 33CC10EC2044A3C60003C045 = { diff --git a/flutter/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flutter/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 9c428a004..12c2b8aa8 100644 --- a/flutter/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/flutter/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ =3.0.0 <4.0.0" - flutter: ">=3.10.0" + dart: ">=3.1.0 <4.0.0" + flutter: ">=3.13.0" diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml index a03a28e75..26b8877b6 100644 --- a/flutter/pubspec.yaml +++ b/flutter/pubspec.yaml @@ -19,7 +19,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev version: 1.2.4+39 environment: - sdk: ">=2.17.0" + sdk: '^3.1.0' dependencies: flutter: @@ -27,31 +27,30 @@ dependencies: flutter_localizations: sdk: flutter - ffi: ^2.0.1 - path_provider: ^2.0.12 - external_path: ^1.0.1 - provider: ^6.0.3 + ffi: ^2.1.0 + path_provider: ^2.1.1 + external_path: ^1.0.3 + provider: ^6.0.5 tuple: ^2.0.0 - wakelock: ^0.6.2 + wakelock_plus: ^1.1.3 # Keep this version for the compatibility of some old systems like win7. - device_info_plus: ^4.1.2 #firebase_analytics: ^9.1.5 - package_info_plus: ^3.1.2 - url_launcher: ^6.0.9 + package_info_plus: ^4.2.0 + url_launcher: ^6.2.1 toggle_switch: ^2.1.0 dash_chat_2: git: url: https://github.com/rustdesk-org/Dash-Chat-2 - draggable_float_widget: ^0.0.2 + draggable_float_widget: ^0.1.0 settings_ui: ^2.0.2 flutter_breadcrumb: ^1.0.1 - http: ^0.13.4 + http: ^1.1.0 qr_code_scanner: ^1.0.0 zxing2: ^0.2.0 image_picker: ^0.8.5 image: ^4.0.17 back_button_interceptor: ^6.0.1 - flutter_rust_bridge: "<1.76.0" + flutter_rust_bridge: "^1.79.0" window_manager: git: url: https://github.com/rustdesk-org/window_manager @@ -105,6 +104,7 @@ dependencies: url: https://github.com/21pages/dynamic_layouts.git ref: 24cb88413fa5181d949ddacbb30a65d5c459e7d9 pull_down_button: ^0.9.3 + device_info_plus: ^9.1.0 dev_dependencies: icons_launcher: ^2.0.4 @@ -113,7 +113,7 @@ dev_dependencies: build_runner: ^2.4.6 freezed: ^2.4.2 flutter_lints: ^2.0.2 - ffigen: ^7.2.4 + ffigen: ^8.0.2 # rerun: flutter pub run flutter_launcher_icons flutter_icons: diff --git a/flutter/run.sh b/flutter/run.sh index 1ce44a99e..2196c17c6 100755 --- a/flutter/run.sh +++ b/flutter/run.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -cargo install flutter_rust_bridge_codegen --version 1.75.3 --features uuid +cargo install flutter_rust_bridge_codegen --version 1.79.0 --features uuid flutter pub get ~/.cargo/bin/flutter_rust_bridge_codegen --rust-input ../src/flutter_ffi.rs --dart-output ./lib/generated_bridge.dart --c-output ./macos/Runner/bridge_generated.h # call `flutter clean` if cargo build fails