fix: 修复跨 crate 可见性与 Version 导入,补充 semver 依赖
Sync source to CNB / Sync Git ref (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
- updater_impl.rs: Version 改从 semver 导入(tauri_plugin_updater::Version 是私有) - files.rs: 移除未使用的 list 导入 - state/mod.rs: update_http_client_for_settings 由 pub(crate) 改 pub(apps/app 跨 crate 调用) - workspace 与 apps/app 补充 semver 依赖,同步 Cargo.lock
This commit is contained in:
1 parent
69a00888ba
commit
f776bf8995
6 files changed
+7
-3
No files matched your search
Generated
+1
@@ -6973,6 +6973,7 @@ dependencies = [
|
|||||||
"path-util",
|
"path-util",
|
||||||
"quartz_nbt",
|
"quartz_nbt",
|
||||||
"regex",
|
"regex",
|
||||||
|
"semver",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"serde_with",
|
"serde_with",
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ rgb = "0.8.52"
|
|||||||
rustls = { version = "0.23.42", default-features = false, features = ["ring", "std", "tls12"] }
|
rustls = { version = "0.23.42", default-features = false, features = ["ring", "std", "tls12"] }
|
||||||
rustls-native-certs = "0.8.4"
|
rustls-native-certs = "0.8.4"
|
||||||
rustls-pki-types = "1.15.0"
|
rustls-pki-types = "1.15.0"
|
||||||
|
semver = "1.0.28"
|
||||||
serde = "1.0.228"
|
serde = "1.0.228"
|
||||||
serde_bytes = "0.11.19"
|
serde_bytes = "0.11.19"
|
||||||
serde_cbor = "0.11.2"
|
serde_cbor = "0.11.2"
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ paste = { workspace = true }
|
|||||||
path-util = { workspace = true }
|
path-util = { workspace = true }
|
||||||
quartz_nbt = { workspace = true, features = ["serde"] }
|
quartz_nbt = { workspace = true, features = ["serde"] }
|
||||||
regex = { workspace = true }
|
regex = { workspace = true }
|
||||||
|
semver = { workspace = true }
|
||||||
serde = { workspace = true, features = ["derive"] }
|
serde = { workspace = true, features = ["derive"] }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
serde_with = { workspace = true }
|
serde_with = { workspace = true }
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ use std::path::PathBuf;
|
|||||||
use std::sync::Mutex;
|
use std::sync::Mutex;
|
||||||
use tauri::{Emitter, Runtime};
|
use tauri::{Emitter, Runtime};
|
||||||
use tauri_plugin_dialog::DialogExt;
|
use tauri_plugin_dialog::DialogExt;
|
||||||
use theseus::instance::{get_full_path, list};
|
use theseus::instance::get_full_path;
|
||||||
|
|
||||||
const STUDIO_FILES_CHANGED_EVENT: &str = "studio-files-changed";
|
const STUDIO_FILES_CHANGED_EVENT: &str = "studio-files-changed";
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
use crate::api::Result;
|
use crate::api::Result;
|
||||||
use futures::StreamExt;
|
use futures::StreamExt;
|
||||||
|
use semver::Version;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use sha2::{Digest, Sha256};
|
use sha2::{Digest, Sha256};
|
||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
@@ -8,7 +9,7 @@ use tauri::http::header::ACCEPT;
|
|||||||
use tauri::{Manager, ResourceId, Runtime, Webview};
|
use tauri::{Manager, ResourceId, Runtime, Webview};
|
||||||
use tauri_plugin_http::reqwest;
|
use tauri_plugin_http::reqwest;
|
||||||
use tauri_plugin_http::reqwest::ClientBuilder;
|
use tauri_plugin_http::reqwest::ClientBuilder;
|
||||||
use tauri_plugin_updater::{Error, Update, UpdaterExt, Version};
|
use tauri_plugin_updater::{Error, Update, UpdaterExt};
|
||||||
use theseus::{
|
use theseus::{
|
||||||
LoadingBarType, emit_loading, init_loading, launcher_user_agent,
|
LoadingBarType, emit_loading, init_loading, launcher_user_agent,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -623,7 +623,7 @@ impl State {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 在设置变更(如忽略 SSL 证书开关)后重建 HTTP 客户端。
|
/// 在设置变更(如忽略 SSL 证书开关)后重建 HTTP 客户端。
|
||||||
pub(crate) async fn update_http_client_for_settings(
|
pub async fn update_http_client_for_settings(
|
||||||
&self,
|
&self,
|
||||||
settings: &Settings,
|
settings: &Settings,
|
||||||
) -> crate::Result<()> {
|
) -> crate::Result<()> {
|
||||||
|
|||||||
Reference in new issue
Block a user