update deps & other things

Author: RedstoneWizard08

Cargo.lock

@@ -11,102 +11,84 @@ authors = ["RedstoneWizard08"]
 readme = "README.md"
 
 [workspace.dependencies]
-anstyle = "1.0.10"
-anyhow = "1.0.95"
-async-trait = "0.1.85"
-axum = { version = "0.8.1", features = ["macros", "multipart", "ws"] }
-axum-core = "0.5.0"
-axum-extra = { version = "0.10.0", features = ["cookie", "typed-header"] }
+anyhow = "1.0.98"
+axum = { version = "0.8.3", features = ["macros", "multipart", "ws"] }
+axum-core = "0.5.2"
+axum-extra = { version = "0.10.1", features = ["cookie", "typed-header"] }
 base64 = "0.22.1"
-bytes = "1.9.0"
+bytes = "1.10.1"
 cfg-if = "1.0.0"
-chrono = { version = "0.4.39", features = ["pure-rust-locales", "serde"] }
-clap = { version = "4.5.26", features = ["derive", "color"] }
+chrono = { version = "0.4.40", features = ["pure-rust-locales", "serde"] }
+clap = { version = "4.5.37", features = ["derive", "color"] }
 clap-verbosity-flag = "3.0.2"
-clap_complete = "4.5.42"
+clap_complete = "4.5.47"
 colored = "3.0.0"
-color-eyre = "0.6.3"
-config = "0.15.5"
+config = "0.15.11"
 const_format = "0.2.34"
-copy_dir = "0.1.3"
 crates_io_api = "0.11.0"
-crossbeam-channel = "0.5.14"
-ctrlc = "3.4.5"
+crossbeam-channel = "0.5.15"
+ctrlc = "3.4.6"
 derive_builder = "0.20.2"
-diesel = { version = "2.2.6", features = ["chrono", "postgres"] }
+diesel = { version = "2.2.9", features = ["chrono", "postgres"] }
 diesel-async = { version = "0.5.2", features = ["tokio", "postgres", "deadpool"] }
 diesel_async_migrations = "0.15.0"
 diesel-derive-enum = { version = "2.1.0", features = ["postgres"] }
-dirs = "6.0.0"
 dotenvy = "0.15.7"
-duration-str = "0.13.0"
-eyre = "0.6.12"
-flate2 = "1.0.35"
+duration-str = "0.17.0"
+flate2 = "1.1.1"
 futures = "0.3.31"
 futures-util = "0.3.31"
-git2 = "0.20.0"
 glob = "0.3.2"
-http = "1.2.0"
-http-body-util = "0.1.2"
-hyper-util = { version = "0.1.4", features = ["tokio"] }
-hyper = { version = "1.5.2", features = ["client"] }
+http = "1.3.1"
+http-body-util = "0.1.3"
+hyper-util = { version = "0.1.11", features = ["tokio"] }
+hyper = { version = "1.6.0", features = ["client"] }
 ignore = "0.4.23"
-indexmap = "2.7.0"
-indicatif = "0.17.9"
-inquire = "0.7.5"
+indicatif = "0.17.11"
 itertools = "0.14.0"
-jsonwebtoken = "9.3.0"
 lazy_static = "1.5.0"
 lenient_semver = { version = "0.4.2", features = ["version_serde"] }
-log = "0.4.22"
-meilisearch-sdk = "0.27.1"
+log = "0.4.27"
+meilisearch-sdk = "0.28.0"
 mime_guess = "2.0.5"
 oauth2 = "5.0.0"
-object_store = { version = "0.11.2", features = ["aws"] }
-octocrab = "0.43.0"
-once_cell = "1.20.2"
-open = "5.3.2"
-openssl-sys = { version = "0.9.104", features = ["vendored"] }
-parking_lot = "0.12.3"
-portpicker = "0.1.1"
-pq-sys = { version = "0.6.3", features = ["bundled"] }
-proc-macro2 = "1.0.92"
-quote = "1.0.38"
-rand = "0.9.0"
+object_store = { version = "0.12.0", features = ["aws"] }
+octocrab = "0.44.0"
+once_cell = "1.21.3"
+openssl-sys = { version = "0.9.107", features = ["vendored"] }
+pq-sys = { version = "0.7.1", features = ["bundled"] }
+proc-macro2 = "1.0.95"
+quote = "1.0.40"
 random-string = "1.1.0"
-rayon = "1.10.0"
 regex = "1.11.1"
-reqwest = { version = "0.12.12", default-features = false, features = ["json", "rustls-tls", "multipart", "stream", "blocking"] }
-ron = "0.8.1"
+reqwest = { version = "0.12.15", default-features = false, features = ["json", "rustls-tls", "multipart", "stream", "blocking"] }
+ron = "0.10.1"
 rsbadges = "1.1.5"
-semver = { version = "1.0.24", features = ["serde"] }
-serde = { version = "1.0.217", features = ["derive"] }
-serde_json = "1.0.135"
+semver = { version = "1.0.26", features = ["serde"] }
+serde = { version = "1.0.219", features = ["derive"] }
+serde_json = "1.0.140"
 serde-this-or-that = "0.5.0"
 serde_yaml = "0.9.34"
-serde-xml-rs = "0.6.0"
+serde-xml-rs = "0.7.0"
 sha-1 = "0.10.1"
-sysinfo = "0.33.1"
-tar = "0.4.43"
-tempfile = "3.15.0"
-termsize = "0.1.9"
-thiserror = "2.0.11"
-tiny_http = "0.12.0"
-tokio = { version = "1.43.0", features = ["process", "rt", "rt-multi-thread", "macros"] }
-tokio-tungstenite = { version = "0.26.1", features = ["rustls"] }
-toml = "0.8.19"
-toml_edit = "0.22.23"
+sysinfo = "0.34.2"
+tar = "0.4.44"
+tempfile = "3.19.1"
+thiserror = "2.0.12"
+tokio = { version = "1.44.2", features = ["process", "rt", "rt-multi-thread", "macros"] }
+tokio-tungstenite = { version = "0.26.2", features = ["rustls"] }
+toml = "0.8.20"
+toml_edit = "0.22.24"
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["ansi", "env-filter", "registry"] }
-tungstenite = { version = "0.26.1", features = ["rustls"] }
+tungstenite = { version = "0.26.2", features = ["rustls"] }
 url = "2.5.4"
 utoipa = { version = "5.3.1", features = ["axum_extras", "chrono", "yaml"] }
 utoipa-rapidoc = { version = "6.0.0", features = ["axum"] }
 utoipa-redoc = { version = "6.0.0", features = ["axum"] }
 utoipa-scalar = { version = "0.3.0", features = ["axum"] }
-utoipa-swagger-ui = { version = "9.0.0", features = ["axum"] }
-uuid = { version = "1.11.1", features = ["v4"] }
-zip = "2.2.2"
+utoipa-swagger-ui = { version = "9.0.1", features = ["axum"] }
+zip = "2.6.1"
 
 axumite = { version = "0", path = "./crates/axumite" }
 imghdr = { version = "0", path = "./crates/imghdr", features = ["serde"] }
@@ -127,9 +109,12 @@ modhost-server-core = { version = "0", path = "./crates/modhost-server-core" }
 modhost-ui = { version = "0", path = "./crates/modhost-ui" }
 parse-wiki-text-2 = { version = "0", path = "./crates/parse-wiki-text-2" }
 quickhost = { version = "0", path = "./crates/quickhost" }
-opentelemetry-appender-tracing = { version = "0.27.0" }
-opentelemetry_sdk = { version = "0.27.1", features = ["rt-tokio", "trace"] }
-opentelemetry = { version = "0.27.1" }
-axum-tracing-opentelemetry = { version = "0.25.0" }
-opentelemetry-otlp = { version = "0.27.0", features = ["tonic"] }
-tracing-opentelemetry = { version = "0.28.0" }
+opentelemetry-appender-tracing = { version = "0.29.1" }
+opentelemetry_sdk = { version = "0.29.0", features = ["rt-tokio", "trace"] }
+opentelemetry = { version = "0.29.1" }
+axum-tracing-opentelemetry = { version = "0.28.0" }
+opentelemetry-otlp = { version = "0.29.0", features = ["tonic"] }
+tracing-opentelemetry = { version = "0.30.0" }
+
+[workspace.metadata.cargo-shear]
+ignored = ["pq-sys", "openssl-sys"]

Cargo.toml

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Modern Modpacks & RedstoneWizard08
+Copyright (c) 2025 Modern Modpacks & RedstoneWizard08
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -15,19 +15,15 @@ diesel.workspace = true
 diesel-async.workspace = true
 indicatif.workspace = true
 itertools.workspace = true
-lenient_semver.workspace = true
 modhost.workspace = true
 modhost-config.workspace = true
 modhost-db.workspace = true
 modhost-search.workspace = true
 object_store.workspace = true
-reqwest.workspace = true
 ron.workspace = true
-semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 serde-this-or-that.workspace = true
 sha-1.workspace = true
 tokio.workspace = true
 tracing.workspace = true
-tracing-subscriber.workspace = true

apps/astro-migrator/Cargo.toml

@@ -10,27 +10,15 @@ readme.workspace = true
 
 [dependencies]
 anyhow.workspace = true
-axum.workspace = true
-clap.workspace = true
-clap-verbosity-flag.workspace = true
-clap_complete.workspace = true
 const_format.workspace = true
-dotenvy.workspace = true
-flate2.workspace = true
 itertools.workspace = true
 lenient_semver.workspace = true
 modhost.workspace = true
-modhost-db.workspace = true
 once_cell.workspace = true
 parse-wiki-text-2.workspace = true
 quickhost.workspace = true
 regex.workspace = true
 reqwest.workspace = true
-ron.workspace = true
-semver.workspace = true
 serde.workspace = true
 serde-xml-rs.workspace = true
-serde_json.workspace = true
-tar.workspace = true
-tokio.workspace = true
 tracing.workspace = true

apps/astro/Cargo.toml

@@ -10,29 +10,21 @@ readme.workspace = true
 
 [dependencies]
 anyhow.workspace = true
-chrono.workspace = true
 diesel.workspace = true
 diesel-async.workspace = true
 dotenvy.workspace = true
 flate2.workspace = true
 http-body-util.workspace = true
 indicatif.workspace = true
-itertools.workspace = true
-lenient_semver.workspace = true
 modhost.workspace = true
 modhost-config.workspace = true
 modhost-db.workspace = true
-modhost-search.workspace = true
 object_store.workspace = true
 octocrab.workspace = true
 reqwest.workspace = true
-ron.workspace = true
-semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-serde-this-or-that.workspace = true
 sha-1.workspace = true
 tar.workspace = true
 tokio.workspace = true
 tracing.workspace = true
-tracing-subscriber.workspace = true

apps/kjspkg-migrator/Cargo.toml

@@ -71,7 +71,7 @@ pub async fn get_manifest(
 
     match client
         .repos(owner, repo)
-        .raw_file(branch.clone(), path)
+        .raw_file(branch.clone(), &path)
         .await
     {
         Ok(resp) => {
@@ -80,8 +80,8 @@ pub async fn get_manifest(
                 let body = String::from_utf8(body.to_vec())?;
 
                 warn!(
-                    "Could not fetch '.kjspkg' from branch '{}' in repo '{}/{}': {}",
-                    branch, owner, repo, body
+                    "Could not fetch '{}' from branch '{}' in repo '{}/{}': {}",
+                    path, branch, owner, repo, body
                 );
 
                 Ok(None)

apps/kjspkg-migrator/src/fetcher.rs

@@ -40,9 +40,7 @@ pub async fn run() -> Result<()> {
     let mut added_users = HashMap::new();
 
     for (id, repo) in packages.into_iter().progress() {
-        let mut split = repo.split(&['/'][..]);
-        let owner = split.next().unwrap();
-        let mut repo = split.next().unwrap();
+        let (owner, mut repo) = repo.split_once('/').unwrap();
         let mut branch: Option<String> = None;
         let mut dir: Option<String> = None;
 

apps/kjspkg-migrator/src/migrator.rs

@@ -6,6 +6,6 @@ pub struct LegacyManifest {
     pub description: String,
     pub versions: Vec<u16>,
     pub modloaders: Vec<String>,
-    pub dependencies: Vec<String>,
-    pub incompatibilities: Vec<String>,
+    pub dependencies: Option<Vec<String>>,
+    pub incompatibilities: Option<Vec<String>>,
 }

apps/kjspkg-migrator/src/models.rs

@@ -13,9 +13,6 @@ repository.workspace = true
 glob = { workspace = true, optional = true }
 include_dir_macros.workspace = true
 
-[dev-dependencies]
-tempfile.workspace = true
-
 [features]
 default = []
 nightly = ["include_dir_macros/nightly"]