update crates, test on mac only

This commit is contained in:
rustdesk 2023-05-11 12:04:38 +08:00
parent ad04c78f7c
commit 302f1c48d3
11 changed files with 982 additions and 726 deletions

1586
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -36,7 +36,7 @@ plugin_framework = []
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
whoami = "1.2"
whoami = "1.4"
scrap = { path = "libs/scrap", features = ["wayland"] }
hbb_common = { path = "libs/hbb_common" }
serde_derive = "1.0"
@ -53,24 +53,24 @@ dasp = { version = "0.11", features = ["signal", "interpolate-linear", "interpol
rubato = { version = "0.12", optional = true }
samplerate = { version = "0.2", optional = true }
async-trait = "0.1"
uuid = { version = "1.0", features = ["v4"] }
clap = "4.1"
rpassword = "7.0"
uuid = { version = "1.3", features = ["v4"] }
clap = "4.2"
rpassword = "7.2"
base64 = "0.21"
num_cpus = "1.13"
bytes = { version = "1.2", features = ["serde"] }
num_cpus = "1.15"
bytes = { version = "1.4", features = ["serde"] }
default-net = "0.14"
wol-rs = "1.0"
flutter_rust_bridge = { version = "1.61.1", optional = true }
flutter_rust_bridge = { version = "1.75", optional = true }
errno = "0.3"
rdev = { git = "https://github.com/fufesou/rdev" }
url = { version = "2.1", features = ["serde"] }
url = { version = "2.3", features = ["serde"] }
crossbeam-queue = "0.3"
hex = "0.4"
reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"], default-features=false }
chrono = "0.4"
cidr-utils = "0.5"
libloading = "0.7"
libloading = "0.8"
fon = "0.6"
[target.'cfg(not(any(target_os = "android", target_os = "linux")))'.dependencies]
@ -78,23 +78,22 @@ cpal = "0.15"
ringbuf = "0.3"
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
machine-uid = "0.2"
machine-uid = "0.3"
mac_address = "1.1"
sciter-rs = { git = "https://github.com/open-trade/rust-sciter", branch = "dyn" }
sys-locale = "0.2"
sys-locale = "0.3"
enigo = { path = "libs/enigo", features = [ "with_serde" ] }
clipboard = { path = "libs/clipboard" }
ctrlc = "3.2"
arboard = "3.2"
#minreq = { version = "2.4", features = ["punycode", "https-native"] }
system_shutdown = "4.0"
[target.'cfg(target_os = "windows")'.dependencies]
trayicon = { git = "https://github.com/open-trade/trayicon-rs", features = ["winit"] }
winit = "0.26"
winit = "0.28"
winapi = { version = "0.3", features = ["winuser", "wincrypt"] }
winreg = "0.10"
windows-service = "0.4"
winreg = "0.50"
windows-service = "0.6"
virtual_display = { path = "libs/virtual_display", optional = true }
impersonate_system = { git = "https://github.com/21pages/impersonate-system" }
shared_memory = "0.12"
@ -112,28 +111,28 @@ fruitbasket = "0.10"
objc_id = "0.1"
[target.'cfg(any(target_os = "macos", target_os = "linux"))'.dependencies]
tray-icon = "0.4"
tray-icon = "0.5"
tao = { git = "https://github.com/Kingtous/tao", branch = "muda" }
image = "0.24"
[target.'cfg(target_os = "linux")'.dependencies]
psimple = { package = "libpulse-simple-binding", version = "2.25" }
pulse = { package = "libpulse-binding", version = "2.26" }
psimple = { package = "libpulse-simple-binding", version = "2.27" }
pulse = { package = "libpulse-binding", version = "2.27" }
rust-pulsectl = { git = "https://github.com/open-trade/pulsectl" }
async-process = "1.3"
async-process = "1.7"
mouce = { git="https://github.com/fufesou/mouce.git" }
evdev = { git="https://github.com/fufesou/evdev" }
dbus = "0.9"
dbus-crossroads = "0.5"
pam = { git="https://github.com/fufesou/pam", optional = true }
users = { version = "0.11.0" }
users = { version = "0.11" }
[target.'cfg(target_os = "android")'.dependencies]
android_logger = "0.11"
jni = "0.19"
android_logger = "0.13"
jni = "0.21"
[target.'cfg(any(target_os = "android", target_os = "ios"))'.dependencies]
flutter_rust_bridge = "1.61.1"
flutter_rust_bridge = "1.75"
[workspace]
members = ["libs/scrap", "libs/hbb_common", "libs/enigo", "libs/clipboard", "libs/virtual_display", "libs/virtual_display/dylib", "libs/portable"]
@ -151,7 +150,7 @@ winapi = { version = "0.3", features = [ "winnt" ] }
[build-dependencies]
cc = "1.0"
hbb_common = { path = "libs/hbb_common" }
flutter_rust_bridge_codegen = "1.61.1"
flutter_rust_bridge_codegen = "1.75"
os-version = "0.2"
[dev-dependencies]

View file

@ -1,6 +1,4 @@
PODS:
- desktop_drop (0.0.1):
- FlutterMacOS
- desktop_multi_window (0.0.1):
- FlutterMacOS
- device_info_plus_macos (0.0.1):
@ -35,7 +33,6 @@ PODS:
- FlutterMacOS
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`)
- flutter_custom_cursor (from `Flutter/ephemeral/.symlinks/plugins/flutter_custom_cursor/macos`)
@ -56,8 +53,6 @@ SPEC REPOS:
- FMDB
EXTERNAL SOURCES:
desktop_drop:
:path: Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos
desktop_multi_window:
:path: Flutter/ephemeral/.symlinks/plugins/desktop_multi_window/macos
device_info_plus_macos:
@ -88,7 +83,6 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/window_size/macos
SPEC CHECKSUMS:
desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898
desktop_multi_window: 566489c048b501134f9d7fb6a2354c60a9126486
device_info_plus_macos: 1ad388a1ef433505c4038e7dd9605aadd1e2e9c7
flutter_custom_cursor: 629957115075c672287bd0fa979d863ccf6024f7
@ -107,4 +101,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: c7161fcf45d4fd9025dc0f48a76d6e64e52f8176
COCOAPODS: 1.11.3
COCOAPODS: 1.12.1

View file

@ -313,14 +313,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.0"
desktop_drop:
dependency: "direct main"
description:
name: desktop_drop
sha256: "0cd056191b701a2b5ba040f2306349e461fafdaa5df4569b2228cdf87b58eced"
url: "https://pub.dev"
source: hosted
version: "0.3.3"
desktop_multi_window:
dependency: "direct main"
description:
@ -1283,11 +1275,12 @@ packages:
uni_links_desktop:
dependency: "direct main"
description:
name: uni_links_desktop
sha256: "205484c01890259b56d9271bcf299adf9889e881616c976f13061e29e94bb9f0"
url: "https://pub.dev"
source: hosted
version: "0.1.4"
path: "."
ref: "276b2206d0a7bd7574bc6f061d804c9b7be1d031"
resolved-ref: "276b2206d0a7bd7574bc6f061d804c9b7be1d031"
url: "https://github.com/Kingtous/rustdesk_uni_links_desktop"
source: git
version: "0.1.6"
uni_links_platform_interface:
dependency: transitive
description:
@ -1571,5 +1564,5 @@ packages:
source: hosted
version: "0.1.1"
sdks:
dart: ">=2.18.0 <3.0.0"
dart: ">=2.18.0 <4.0.0"
flutter: ">=3.3.0"

View file

@ -10,7 +10,7 @@ build= "build.rs"
cc = "1.0"
[dependencies]
thiserror = "1.0.30"
thiserror = "1.0"
lazy_static = "1.4"
serde = "1.0"
serde_derive = "1.0"

View file

@ -35,7 +35,7 @@ winapi = { version = "0.3", features = ["winuser", "winbase"] }
[target.'cfg(target_os = "macos")'.dependencies]
core-graphics = "0.22"
objc = "0.2"
unicode-segmentation = "1.6"
unicode-segmentation = "1.10"
[build-dependencies]
pkg-config = "0.3"

View file

@ -8,11 +8,11 @@ edition = "2018"
[dependencies]
flexi_logger = { version = "0.25", features = ["async"] }
protobuf = { version = "3.1", features = ["with-bytes"] }
tokio = { version = "1.20", features = ["full"] }
protobuf = { version = "3.2", features = ["with-bytes"] }
tokio = { version = "1.28", features = ["full"] }
tokio-util = { version = "0.7", features = ["full"] }
futures = "0.3"
bytes = { version = "1.2", features = ["serde"] }
bytes = { version = "1.4", features = ["serde"] }
log = "0.4"
env_logger = "0.10"
socket2 = { version = "0.3", features = ["reuseport"] }
@ -29,7 +29,7 @@ confy = { git = "https://github.com/open-trade/confy" }
dirs-next = "2.0"
filetime = "0.2"
sodiumoxide = "0.2"
regex = "1.4"
regex = "1.8"
tokio-socks = { git = "https://github.com/open-trade/tokio-socks" }
chrono = "0.4"
backtrace = "0.3"
@ -38,21 +38,21 @@ dlopen = "0.1"
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
mac_address = "1.1"
machine-uid = "0.2"
sysinfo = "0.28"
machine-uid = "0.3"
sysinfo = "0.29"
[features]
quic = []
flatpak = []
[build-dependencies]
protobuf-codegen = { version = "3.1" }
protobuf-codegen = { version = "3.2" }
[target.'cfg(target_os = "windows")'.dependencies]
winapi = { version = "0.3", features = ["winuser"] }
[target.'cfg(target_os = "macos")'.dependencies]
osascript = "0.3.0"
osascript = "0.3"
[dev-dependencies]
toml = "0.7"

View file

@ -8,9 +8,9 @@ edition = "2021"
build = "build.rs"
[build-dependencies]
embed-resource = "1.7"
embed-resource = "2.1"
[dependencies]
brotli = "3.3.4"
dirs = "4.0.0"
md5 = "0.7.0"
brotli = "3.3"
dirs = "5.0"
md5 = "0.7"

View file

@ -1,5 +1,5 @@
extern crate embed_resource;
fn main() {
embed_resource::compile("icon.rc");
embed_resource::compile("icon.rc", embed_resource::NONE);
}

View file

@ -16,7 +16,7 @@ mediacodec = ["ndk"]
[dependencies]
block = "0.1"
cfg-if = "1.0"
num_cpus = "1.13"
num_cpus = "1.15"
lazy_static = "1.4"
hbb_common = { path = "../hbb_common" }
webm = "1.0"
@ -27,8 +27,8 @@ default-features = true
features = ["dxgi", "dxgi1_2", "dxgi1_5", "d3d11", "winuser", "winerror", "errhandlingapi", "libloaderapi"]
[target.'cfg(target_os = "android")'.dependencies]
android_logger = "0.10"
jni = "0.19"
android_logger = "0.13"
jni = "0.21"
lazy_static = "1.4"
log = "0.4"
serde_json = "1.0"
@ -42,7 +42,7 @@ quest = "0.3"
[build-dependencies]
target_build_utils = "0.3"
bindgen = "0.64"
bindgen = "0.65"
[target.'cfg(target_os = "linux")'.dependencies]
dbus = { version = "0.9", optional = true }

View file

@ -195,10 +195,10 @@ extern "C" fn handle_apple_event(_this: &Object, _cmd: Sel, event: u64, _reply:
// Customize the service opening logic.
#[no_mangle]
fn service_should_handle_reopen(
obj: &Object,
sel: Sel,
sender: id,
has_visible_windows: BOOL,
_obj: &Object,
_sel: Sel,
_sender: id,
_has_visible_windows: BOOL,
) -> BOOL {
log::debug!("Invoking the main rustdesk process");
std::thread::spawn(move || crate::handle_url_scheme("".to_string()));