From 486989f4ea04ef24b5b2e2298ddd37503217ab0c Mon Sep 17 00:00:00 2001 From: Jai A Date: Fri, 28 Jun 2024 16:06:18 -0700 Subject: [PATCH 1/5] Forge 1.20+, NeoForge 1.21+ Support --- Cargo.lock | 50 ++++----------------------- theseus/Cargo.toml | 2 +- theseus/src/api/logs.rs | 9 +++-- theseus/src/api/process.rs | 4 +-- theseus/src/launcher/download.rs | 37 ++++++++++++++++++-- theseus/src/launcher/mod.rs | 6 ++++ theseus/src/state/children.rs | 6 +++- theseus/src/state/dirs.rs | 2 +- theseus/src/state/metadata.rs | 32 +++++++++-------- theseus/src/state/mod.rs | 8 +++-- theseus/src/state/profiles.rs | 4 +-- theseus/src/util/fetch.rs | 2 +- theseus_gui/src-tauri/Cargo.toml | 2 +- theseus_gui/src-tauri/src/api/logs.rs | 12 +++++-- theseus_playground/Cargo.toml | 2 +- theseus_playground/src/main.rs | 4 +-- 16 files changed, 101 insertions(+), 81 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 33d4140f6..6d0fe2259 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -385,25 +385,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bincode" -version = "2.0.0-rc.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11ea1a0346b94ef188834a65c068a03aec181c94896d481d7a0a40d85b0ce95" -dependencies = [ - "bincode_derive", - "serde", -] - -[[package]] -name = "bincode_derive" -version = "2.0.0-rc.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e30759b3b99a1b802a7a3aa21c85c3ded5c28e1c83170d82d70f08bbf7f3e4c" -dependencies = [ - "virtue", -] - [[package]] name = "bitflags" version = "1.3.2" @@ -957,19 +938,15 @@ dependencies = [ [[package]] name = "daedalus" -version = "0.1.27" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b251eb4ed1dd9c417eb098492dcf17f8271ba5722387ffa3ee703bcebdb4838" +checksum = "746a446bbe5e256206a3effdf334b831b120dbfbf2d311e29ace72673ca18bc8" dependencies = [ - "bincode 2.0.0-rc.3", "bytes", "chrono", - "reqwest 0.11.27", "serde", "serde_json", - "sha1 0.6.1", "thiserror", - "tokio", ] [[package]] @@ -4423,15 +4400,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - [[package]] name = "sha1" version = "0.10.6" @@ -4983,7 +4951,7 @@ name = "tauri-plugin-window-state" version = "0.1.1" source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5e3900e682e13f3759b439116ae2f77a6d389ca2" dependencies = [ - "bincode 1.3.3", + "bincode", "bitflags 2.5.0", "log", "serde", @@ -5575,7 +5543,7 @@ dependencies = [ "log", "native-tls", "rand 0.8.5", - "sha1 0.10.6", + "sha1", "thiserror", "url", "utf-8", @@ -5735,12 +5703,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "virtue" -version = "0.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcc60c0624df774c82a0ef104151231d37da4962957d691c011c852b2473314" - [[package]] name = "void" version = "1.0.2" @@ -6588,7 +6550,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_repr", - "sha1 0.10.6", + "sha1", "static_assertions", "tracing", "uds_windows", @@ -6645,7 +6607,7 @@ dependencies = [ "flate2", "hmac", "pbkdf2", - "sha1 0.10.6", + "sha1", "time", "zstd 0.11.2+zstd.1.5.2", ] diff --git a/theseus/Cargo.toml b/theseus/Cargo.toml index 542646900..88d3cc98c 100644 --- a/theseus/Cargo.toml +++ b/theseus/Cargo.toml @@ -26,7 +26,7 @@ urlencoding = "2.1.3" chrono = { version = "0.4.19", features = ["serde"] } -daedalus = { version = "0.1.25" } +daedalus = { version = "0.2.0" } dirs = "5.0.1" regex = "1.5" diff --git a/theseus/src/api/logs.rs b/theseus/src/api/logs.rs index f1a14987b..e1a130150 100644 --- a/theseus/src/api/logs.rs +++ b/theseus/src/api/logs.rs @@ -114,7 +114,10 @@ pub async fn get_logs_from_type( { let entry: std::fs::DirEntry = entry.map_err(|e| IOError::with_path(e, &logs_folder))?; - let age = entry.metadata()?.created().unwrap_or_else(|_| SystemTime::UNIX_EPOCH); + let age = entry + .metadata()? + .created() + .unwrap_or_else(|_| SystemTime::UNIX_EPOCH); let path = entry.path(); if !path.is_file() { continue; @@ -184,7 +187,9 @@ pub async fn get_logs_by_filename( .join(&filename); let metadata = std::fs::metadata(&path)?; - let age = metadata.created().unwrap_or_else(|_| SystemTime::UNIX_EPOCH); + let age = metadata + .created() + .unwrap_or_else(|_| SystemTime::UNIX_EPOCH); Logs::build(log_type, age, &profile_path, filename, Some(true)).await } diff --git a/theseus/src/api/process.rs b/theseus/src/api/process.rs index 561c801cd..c75e940a3 100644 --- a/theseus/src/api/process.rs +++ b/theseus/src/api/process.rs @@ -18,9 +18,7 @@ pub async fn has_finished_by_uuid(uuid: Uuid) -> crate::Result { // Gets the exit status of a child process stored in the state by UUID #[tracing::instrument] -pub async fn get_exit_status_by_uuid( - uuid: Uuid, -) -> crate::Result> { +pub async fn get_exit_status_by_uuid(uuid: Uuid) -> crate::Result> { let state = State::get().await?; let children = state.children.read().await; children.exit_status(uuid).await diff --git a/theseus/src/launcher/download.rs b/theseus/src/launcher/download.rs index baf447f86..a4620f9b4 100644 --- a/theseus/src/launcher/download.rs +++ b/theseus/src/launcher/download.rs @@ -19,6 +19,7 @@ use daedalus::{ modded::LoaderVersion, }; use futures::prelude::*; +use reqwest::Method; use tokio::sync::OnceCell; #[tracing::instrument(skip(st, version))] @@ -82,10 +83,27 @@ pub async fn download_version_info( .and_then(|ref it| Ok(serde_json::from_slice(it)?)) } else { tracing::info!("Downloading version info for version {}", &version.id); - let mut info = d::minecraft::fetch_version_info(version).await?; + let mut info = fetch_json( + Method::GET, + &version.url, + None, + None, + &st.fetch_semaphore, + &CredentialsStore(None), + ) + .await?; if let Some(loader) = loader { - let partial = d::modded::fetch_partial_version(&loader.url).await?; + let partial: d::modded::PartialVersionInfo = fetch_json( + Method::GET, + &loader.url, + None, + None, + &st.fetch_semaphore, + &CredentialsStore(None), + ) + .await?; + info = d::modded::merge_partial_version(partial, info); } info.id = version_id.clone(); @@ -167,7 +185,15 @@ pub async fn download_assets_index( .await .and_then(|ref it| Ok(serde_json::from_slice(it)?)) } else { - let index = d::minecraft::fetch_assets_index(version).await?; + let index = fetch_json( + Method::GET, + &version.asset_index.url, + None, + None, + &st.fetch_semaphore, + &CredentialsStore(None), + ) + .await?; write(&path, &serde_json::to_vec(&index)?, &st.io_semaphore).await?; tracing::info!("Fetched assets index"); Ok(index) @@ -274,6 +300,11 @@ pub async fn download_libraries( } } + if !library.downloadable { + tracing::trace!("Skipped non-downloadable library {}", &library.name); + return Ok(()); + } + tokio::try_join! { async { let artifact_path = d::get_path_from_artifact(&library.name)?; diff --git a/theseus/src/launcher/mod.rs b/theseus/src/launcher/mod.rs index e1ffef964..29bf80ee4 100644 --- a/theseus/src/launcher/mod.rs +++ b/theseus/src/launcher/mod.rs @@ -15,6 +15,7 @@ use daedalus as d; use daedalus::minecraft::{RuleAction, VersionInfo}; use st::Profile; use std::collections::HashMap; +use std::process::Stdio; use std::sync::Arc; use tokio::process::Command; use uuid::Uuid; @@ -326,6 +327,8 @@ pub async fn install_minecraft( &processor.args, data, )?) + .stdout(Stdio::inherit()) + .stderr(Stdio::inherit()) .output() .await .map_err(|e| IOError::with_path(e, &java_version.path)) @@ -335,6 +338,9 @@ pub async fn install_minecraft( )) })?; + println!("processor stdout: {}", String::from_utf8_lossy(&child.stdout)); + println!("processor stderr: {}", String::from_utf8_lossy(&child.stderr)); + if !child.status.success() { return Err(crate::ErrorKind::LauncherError(format!( "Processor error: {}", diff --git a/theseus/src/state/children.rs b/theseus/src/state/children.rs index f272276d4..30948f699 100644 --- a/theseus/src/state/children.rs +++ b/theseus/src/state/children.rs @@ -3,6 +3,7 @@ use chrono::{DateTime, Utc}; use serde::Deserialize; use serde::Serialize; use std::{collections::HashMap, sync::Arc}; +use std::process::Stdio; use tokio::process::Child; use tokio::process::Command; use tokio::sync::RwLock; @@ -278,7 +279,10 @@ impl Children { censor_strings: HashMap, ) -> crate::Result>> { // Takes the first element of the commands vector and spawns it - let mc_proc = mc_command.spawn().map_err(IOError::from)?; + let mc_proc = mc_command.stdout(Stdio::inherit()) + .stderr(Stdio::inherit()) + + .spawn().map_err(IOError::from)?; let child = ChildType::TokioChild(mc_proc); diff --git a/theseus/src/state/dirs.rs b/theseus/src/state/dirs.rs index add3b67a6..a981abcdb 100644 --- a/theseus/src/state/dirs.rs +++ b/theseus/src/state/dirs.rs @@ -165,7 +165,7 @@ impl DirectoryInfo { ) -> crate::Result { Ok(profile_id.get_full_path().await?.join("logs")) } - + /// Gets the crash reports dir for a given profile #[inline] pub async fn crash_reports_dir( diff --git a/theseus/src/state/metadata.rs b/theseus/src/state/metadata.rs index e50bb2f2e..4d94d00df 100644 --- a/theseus/src/state/metadata.rs +++ b/theseus/src/state/metadata.rs @@ -1,16 +1,18 @@ //! Theseus metadata use crate::data::DirectoryInfo; -use crate::util::fetch::{read_json, write, IoSemaphore}; +use crate::state::CredentialsStore; +use crate::util::fetch::{ + fetch_json, read_json, write, FetchSemaphore, IoSemaphore, +}; use crate::State; use daedalus::{ - minecraft::{fetch_version_manifest, VersionManifest as MinecraftManifest}, - modded::{ - fetch_manifest as fetch_loader_manifest, Manifest as LoaderManifest, - }, + minecraft::VersionManifest as MinecraftManifest, + modded::Manifest as LoaderManifest, }; +use reqwest::Method; use serde::{Deserialize, Serialize}; -const METADATA_URL: &str = "https://meta.modrinth.com"; +const METADATA_URL: &str = "https:/launcher-meta.modrinth.com"; #[derive(Serialize, Deserialize, Debug, Clone)] pub struct Metadata { @@ -26,27 +28,27 @@ impl Metadata { format!("{METADATA_URL}/{name}/v0/manifest.json") } - pub async fn fetch() -> crate::Result { + pub async fn fetch(semaphore: &FetchSemaphore) -> crate::Result { let (minecraft, forge, fabric, quilt, neoforge) = tokio::try_join! { async { let url = Self::get_manifest("minecraft"); - fetch_version_manifest(Some(&url)).await + fetch_json(Method::GET, &url, None, None, semaphore, &CredentialsStore(None)).await }, async { let url = Self::get_manifest("forge"); - fetch_loader_manifest(&url).await + fetch_json(Method::GET, &url, None, None, semaphore, &CredentialsStore(None)).await }, async { let url = Self::get_manifest("fabric"); - fetch_loader_manifest(&url).await + fetch_json(Method::GET, &url, None, None, semaphore, &CredentialsStore(None)).await }, async { let url = Self::get_manifest("quilt"); - fetch_loader_manifest(&url).await + fetch_json(Method::GET, &url, None, None, semaphore, &CredentialsStore(None)).await }, async { let url = Self::get_manifest("neo"); - fetch_loader_manifest(&url).await + fetch_json(Method::GET, &url, None, None, semaphore, &CredentialsStore(None)).await } }?; @@ -66,6 +68,7 @@ impl Metadata { dirs: &DirectoryInfo, fetch_online: bool, io_semaphore: &IoSemaphore, + fetch_semaphore: &FetchSemaphore, ) -> crate::Result { let mut metadata = None; let metadata_path = dirs.caches_meta_dir().await.join("metadata.json"); @@ -78,7 +81,7 @@ impl Metadata { metadata = Some(metadata_json); } else if fetch_online { let res = async { - let metadata_fetch = Self::fetch().await?; + let metadata_fetch = Self::fetch(fetch_semaphore).await?; write( &metadata_path, @@ -131,8 +134,9 @@ impl Metadata { pub async fn update() { let res = async { - let metadata_fetch = Metadata::fetch().await?; let state = State::get().await?; + let metadata_fetch = + Metadata::fetch(&state.fetch_semaphore).await?; let metadata_path = state .directories diff --git a/theseus/src/state/mod.rs b/theseus/src/state/mod.rs index fb7928a2c..812bff8e5 100644 --- a/theseus/src/state/mod.rs +++ b/theseus/src/state/mod.rs @@ -157,8 +157,12 @@ impl State { let is_offline = !fetch::check_internet(3).await; - let metadata_fut = - Metadata::init(&directories, !is_offline, &io_semaphore); + let metadata_fut = Metadata::init( + &directories, + !is_offline, + &io_semaphore, + &fetch_semaphore, + ); let profiles_fut = Profiles::init(&directories, &mut file_watcher); let tags_fut = Tags::init( &directories, diff --git a/theseus/src/state/profiles.rs b/theseus/src/state/profiles.rs index 587ceeab2..9eb58b83d 100644 --- a/theseus/src/state/profiles.rs +++ b/theseus/src/state/profiles.rs @@ -12,7 +12,6 @@ use crate::util::fetch::{ use crate::util::io::{self, IOError}; use crate::State; use chrono::{DateTime, Utc}; -use daedalus::get_hash; use daedalus::modded::LoaderVersion; use futures::prelude::*; use notify::{RecommendedWatcher, RecursiveMode}; @@ -611,6 +610,7 @@ impl Profile { || archive.by_name("quilt.mod.json").is_ok() || archive.by_name("META-INF/mods.toml").is_ok() || archive.by_name("mcmod.info").is_ok() + || archive.by_name("META-INF/neoforge.mods.toml").is_ok() { ProjectType::Mod } else if archive.by_name("pack.mcmeta").is_ok() { @@ -638,7 +638,7 @@ impl Profile { let project_path_id = ProjectPathId::new(&relative_name); write(&file_path, &bytes, &state.io_semaphore).await?; - let hash = get_hash(bytes).await?; + let hash = crate::state::fetch::sha1_async(bytes).await?; { let mut profiles = state.profiles.write().await; diff --git a/theseus/src/util/fetch.rs b/theseus/src/util/fetch.rs index f31282f5e..74b947b4e 100644 --- a/theseus/src/util/fetch.rs +++ b/theseus/src/util/fetch.rs @@ -335,7 +335,7 @@ pub async fn write_cached_icon( Ok(path) } -async fn sha1_async(bytes: Bytes) -> crate::Result { +pub async fn sha1_async(bytes: Bytes) -> crate::Result { let hash = tokio::task::spawn_blocking(move || { sha1_smol::Sha1::from(bytes).hexdigest() }) diff --git a/theseus_gui/src-tauri/Cargo.toml b/theseus_gui/src-tauri/Cargo.toml index 21ac3938d..5a013e762 100644 --- a/theseus_gui/src-tauri/Cargo.toml +++ b/theseus_gui/src-tauri/Cargo.toml @@ -28,7 +28,7 @@ tokio = { version = "1", features = ["full"] } thiserror = "1.0" tokio-stream = { version = "0.1", features = ["fs"] } futures = "0.3" -daedalus = {version = "0.1.15", features = ["bincode"] } +daedalus = "0.2.0" chrono = "0.4.26" dirs = "5.0.1" diff --git a/theseus_gui/src-tauri/src/api/logs.rs b/theseus_gui/src-tauri/src/api/logs.rs index e22a17aa4..213130866 100644 --- a/theseus_gui/src-tauri/src/api/logs.rs +++ b/theseus_gui/src-tauri/src/api/logs.rs @@ -1,9 +1,9 @@ use crate::api::Result; +use theseus::logs::LogType; use theseus::{ logs::{self, CensoredString, LatestLogCursor, Logs}, prelude::ProfilePathId, }; -use theseus::logs::LogType; /* A log is a struct containing the filename string, stdout, and stderr, as follows: @@ -67,7 +67,10 @@ pub async fn logs_get_output_by_filename( .into()); }; - Ok(logs::get_output_by_filename(&profile_path, log_type, &filename).await?) + Ok( + logs::get_output_by_filename(&profile_path, log_type, &filename) + .await?, + ) } /// Delete all logs for a profile by profile id @@ -83,7 +86,10 @@ pub async fn logs_delete_logs_by_filename( log_type: LogType, filename: String, ) -> Result<()> { - Ok(logs::delete_logs_by_filename(profile_path, log_type, &filename).await?) + Ok( + logs::delete_logs_by_filename(profile_path, log_type, &filename) + .await?, + ) } /// Get live log from a cursor diff --git a/theseus_playground/Cargo.toml b/theseus_playground/Cargo.toml index 5228a6df1..1d1fa7ab0 100644 --- a/theseus_playground/Cargo.toml +++ b/theseus_playground/Cargo.toml @@ -19,7 +19,7 @@ dunce = "1.0.3" tokio-stream = { version = "0.1", features = ["fs"] } futures = "0.3" -daedalus = {version = "0.1.15", features = ["bincode"] } +daedalus = "0.2.0" uuid = { version = "1.1", features = ["serde", "v4"] } tracing = "0.1.37" diff --git a/theseus_playground/src/main.rs b/theseus_playground/src/main.rs index 185b972ec..fb068b1f6 100644 --- a/theseus_playground/src/main.rs +++ b/theseus_playground/src/main.rs @@ -72,8 +72,8 @@ async fn main() -> theseus::Result<()> { println!("Creating/adding profile."); let name = "Example".to_string(); - let game_version = "1.19.2".to_string(); - let modloader = ModLoader::Vanilla; + let game_version = "1.21".to_string(); + let modloader = ModLoader::Forge; let loader_version = "stable".to_string(); let profile_path = profile_create( From 5a3312073d452dd5cc132c337babbfed04ddce92 Mon Sep 17 00:00:00 2001 From: DIDIRUS4 Date: Mon, 1 Jul 2024 19:52:55 +0300 Subject: [PATCH 2/5] Forgot to remove unuseless logic. --- theseus_gui/package.json | 2 +- theseus_gui/src/components/GridDisplay.vue | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/theseus_gui/package.json b/theseus_gui/package.json index cba4bf79d..84b27b1b0 100644 --- a/theseus_gui/package.json +++ b/theseus_gui/package.json @@ -2,7 +2,7 @@ "name": "theseus_gui", "private": true, "version": "0.7.2", - "patch_version": "08 • Beta", + "patch_version": "09 • Beta", "development_build": true, "type": "module", "scripts": { diff --git a/theseus_gui/src/components/GridDisplay.vue b/theseus_gui/src/components/GridDisplay.vue index feec21f43..0dd56e5c6 100644 --- a/theseus_gui/src/components/GridDisplay.vue +++ b/theseus_gui/src/components/GridDisplay.vue @@ -136,47 +136,40 @@ const filteredResults = computed(() => { if (sortBy.value === t('GridDisplay.Name')) { instances.sort((a, b) => { - sortBy.value = t('GridDisplay.Name') return a.metadata.name.localeCompare(b.metadata.name) }) } if (sortBy.value === t('GridDisplay.GameVer')) { instances.sort((a, b) => { - sortBy.value = t('GridDisplay.GameVer') return a.metadata.game_version.localeCompare(b.metadata.game_version) }) } if (sortBy.value === t('GridDisplay.LastPlayed')) { instances.sort((a, b) => { - sortBy.value = t('GridDisplay.LastPlayed') return dayjs(b.metadata.last_played ?? 0).diff(dayjs(a.metadata.last_played ?? 0)) }) } if (sortBy.value === t('GridDisplay.DateCreated')) { instances.sort((a, b) => { - sortBy.value = t('GridDisplay.DateCreated') return dayjs(b.metadata.date_created).diff(dayjs(a.metadata.date_created)) }) } if (sortBy.value === t('GridDisplay.DateModify')) { instances.sort((a, b) => { - sortBy.value = t('GridDisplay.DateModify') return dayjs(b.metadata.date_modified).diff(dayjs(a.metadata.date_modified)) }) } if (filters.value === t('GridDisplay.CustomInstances')) { instances = instances.filter((instance) => { - filters.value = t('GridDisplay.CustomInstances') return !instance.metadata?.linked_data }) } else if (filters.value === t('GridDisplay.DownloadedModpacks')) { instances = instances.filter((instance) => { - filters.value = t('GridDisplay.DownloadedModpacks') return instance.metadata?.linked_data }) } @@ -185,7 +178,6 @@ const filteredResults = computed(() => { if (group.value === t('GridDisplay.Loader')) { instances.forEach((instance) => { - group.value = t('GridDisplay.Loader') const loader = formatCategoryHeader(instance.metadata.loader) if (!instanceMap.has(loader)) { instanceMap.set(loader, []) @@ -195,7 +187,6 @@ const filteredResults = computed(() => { }) } else if (group.value === t('GridDisplay.GameVer')) { instances.forEach((instance) => { - group.value = t('GridDisplay.GameVer') if (!instanceMap.has(instance.metadata.game_version)) { instanceMap.set(instance.metadata.game_version, []) } @@ -204,7 +195,6 @@ const filteredResults = computed(() => { }) } else if (group.value === t('GridDisplay.Category')) { instances.forEach((instance) => { - group.value = t('GridDisplay.Category') if (instance.metadata.groups.length === 0) { instance.metadata.groups.push(t('GridDisplay.None')) } @@ -379,6 +369,7 @@ const filteredResults = computed(() => { flex-wrap: wrap; gap: 1rem; align-items: inherit; + justify-content: space-between; margin: 1rem 1rem 0 !important; padding: 1rem; width: calc(100% - 2rem); From 164dc99d7c0745c6bfea036e6eda3c42814af5d2 Mon Sep 17 00:00:00 2001 From: DIDIRUS4 Date: Tue, 2 Jul 2024 15:03:05 +0300 Subject: [PATCH 3/5] Implement fix for "Merge commit '486989f4ea04ef24b5b2e2298ddd37503217ab0c' into feature" --- theseus/src/launcher/mod.rs | 7 +- theseus/src/state/metadata.rs | 2 +- theseus_gui/package.json | 6 +- theseus_gui/pnpm-lock.yaml | 120 +++++++++++++++---------------- theseus_gui/src-tauri/Cargo.toml | 2 +- 5 files changed, 67 insertions(+), 70 deletions(-) diff --git a/theseus/src/launcher/mod.rs b/theseus/src/launcher/mod.rs index fc52476f9..19e226335 100644 --- a/theseus/src/launcher/mod.rs +++ b/theseus/src/launcher/mod.rs @@ -1,6 +1,8 @@ //! Logic for launching Minecraft use std::collections::HashMap; +use std::process::Stdio; use std::sync::Arc; +use rand::prelude::SliceRandom; use crate::event::emit::{emit_loading, init_or_edit_loading}; use crate::event::{LoadingBarId, LoadingBarType}; @@ -17,14 +19,9 @@ use chrono::Utc; use daedalus as d; use daedalus::minecraft::{RuleAction, VersionInfo}; use st::Profile; -use std::collections::HashMap; -use std::process::Stdio; -use std::sync::Arc; use tokio::process::Command; use uuid::Uuid; -use st::Profile; - // use crate::{ // process, // state::{MinecraftChild, self as st}, diff --git a/theseus/src/state/metadata.rs b/theseus/src/state/metadata.rs index 4d94d00df..86df9d480 100644 --- a/theseus/src/state/metadata.rs +++ b/theseus/src/state/metadata.rs @@ -12,7 +12,7 @@ use daedalus::{ use reqwest::Method; use serde::{Deserialize, Serialize}; -const METADATA_URL: &str = "https:/launcher-meta.modrinth.com"; +const METADATA_URL: &str = "https://launcher-meta.modrinth.com"; #[derive(Serialize, Deserialize, Debug, Clone)] pub struct Metadata { diff --git a/theseus_gui/package.json b/theseus_gui/package.json index 84b27b1b0..674449260 100644 --- a/theseus_gui/package.json +++ b/theseus_gui/package.json @@ -15,7 +15,7 @@ "fix": "eslint --fix --ext .js,.vue,.ts,.jsx,.tsx,.html,.vue . && prettier --write ." }, "dependencies": { - "@tauri-apps/api": "^1.5.6", + "@tauri-apps/api": "^1.6.0", "@vintl/vintl": "^4.4.1", "dayjs": "^1.11.11", "floating-vue": "^5.2.2", @@ -33,11 +33,11 @@ }, "devDependencies": { "@rollup/plugin-alias": "^5.1.0", - "@tauri-apps/cli": "^1.5.14", + "@tauri-apps/cli": "^1.6.0", "@vitejs/plugin-vue": "^5.0.5", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", - "eslint-plugin-vue": "^9.26.0", + "eslint-plugin-vue": "^9.27.0", "prettier": "^3.3.2", "sass": "^1.77.6", "vite": "^5.3.2", diff --git a/theseus_gui/pnpm-lock.yaml b/theseus_gui/pnpm-lock.yaml index bdd3d8701..fa5f17f7c 100644 --- a/theseus_gui/pnpm-lock.yaml +++ b/theseus_gui/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@tauri-apps/api': - specifier: ^1.5.6 - version: 1.5.6 + specifier: ^1.6.0 + version: 1.6.0 '@vintl/vintl': specifier: ^4.4.1 version: 4.4.1(vue@3.4.31) @@ -34,7 +34,7 @@ importers: version: 2.1.7(vue@3.4.31) tauri-plugin-window-state-api: specifier: github:tauri-apps/tauri-plugin-window-state#v1 - version: https://codeload.github.com/tauri-apps/tauri-plugin-window-state/tar.gz/83324932be7d2bf0cc68202bacf5427d9270dcbd + version: https://codeload.github.com/tauri-apps/tauri-plugin-window-state/tar.gz/1abc39dce68e3da8377230b83b7792cd4c86c50a vite-svg-loader: specifier: ^5.1.0 version: 5.1.0(vue@3.4.31) @@ -58,8 +58,8 @@ importers: specifier: ^5.1.0 version: 5.1.0(rollup@4.18.0) '@tauri-apps/cli': - specifier: ^1.5.14 - version: 1.5.14 + specifier: ^1.6.0 + version: 1.6.0 '@vitejs/plugin-vue': specifier: ^5.0.5 version: 5.0.5(vite@5.3.2(sass@1.77.6))(vue@3.4.31) @@ -70,8 +70,8 @@ importers: specifier: ^9.1.0 version: 9.1.0(eslint@8.57.0) eslint-plugin-vue: - specifier: ^9.26.0 - version: 9.26.0(eslint@8.57.0) + specifier: ^9.27.0 + version: 9.27.0(eslint@8.57.0) prettier: specifier: ^3.3.2 version: 3.3.2 @@ -498,72 +498,72 @@ packages: '@rrweb/types@2.0.0-alpha.16': resolution: {integrity: sha512-E6cACNVsm+NUhn7dzocQoKyXI7BHrHRRm5Ab23yrAzEQ2caWocCEYJhqDlc4KRVJBkQfXZfyWm8+2d0uggFuZg==} - '@tauri-apps/api@1.5.6': - resolution: {integrity: sha512-LH5ToovAHnDVe5Qa9f/+jW28I6DeMhos8bNDtBOmmnaDpPmJmYLyHdeDblAWWWYc7KKRDg9/66vMuKyq0WIeFA==} + '@tauri-apps/api@1.6.0': + resolution: {integrity: sha512-rqI++FWClU5I2UBp4HXFvl+sBWkdigBkxnpJDQUWttNyG7IZP4FwQGhTNL5EOw0vI8i6eSAJ5frLqO7n7jbJdg==} engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} - '@tauri-apps/cli-darwin-arm64@1.5.14': - resolution: {integrity: sha512-lxoSOp3KKSqzHJa7iT32dukPGMlfsTuja1xXSgwR8o/fqzpYJY7FY/3ZxesP8HR66FcK+vtqa//HNqeOQ0mHkA==} + '@tauri-apps/cli-darwin-arm64@1.6.0': + resolution: {integrity: sha512-SNRwUD9nqGxY47mbY1CGTt/jqyQOU7Ps7Mx/mpgahL0FVUDiCEY/5L9QfEPPhEgccgcelEVn7i6aQHIkHyUtCA==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tauri-apps/cli-darwin-x64@1.5.14': - resolution: {integrity: sha512-EXSwN1n5spfG8FoXuyc90ACtmDJXzaZ1gxyENaq9xEpQoo7j/Q1vb6qXxmr6azKr8zmqY4h08ZFbv3exh93xJg==} + '@tauri-apps/cli-darwin-x64@1.6.0': + resolution: {integrity: sha512-g2/uDR/eeH2arvuawA4WwaEOqv/7jDO/ZLNI3JlBjP5Pk8GGb3Kdy0ro1xQzF94mtk2mOnOXa4dMgAet4sUJ1A==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tauri-apps/cli-linux-arm-gnueabihf@1.5.14': - resolution: {integrity: sha512-Yb8BH/KYR7Tl+de40sZPfrqbhcU3Jlu+UPIrnXt05sjn48xqIps74Xjz8zzVp0TuHxUp8FmIGtCVhQgsbrsvvg==} + '@tauri-apps/cli-linux-arm-gnueabihf@1.6.0': + resolution: {integrity: sha512-EVwf4oRkQyG8BpSrk0gqO7oA0sDM2MdNDtJpMfleYFEgCxLIOGZKNqaOW3M7U+0Y4qikmG3TtRK+ngc8Ymtrjg==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tauri-apps/cli-linux-arm64-gnu@1.5.14': - resolution: {integrity: sha512-QrKHP4gRaHiup478rPBZ+BmNd88yze9jMmheoNy9mN1K/aECRmTHO+tWhsxv5moFHZzRhO0QDWxxvTtiaPXaGg==} + '@tauri-apps/cli-linux-arm64-gnu@1.6.0': + resolution: {integrity: sha512-YdpY17cAySrhK9dX4BUVEmhAxE2o+6skIEFg8iN/xrDwRxhaNPI9I80YXPatUTX54Kx55T5++25VJG9+3iw83A==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-arm64-musl@1.5.14': - resolution: {integrity: sha512-Hb1C1VMxmUcyGjW/K/INKF87zzzgLEVRmWZZnQd7M1P4uue4xPyIwUELSdX12Z2jREPgmLW4AXPD0m6wsNu7iw==} + '@tauri-apps/cli-linux-arm64-musl@1.6.0': + resolution: {integrity: sha512-4U628tuf2U8pMr4tIBJhEkrFwt+46dwhXrDlpdyWSZtnop5RJAVKHODm0KbWns4xGKfTW1F3r6sSv+2ZxLcISA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-x64-gnu@1.5.14': - resolution: {integrity: sha512-kD9v/UwPDuhIgq2TJj/s2/7rqk+vmExVV6xHPKI8vVbIvlNAOZqmx3fpxjej1241vhJ/piGd/m6q6YMWGsL0oQ==} + '@tauri-apps/cli-linux-x64-gnu@1.6.0': + resolution: {integrity: sha512-AKRzp76fVUaJyXj5KRJT9bJyhwZyUnRQU0RqIRqOtZCT5yr6qGP8rjtQ7YhCIzWrseBlOllc3Qvbgw3Yl0VQcA==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-linux-x64-musl@1.5.14': - resolution: {integrity: sha512-204Drgg9Zx0+THKndqASz4+iPCwqA3gQVF9C0CDIArNXrjPyJjVvW8VP5CHiZYaTNWxlz/ltyxluM6UFWbXNFw==} + '@tauri-apps/cli-linux-x64-musl@1.6.0': + resolution: {integrity: sha512-0edIdq6aMBTaRMIXddHfyAFL361JqulLLd2Wi2aoOie7DkQ2MYh6gv3hA7NB9gqFwNIGE+xtJ4BkXIP2tSGPlg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-win32-arm64-msvc@1.5.14': - resolution: {integrity: sha512-sqPSni2MnWNCm+8YZnLdWCclxfSHaYqKuPFSz8q7Tn1G1m/cA9gyPoC1G0esHftY7bu/ZM5lB4kM3I4U0KlLiA==} + '@tauri-apps/cli-win32-arm64-msvc@1.6.0': + resolution: {integrity: sha512-QwWpWk4ubcwJ1rljsRAmINgB2AwkyzZhpYbalA+MmzyYMREcdXWGkyixWbRZgqc6fEWEBmq5UG73qz5eBJiIKg==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tauri-apps/cli-win32-ia32-msvc@1.5.14': - resolution: {integrity: sha512-8xN8W0zTs8oFsQmvYLxHFeqhzVI7oTaPK1xQMc5gbpFP45jN41c21aCXfjnvzT+h90EfCHUF9EWj2HTEJSb7Iw==} + '@tauri-apps/cli-win32-ia32-msvc@1.6.0': + resolution: {integrity: sha512-Vtw0yxO9+aEFuhuxQ57ALG43tjECopRimRuKGbtZYDCriB/ty5TrT3QWMdy0dxBkpDTu3Rqsz30sbDzw6tlP3Q==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] - '@tauri-apps/cli-win32-x64-msvc@1.5.14': - resolution: {integrity: sha512-U0slee5tNM2PYECBpPHavLSwkT3szGMZ+qhcikQQbDan84bQdLn/kHWjyXOgLJs4KSve4+KxcrN+AVqj0VyHnw==} + '@tauri-apps/cli-win32-x64-msvc@1.6.0': + resolution: {integrity: sha512-h54FHOvGi7+LIfRchzgZYSCHB1HDlP599vWXQQJ/XnwJY+6Rwr2E5bOe/EhqoG8rbGkfK0xX3KPAvXPbUlmggg==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tauri-apps/cli@1.5.14': - resolution: {integrity: sha512-JOSMKymlg116UdEXSj69eg5p1OtZnQkUE0qIGbtNDO1sk3X/KgBN6+oHBW0BzPStp/W0AjBgrMWCqjHPwEpOug==} + '@tauri-apps/cli@1.6.0': + resolution: {integrity: sha512-DBBpBl6GhTzm8ImMbKkfaZ4fDTykWrC7Q5OXP4XqD91recmDEn2LExuvuiiS3HYe7uP8Eb5B9NPHhqJb+Zo7qQ==} engines: {node: '>= 10'} hasBin: true @@ -812,8 +812,8 @@ packages: peerDependencies: eslint: '>=7.0.0' - eslint-plugin-vue@9.26.0: - resolution: {integrity: sha512-eTvlxXgd4ijE1cdur850G6KalZqk65k1JKoOI2d1kT3hr8sPD07j1q98FRFdNnpxBELGPWxZmInxeHGF/GxtqQ==} + eslint-plugin-vue@9.27.0: + resolution: {integrity: sha512-5Dw3yxEyuBSXTzT5/Ge1X5kIkRTQ3nvBn/VwPwInNiZBSJOO/timWMUaflONnFBzU6NhB68lxnCda7ULV5N7LA==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 @@ -1274,8 +1274,8 @@ packages: engines: {node: '>=14.0.0'} hasBin: true - tauri-plugin-window-state-api@https://codeload.github.com/tauri-apps/tauri-plugin-window-state/tar.gz/83324932be7d2bf0cc68202bacf5427d9270dcbd: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-window-state/tar.gz/83324932be7d2bf0cc68202bacf5427d9270dcbd} + tauri-plugin-window-state-api@https://codeload.github.com/tauri-apps/tauri-plugin-window-state/tar.gz/1abc39dce68e3da8377230b83b7792cd4c86c50a: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-window-state/tar.gz/1abc39dce68e3da8377230b83b7792cd4c86c50a} version: 0.0.0 text-table@0.2.0: @@ -1830,50 +1830,50 @@ snapshots: dependencies: rrweb-snapshot: 2.0.0-alpha.16 - '@tauri-apps/api@1.5.6': {} + '@tauri-apps/api@1.6.0': {} - '@tauri-apps/cli-darwin-arm64@1.5.14': + '@tauri-apps/cli-darwin-arm64@1.6.0': optional: true - '@tauri-apps/cli-darwin-x64@1.5.14': + '@tauri-apps/cli-darwin-x64@1.6.0': optional: true - '@tauri-apps/cli-linux-arm-gnueabihf@1.5.14': + '@tauri-apps/cli-linux-arm-gnueabihf@1.6.0': optional: true - '@tauri-apps/cli-linux-arm64-gnu@1.5.14': + '@tauri-apps/cli-linux-arm64-gnu@1.6.0': optional: true - '@tauri-apps/cli-linux-arm64-musl@1.5.14': + '@tauri-apps/cli-linux-arm64-musl@1.6.0': optional: true - '@tauri-apps/cli-linux-x64-gnu@1.5.14': + '@tauri-apps/cli-linux-x64-gnu@1.6.0': optional: true - '@tauri-apps/cli-linux-x64-musl@1.5.14': + '@tauri-apps/cli-linux-x64-musl@1.6.0': optional: true - '@tauri-apps/cli-win32-arm64-msvc@1.5.14': + '@tauri-apps/cli-win32-arm64-msvc@1.6.0': optional: true - '@tauri-apps/cli-win32-ia32-msvc@1.5.14': + '@tauri-apps/cli-win32-ia32-msvc@1.6.0': optional: true - '@tauri-apps/cli-win32-x64-msvc@1.5.14': + '@tauri-apps/cli-win32-x64-msvc@1.6.0': optional: true - '@tauri-apps/cli@1.5.14': + '@tauri-apps/cli@1.6.0': optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 1.5.14 - '@tauri-apps/cli-darwin-x64': 1.5.14 - '@tauri-apps/cli-linux-arm-gnueabihf': 1.5.14 - '@tauri-apps/cli-linux-arm64-gnu': 1.5.14 - '@tauri-apps/cli-linux-arm64-musl': 1.5.14 - '@tauri-apps/cli-linux-x64-gnu': 1.5.14 - '@tauri-apps/cli-linux-x64-musl': 1.5.14 - '@tauri-apps/cli-win32-arm64-msvc': 1.5.14 - '@tauri-apps/cli-win32-ia32-msvc': 1.5.14 - '@tauri-apps/cli-win32-x64-msvc': 1.5.14 + '@tauri-apps/cli-darwin-arm64': 1.6.0 + '@tauri-apps/cli-darwin-x64': 1.6.0 + '@tauri-apps/cli-linux-arm-gnueabihf': 1.6.0 + '@tauri-apps/cli-linux-arm64-gnu': 1.6.0 + '@tauri-apps/cli-linux-arm64-musl': 1.6.0 + '@tauri-apps/cli-linux-x64-gnu': 1.6.0 + '@tauri-apps/cli-linux-x64-musl': 1.6.0 + '@tauri-apps/cli-win32-arm64-msvc': 1.6.0 + '@tauri-apps/cli-win32-ia32-msvc': 1.6.0 + '@tauri-apps/cli-win32-x64-msvc': 1.6.0 '@trysound/sax@0.2.0': {} @@ -2156,7 +2156,7 @@ snapshots: dependencies: eslint: 8.57.0 - eslint-plugin-vue@9.26.0(eslint@8.57.0): + eslint-plugin-vue@9.27.0(eslint@8.57.0): dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) eslint: 8.57.0 @@ -2654,9 +2654,9 @@ snapshots: csso: 5.0.5 picocolors: 1.0.1 - tauri-plugin-window-state-api@https://codeload.github.com/tauri-apps/tauri-plugin-window-state/tar.gz/83324932be7d2bf0cc68202bacf5427d9270dcbd: + tauri-plugin-window-state-api@https://codeload.github.com/tauri-apps/tauri-plugin-window-state/tar.gz/1abc39dce68e3da8377230b83b7792cd4c86c50a: dependencies: - '@tauri-apps/api': 1.5.6 + '@tauri-apps/api': 1.6.0 text-table@0.2.0: {} diff --git a/theseus_gui/src-tauri/Cargo.toml b/theseus_gui/src-tauri/Cargo.toml index 3a280aadc..4ca9b4e3f 100644 --- a/theseus_gui/src-tauri/Cargo.toml +++ b/theseus_gui/src-tauri/Cargo.toml @@ -28,7 +28,7 @@ tokio = { version = "1.35.1", features = ["full"] } thiserror = "1.0.56" tokio-stream = { version = "0.1.14", features = ["fs"] } futures = "0.3.30" -daedalus = {version = "0.2.0", features = ["bincode"] } +daedalus = "0.2.0" chrono = "0.4.31" dirs = "5.0.1" From 0e47d482437f357b294298cedceb8dc02baf136e Mon Sep 17 00:00:00 2001 From: DIDIRUS4 Date: Tue, 2 Jul 2024 22:52:23 +0300 Subject: [PATCH 4/5] Remove beta branch from github workflow --- .github/workflows/tauri-build.yml | 28 +- Cargo.lock | 608 ++++++++++++------------------ theseus_gui/package.json | 2 +- 3 files changed, 240 insertions(+), 398 deletions(-) diff --git a/.github/workflows/tauri-build.yml b/.github/workflows/tauri-build.yml index d75b61501..c2e3d99af 100644 --- a/.github/workflows/tauri-build.yml +++ b/.github/workflows/tauri-build.yml @@ -1,9 +1,10 @@ -name: 'Tauri GUI Build' +name: 'AstralRinth: Tauri Build' on: push: - branches: [ beta, feature ] + branches: + - feature-* jobs: - tauri_build: + application_build: strategy: fail-fast: false matrix: @@ -89,17 +90,6 @@ jobs: with: includeDebug: true - # - name: Flatpak Builder - # uses: flatpak/flatpak-github-actions@v6.3 - # id: build_os_ubuntu_flatpak - # if: startsWith(matrix.platform, 'flatpak') - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} - # TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - # with: - # includeDebug: true - - name: upload ${{ matrix.platform }} uses: actions/upload-artifact@v3 if: startsWith(matrix.platform, 'macos') @@ -112,12 +102,4 @@ jobs: if: "!startsWith(matrix.platform, 'macos')" with: name: ${{ matrix.platform }} - path: "${{ join(fromJSON(steps.build_os.outputs.artifactPaths), '\n') }}" - - # - name: upload ${{ matrix.platform }} - # uses: actions/upload-artifact@v3 - # if: startsWith(matrix.platform, 'flatpak') - # with: - # name: ${{ matrix.platform }} - # path: "${{ join(fromJSON(steps.build_os_ubuntu_flatpak.outputs.artifactPaths), '\n') }}" - + path: "${{ join(fromJSON(steps.build_os.outputs.artifactPaths), '\n') }}" \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index f2fcb9c92..895f99e35 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -224,7 +224,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -259,7 +259,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -392,9 +392,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block" @@ -484,9 +484,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -557,9 +557,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.99" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" dependencies = [ "jobserver", "libc", @@ -580,7 +580,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" dependencies = [ "byteorder", "fnv", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -916,7 +916,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -926,14 +926,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] name = "daedalus" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "746a446bbe5e256206a3effdf334b831b120dbfbf2d311e29ace72673ca18bc8" +checksum = "7b8590e725889bb981febb438f133f8ef6b62f610f92835c961338e771222b1a" dependencies = [ "bytes", "chrono", @@ -963,7 +963,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -974,7 +974,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -990,7 +990,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ "serde", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -1033,15 +1033,15 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] @@ -1116,17 +1116,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "dtoa" version = "1.0.9" @@ -1164,9 +1153,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" @@ -1241,7 +1230,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1409,7 +1398,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1536,7 +1525,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2094,9 +2083,9 @@ checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" [[package]] name = "httparse" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -2130,9 +2119,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "c4fe55fb7a772d59a5ff1dfbff4fe0258d19b89fec4b233e75d35d5d2316badc" dependencies = [ "bytes", "futures-channel", @@ -2148,6 +2137,23 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.4.0", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.5.0" @@ -2169,7 +2175,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.3.1", + "hyper 1.4.0", "hyper-util", "native-tls", "tokio", @@ -2179,16 +2185,16 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.0", - "hyper 1.3.1", + "hyper 1.4.0", "pin-project-lite", "socket2 0.5.7", "tokio", @@ -2230,124 +2236,6 @@ dependencies = [ "png", ] -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" - -[[package]] -name = "icu_properties" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -2356,14 +2244,12 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "icu_normalizer", - "icu_properties", - "smallvec", - "utf8_iter", + "unicode-bidi", + "unicode-normalization", ] [[package]] @@ -2641,9 +2527,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" @@ -2657,16 +2543,10 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] -[[package]] -name = "line-wrap" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" - [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -2679,12 +2559,6 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" -[[package]] -name = "litemap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" - [[package]] name = "lock_api" version = "0.4.12" @@ -2697,9 +2571,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "loom" @@ -2825,7 +2699,7 @@ version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c4d14bcca0fd3ed165a03000480aaa364c6860c34e900cb2dafdf3b95340e77" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "debugid", "num-derive", "num-traits", @@ -2840,7 +2714,7 @@ version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abcd9c8a1e6e1e9d56ce3627851f39a17ea83e17c96bc510f29d7e43d78a7d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "cfg-if", "crash-context", @@ -2885,14 +2759,14 @@ dependencies = [ "crash-handler", "minidumper", "thiserror", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -2979,7 +2853,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -2997,7 +2871,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -3053,7 +2927,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3165,9 +3039,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -3194,7 +3068,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -3211,7 +3085,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3485,7 +3359,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3532,7 +3406,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3582,13 +3456,12 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "plist" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "indexmap 2.2.6", - "line-wrap", "quick-xml", "serde", "time", @@ -3713,9 +3586,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -3726,15 +3599,15 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "hex", ] [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" dependencies = [ "memchr", ] @@ -3879,7 +3752,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3965,7 +3838,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-native-tls", @@ -3979,9 +3852,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ "async-compression", "base64 0.22.1", @@ -3994,7 +3867,8 @@ dependencies = [ "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.3.1", + "hyper 1.4.0", + "hyper-rustls", "hyper-tls 0.6.0", "hyper-util", "ipnet", @@ -4009,7 +3883,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 1.0.1", "system-configuration", "tokio", "tokio-native-tls", @@ -4063,6 +3937,21 @@ dependencies = [ "windows 0.37.0", ] +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.15", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + [[package]] name = "rustc-demangle" version = "0.1.24" @@ -4098,13 +3987,26 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] +[[package]] +name = "rustls" +version = "0.23.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" +dependencies = [ + "once_cell", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -4130,6 +4032,17 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +[[package]] +name = "rustls-webpki" +version = "0.102.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.17" @@ -4189,7 +4102,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4212,7 +4125,7 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -4266,7 +4179,7 @@ checksum = "00421ed8fa0c995f07cde48ba6c89e80f2b312f74ff637326f392fbfd23abe02" dependencies = [ "httpdate", "native-tls", - "reqwest 0.12.4", + "reqwest 0.12.5", "sentry-backtrace", "sentry-contexts", "sentry-core", @@ -4374,7 +4287,7 @@ dependencies = [ "thiserror", "time", "url", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -4394,7 +4307,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4410,9 +4323,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "indexmap 2.2.6", "itoa 1.0.11", @@ -4428,7 +4341,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4454,9 +4367,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.1" +version = "3.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "079f3a42cd87588d924ed95b533f8d30a483388c4e400ab736a7058e34f16169" dependencies = [ "base64 0.22.1", "chrono", @@ -4472,14 +4385,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "bc03aad67c1d26b7de277d51c86892e7d9a0110a2fe44bf6b26cc569fba302d6" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4605,7 +4518,7 @@ checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4656,6 +4569,12 @@ dependencies = [ "system-deps 5.0.0", ] +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "spki" version = "0.7.3" @@ -4721,9 +4640,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -4738,9 +4657,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -4754,15 +4673,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] -name = "synstructure" -version = "0.13.1" +name = "sync_wrapper" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "sys-info" @@ -4890,7 +4804,7 @@ dependencies = [ "serde", "tao-macros", "unicode-segmentation", - "uuid 1.8.0", + "uuid 1.9.1", "windows 0.39.0", "windows-implement", "x11-dl", @@ -4926,9 +4840,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tauri" -version = "1.6.8" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77567d2b3b74de4588d544147142d02297f3eaa171a25a065252141d8597a516" +checksum = "336bc661a3f3250853fa83c6e5245449ed1c26dce5dcb28bdee7efedf6278806" dependencies = [ "anyhow", "cocoa 0.24.1", @@ -4970,7 +4884,7 @@ dependencies = [ "thiserror", "tokio", "url", - "uuid 1.8.0", + "uuid 1.9.1", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -4978,9 +4892,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab30cba12974d0f9b09794f61e72cad6da2142d3ceb81e519321bab86ce53312" +checksum = "b0c6ec7a5c3296330c7818478948b422967ce4649094696c985f61d50076d29c" dependencies = [ "anyhow", "cargo_toml", @@ -4997,9 +4911,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.4.3" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a1d90db526a8cdfd54444ad3f34d8d4d58fa5c536463915942393743bd06f8" +checksum = "c1aed706708ff1200ec12de9cfbf2582b5d8ec05f6a7293911091effbd22036b" dependencies = [ "base64 0.21.7", "brotli 3.5.0", @@ -5017,15 +4931,15 @@ dependencies = [ "tauri-utils", "thiserror", "time", - "uuid 1.8.0", + "uuid 1.9.1", "walkdir", ] [[package]] name = "tauri-macros" -version = "1.4.4" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a582d75414250122e4a597b9dd7d3c910a2c77906648fc2ac9353845ff0feec" +checksum = "b88f831d2973ae4f81a706a0004e67dac87f2e4439973bbe98efbd73825d8ede" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -5054,7 +4968,7 @@ dependencies = [ [[package]] name = "tauri-plugin-single-instance" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#562425644ef7c11a7b301a30c07a8c8b545621a8" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#76b0f657d1ce0eb273f5b31b6ddf056c7a185d0b" dependencies = [ "log", "serde", @@ -5068,10 +4982,10 @@ dependencies = [ [[package]] name = "tauri-plugin-window-state" version = "0.1.1" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#562425644ef7c11a7b301a30c07a8c8b545621a8" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#76b0f657d1ce0eb273f5b31b6ddf056c7a185d0b" dependencies = [ "bincode", - "bitflags 2.5.0", + "bitflags 2.6.0", "log", "serde", "serde_json", @@ -5081,9 +4995,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7ffddf36d450791018e63a3ddf54979b9581d9644c584a5fb5611e6b5f20b4" +checksum = "3068ed62b63dedc705558f4248c7ecbd5561f0f8050949859ea0db2326f26012" dependencies = [ "gtk", "http 0.2.12", @@ -5095,16 +5009,16 @@ dependencies = [ "tauri-utils", "thiserror", "url", - "uuid 1.8.0", + "uuid 1.9.1", "webview2-com", "windows 0.39.0", ] [[package]] name = "tauri-runtime-wry" -version = "0.14.8" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1989b3b4d611f5428b3414a4abae6fa6df30c7eb8ed33250ca90a5f7e5bb3655" +checksum = "d4c3db170233096aa30330feadcd895bf9317be97e624458560a20e814db7955" dependencies = [ "cocoa 0.24.1", "gtk", @@ -5113,7 +5027,7 @@ dependencies = [ "raw-window-handle", "tauri-runtime", "tauri-utils", - "uuid 1.8.0", + "uuid 1.9.1", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -5122,9 +5036,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.5.4" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "450b17a7102e5d46d4bdabae0d1590fd27953e704e691fc081f06c06d2253b35" +checksum = "2826db448309d382dac14d520f0c0a40839b87b57b977e59cf5f296b3ace6a93" dependencies = [ "brotli 3.5.0", "ctor", @@ -5208,7 +5122,7 @@ dependencies = [ "paste", "rand 0.8.5", "regex", - "reqwest 0.12.4", + "reqwest 0.12.5", "serde", "serde_ini", "serde_json", @@ -5229,7 +5143,7 @@ dependencies = [ "tracing-subscriber", "url", "urlencoding", - "uuid 1.8.0", + "uuid 1.9.1", "whoami", "winreg 0.52.0", "zip", @@ -5265,7 +5179,7 @@ dependencies = [ "tracing", "tracing-error", "url", - "uuid 1.8.0", + "uuid 1.9.1", "window-shadows", ] @@ -5274,7 +5188,7 @@ name = "theseus_macros" version = "0.1.0" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -5295,7 +5209,7 @@ dependencies = [ "tracing-error", "tracing-subscriber", "url", - "uuid 1.8.0", + "uuid 1.9.1", "webbrowser", ] @@ -5322,7 +5236,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -5367,15 +5281,20 @@ dependencies = [ ] [[package]] -name = "tinystr" -version = "0.7.6" +name = "tinyvec" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" dependencies = [ - "displaydoc", - "zerovec", + "tinyvec_macros", ] +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "to_method" version = "1.1.0" @@ -5409,7 +5328,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -5422,6 +5341,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.15" @@ -5573,7 +5503,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -5687,12 +5617,27 @@ dependencies = [ "libc", ] +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + [[package]] name = "unicode-segmentation" version = "1.11.0" @@ -5705,6 +5650,12 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "ureq" version = "2.9.7" @@ -5720,9 +5671,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -5742,18 +5693,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - [[package]] name = "uuid" version = "0.8.2" @@ -5765,9 +5704,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom 0.2.15", "serde", @@ -5893,7 +5832,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wasm-bindgen-shared", ] @@ -5927,7 +5866,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6531,18 +6470,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - [[package]] name = "wry" version = "0.24.10" @@ -6632,30 +6559,6 @@ dependencies = [ "lzma-sys", ] -[[package]] -name = "yoke" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure", -] - [[package]] name = "zbus" version = "3.15.2" @@ -6722,55 +6625,12 @@ dependencies = [ "zvariant", ] -[[package]] -name = "zerofrom" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure", -] - [[package]] name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" -[[package]] -name = "zerovec" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "zip" version = "0.6.6" @@ -6830,9 +6690,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +version = "2.0.11+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" dependencies = [ "cc", "pkg-config", diff --git a/theseus_gui/package.json b/theseus_gui/package.json index 674449260..ef6d028c7 100644 --- a/theseus_gui/package.json +++ b/theseus_gui/package.json @@ -2,7 +2,7 @@ "name": "theseus_gui", "private": true, "version": "0.7.2", - "patch_version": "09 • Beta", + "patch_version": "10 • Beta", "development_build": true, "type": "module", "scripts": { From f63082c0edfc1c3bda34637ca777cda5c1cedfb6 Mon Sep 17 00:00:00 2001 From: DIDIRUS4 Date: Tue, 2 Jul 2024 22:55:59 +0300 Subject: [PATCH 5/5] Remove type symbol --- .github/workflows/tauri-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tauri-build.yml b/.github/workflows/tauri-build.yml index c2e3d99af..88ca5ffd1 100644 --- a/.github/workflows/tauri-build.yml +++ b/.github/workflows/tauri-build.yml @@ -2,7 +2,7 @@ name: 'AstralRinth: Tauri Build' on: push: branches: - - feature-* + - feature* jobs: application_build: strategy: