diff --git a/flutter/macos/Podfile.lock b/flutter/macos/Podfile.lock index e417eb188..812fbf8b3 100644 --- a/flutter/macos/Podfile.lock +++ b/flutter/macos/Podfile.lock @@ -5,112 +5,16 @@ PODS: - FlutterMacOS - device_info_plus_macos (0.0.1): - FlutterMacOS - - Firebase/Analytics (9.4.0): - - Firebase/Core - - Firebase/Core (9.4.0): - - Firebase/CoreOnly - - FirebaseAnalytics (~> 9.4.0) - - Firebase/CoreOnly (9.4.0): - - FirebaseCore (= 9.4.0) - - firebase_analytics (9.3.3): - - Firebase/Analytics (= 9.4.0) - - firebase_core + - flutter_custom_cursor (0.0.1): - FlutterMacOS - - firebase_core (1.21.1): - - Firebase/CoreOnly (~> 9.4.0) - - FlutterMacOS - - FirebaseAnalytics (9.4.0): - - FirebaseAnalytics/AdIdSupport (= 9.4.0) - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/AdIdSupport (9.4.0): - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleAppMeasurement (= 9.4.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCore (9.4.0): - - FirebaseCoreDiagnostics (~> 9.0) - - FirebaseCoreInternal (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - FirebaseCoreDiagnostics (9.5.0): - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCoreInternal (9.5.0): - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - FirebaseInstallations (9.5.0): - - FirebaseCore (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/UserDefaults (~> 7.7) - - PromisesObjC (~> 2.1) - FlutterMacOS (1.0.0) - FMDB (2.7.5): - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) - - GoogleAppMeasurement (9.4.0): - - GoogleAppMeasurement/AdIdSupport (= 9.4.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (9.4.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 9.4.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (9.4.0): - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleDataTransport (9.2.0): - - GoogleUtilities/Environment (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.7.0): - - GoogleUtilities/Environment - - GoogleUtilities/Logger - - GoogleUtilities/Network - - GoogleUtilities/Environment (7.7.0): - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.7.0): - - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.7.0): - - GoogleUtilities/Logger - - GoogleUtilities/Network (7.7.0): - - GoogleUtilities/Logger - - "GoogleUtilities/NSData+zlib" - - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.7.0)" - - GoogleUtilities/Reachability (7.7.0): - - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.7.0): - - GoogleUtilities/Logger - - nanopb (2.30909.0): - - nanopb/decode (= 2.30909.0) - - nanopb/encode (= 2.30909.0) - - nanopb/decode (2.30909.0) - - nanopb/encode (2.30909.0) - package_info_plus_macos (0.0.1): - FlutterMacOS - path_provider_macos (0.0.1): - FlutterMacOS - - PromisesObjC (2.1.1) - screen_retriever (0.0.1): - FlutterMacOS - shared_preferences_macos (0.0.1): @@ -131,8 +35,7 @@ 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`) - - firebase_analytics (from `Flutter/ephemeral/.symlinks/plugins/firebase_analytics/macos`) - - firebase_core (from `Flutter/ephemeral/.symlinks/plugins/firebase_core/macos`) + - flutter_custom_cursor (from `Flutter/ephemeral/.symlinks/plugins/flutter_custom_cursor/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - package_info_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos`) - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`) @@ -146,18 +49,7 @@ DEPENDENCIES: SPEC REPOS: trunk: - - Firebase - - FirebaseAnalytics - - FirebaseCore - - FirebaseCoreDiagnostics - - FirebaseCoreInternal - - FirebaseInstallations - FMDB - - GoogleAppMeasurement - - GoogleDataTransport - - GoogleUtilities - - nanopb - - PromisesObjC EXTERNAL SOURCES: desktop_drop: @@ -166,10 +58,8 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/desktop_multi_window/macos device_info_plus_macos: :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus_macos/macos - firebase_analytics: - :path: Flutter/ephemeral/.symlinks/plugins/firebase_analytics/macos - firebase_core: - :path: Flutter/ephemeral/.symlinks/plugins/firebase_core/macos + flutter_custom_cursor: + :path: Flutter/ephemeral/.symlinks/plugins/flutter_custom_cursor/macos FlutterMacOS: :path: Flutter/ephemeral package_info_plus_macos: @@ -195,23 +85,11 @@ SPEC CHECKSUMS: desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898 desktop_multi_window: 566489c048b501134f9d7fb6a2354c60a9126486 device_info_plus_macos: 1ad388a1ef433505c4038e7dd9605aadd1e2e9c7 - Firebase: 7703fc4022824b6d6db1bf7bea58d13b8e17ec46 - firebase_analytics: 57144bae6cd39d3be367a8767a1b8857a037cee5 - firebase_core: 822a1076483bf9764284322c9310daa98e1e6817 - FirebaseAnalytics: a1a24e72b7ba7f47045a4633f1abb545c07bd29c - FirebaseCore: 9a2b10270a854731c4d4d8a97d0aa8380ec3458d - FirebaseCoreDiagnostics: 17cbf4e72b1dbd64bfdc33d4b1f07bce4f16f1d8 - FirebaseCoreInternal: 50a8e39cae8abf72d5145d07ea34c3244f70862b - FirebaseInstallations: 41f811b530c41dd90973d0174381cdb3fcb5e839 - FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424 + flutter_custom_cursor: 629957115075c672287bd0fa979d863ccf6024f7 + FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a - GoogleAppMeasurement: 5d69e04287fc2c10cc43724bfa4bf31fc12c3dff - GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f - GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 - nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 package_info_plus_macos: f010621b07802a241d96d01876d6705f15e77c1c path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19 - PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38 shared_preferences_macos: a64dc611287ed6cbe28fd1297898db1336975727 sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea diff --git a/flutter/macos/rustdesk.xcodeproj/project.pbxproj b/flutter/macos/rustdesk.xcodeproj/project.pbxproj index 5e9d16659..7aacb5f05 100644 --- a/flutter/macos/rustdesk.xcodeproj/project.pbxproj +++ b/flutter/macos/rustdesk.xcodeproj/project.pbxproj @@ -33,7 +33,6 @@ /* Begin PBXFileReference section */ ADDEDBA66A6E1 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; - CA603C4309E13EF4668187A5 /* Cargo.toml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cargo.toml; path = /Users/mac/Documents/project/rustdesk/Cargo.toml; sourceTree = ""; }; CA604C7415FB2A3731F5016A /* liblibrustdesk_static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblibrustdesk_static.a; sourceTree = BUILT_PRODUCTS_DIR; }; CA6071B5A0F5A7A3EF2297AA /* librustdesk.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = librustdesk.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; CA60D3BC5386B357B2AB834F /* rustdesk */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = rustdesk; sourceTree = BUILT_PRODUCTS_DIR; }; diff --git a/flutter/pubspec.lock b/flutter/pubspec.lock index acbd45269..a871bb928 100644 --- a/flutter/pubspec.lock +++ b/flutter/pubspec.lock @@ -126,21 +126,21 @@ packages: name: cached_network_image url: "https://pub.dartlang.org" source: hosted - version: "3.2.1" + version: "3.2.2" cached_network_image_platform_interface: dependency: transitive description: name: cached_network_image_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "2.0.0" cached_network_image_web: dependency: transitive description: name: cached_network_image_web url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" characters: dependency: transitive description: @@ -175,7 +175,7 @@ packages: name: code_builder url: "https://pub.dartlang.org" source: hosted - version: "4.2.0" + version: "4.3.0" collection: dependency: transitive description: @@ -203,7 +203,7 @@ packages: name: cross_file url: "https://pub.dartlang.org" source: hosted - version: "0.3.3+1" + version: "0.3.3+2" crypto: dependency: transitive description: @@ -339,48 +339,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "6.1.4" - firebase_analytics: - dependency: "direct main" - description: - name: firebase_analytics - url: "https://pub.dartlang.org" - source: hosted - version: "9.3.4" - firebase_analytics_platform_interface: - dependency: transitive - description: - name: firebase_analytics_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "3.3.4" - firebase_analytics_web: - dependency: transitive - description: - name: firebase_analytics_web - url: "https://pub.dartlang.org" - source: hosted - version: "0.4.2+4" - firebase_core: - dependency: transitive - description: - name: firebase_core - url: "https://pub.dartlang.org" - source: hosted - version: "1.22.0" - firebase_core_platform_interface: - dependency: transitive - description: - name: firebase_core_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "4.5.1" - firebase_core_web: - dependency: transitive - description: - name: firebase_core_web - url: "https://pub.dartlang.org" - source: hosted - version: "1.7.2" fixnum: dependency: transitive description: @@ -418,8 +376,8 @@ packages: dependency: "direct main" description: path: "." - ref: "47179378523c993092f70d95f93d53f40af01f02" - resolved-ref: "47179378523c993092f70d95f93d53f40af01f02" + ref: "527821d676017387be024dffd61898ff79b14c41" + resolved-ref: "527821d676017387be024dffd61898ff79b14c41" url: "https://github.com/Kingtous/rustdesk_flutter_custom_cursor" source: git version: "0.0.1" @@ -1253,8 +1211,8 @@ packages: dependency: "direct main" description: path: "." - ref: "4627ba808ed08ff0c08706b01a7f9cc8b747accd" - resolved-ref: "4627ba808ed08ff0c08706b01a7f9cc8b747accd" + ref: "88487257cbafc501599ab4f82ec343b46acec020" + resolved-ref: "88487257cbafc501599ab4f82ec343b46acec020" url: "https://github.com/Kingtous/rustdesk_window_manager" source: git version: "0.2.7" @@ -1287,5 +1245,5 @@ packages: source: hosted version: "0.1.0" sdks: - dart: ">=2.17.0 <3.0.0" - flutter: ">=3.0.0" + dart: ">=2.18.0 <3.0.0" + flutter: ">=3.3.0" diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml index e3b1c883a..e3458b57a 100644 --- a/flutter/pubspec.yaml +++ b/flutter/pubspec.yaml @@ -35,7 +35,7 @@ dependencies: tuple: ^2.0.0 wakelock: ^0.5.2 device_info_plus: ^4.1.2 - firebase_analytics: ^9.1.5 + #firebase_analytics: ^9.1.5 package_info_plus: ^1.4.2 url_launcher: ^6.0.9 shared_preferences: ^2.0.6 @@ -58,7 +58,7 @@ dependencies: window_manager: git: url: https://github.com/Kingtous/rustdesk_window_manager - ref: 4627ba808ed08ff0c08706b01a7f9cc8b747accd + ref: 88487257cbafc501599ab4f82ec343b46acec020 desktop_multi_window: git: url: https://github.com/Kingtous/rustdesk_desktop_multi_window @@ -71,7 +71,7 @@ dependencies: flutter_custom_cursor: git: url: https://github.com/Kingtous/rustdesk_flutter_custom_cursor - ref: 47179378523c993092f70d95f93d53f40af01f02 + ref: 527821d676017387be024dffd61898ff79b14c41 get: ^4.6.5 visibility_detector: ^0.3.3 contextmenu: ^3.0.0 diff --git a/flutter/run.sh b/flutter/run.sh index cb6e0f9cb..f1066306a 100644 --- a/flutter/run.sh +++ b/flutter/run.sh @@ -3,5 +3,6 @@ dart pub global activate ffigen --version 5.0.1 flutter pub get # call `flutter clean` if cargo build fails +# export LLVM_HOME=/Library/Developer/CommandLineTools/usr/ cargo build --features flutter flutter run $@ diff --git a/src/core_main.rs b/src/core_main.rs index 3c1d858fb..f514cd790 100644 --- a/src/core_main.rs +++ b/src/core_main.rs @@ -124,7 +124,7 @@ pub fn core_main() -> Option> { } #[cfg(target_os = "macos")] { - std::thread::spawn(move || start_server(true)); + std::thread::spawn(move || crate::start_server(true)); // to-do: for flutter, starting tray not ready yet, or we can reuse sciter's tray implementation. } } else if args[0] == "--import-config" {