1
0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00

Set version to v1.1.0 and update dependencies

This commit is contained in:
NG (Graham)
2025-12-22 19:40:34 -05:00
parent d9f24e1859
commit 36100a34c4
6 changed files with 521 additions and 254 deletions

749
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -4,7 +4,7 @@ version.workspace = true
edition.workspace = true edition.workspace = true
[workspace.package] [workspace.package]
version = "1.0.0" version = "1.1.0"
edition = "2024" edition = "2024"
repository = "https://git.ngram.ca/OpenJam/rc-servers" repository = "https://git.ngram.ca/OpenJam/rc-servers"
license = "GPL-3.0-only" license = "GPL-3.0-only"
@@ -28,7 +28,7 @@ members = [
[workspace.dependencies] [workspace.dependencies]
rocket = { version = "0.5", features = [ "json" ] } rocket = { version = "0.5", features = [ "json" ] }
actix-web = { version = "~4.11", default-features = false, features = [ "macros", "compress-brotli", "compress-gzip", "compress-zstd"] } actix-web = { version = "4", default-features = false, features = [ "macros", "compress-brotli", "compress-gzip", "compress-zstd", "ws"] }
# actix-web 4.12 does not build properly for some reason... # actix-web 4.12 does not build properly for some reason...
actix-files = "0.6" actix-files = "0.6"
libfj = { version = "0.9", path = "../libfj" } libfj = { version = "0.9", path = "../libfj" }

View File

@@ -14,7 +14,7 @@ clap.workspace = true
log.workspace = true log.workspace = true
env_logger.workspace = true env_logger.workspace = true
tokio = { version = "1.43", features = [ "rt-multi-thread" ] } tokio = { version = "1.43", features = [ "rt-multi-thread" ] }
zip = "6" zip = "7"
git-version.workspace = true git-version.workspace = true
oj_rc_core = { version = "*", path = "../rc_core" } oj_rc_core = { version = "*", path = "../rc_core" }

View File

@@ -24,4 +24,4 @@ serde_json.workspace = true
hex.workspace = true hex.workspace = true
oj_serdes.workspace = true oj_serdes.workspace = true
handlebars = { version = "5", features = ["dir_source"] } handlebars = { version = "6", features = ["dir_source"] }

View File

@@ -35,18 +35,18 @@ async fn main() -> std::io::Result<()> {
let internal_auth = actix_web::web::Data::new(crate::robocraft::intercom::IntercomAuth::new(&cli_args.data_robocraft)?); let internal_auth = actix_web::web::Data::new(crate::robocraft::intercom::IntercomAuth::new(&cli_args.data_robocraft)?);
let user_registry = actix_web::web::Data::new(crate::robocraft::intercom::Users::new()); let user_registry = actix_web::web::Data::new(crate::robocraft::intercom::Users::new());
let mut handlebars = handlebars::Handlebars::new(); let mut handlebars_conf = handlebars::Handlebars::new();
handlebars let mut dir_conf = handlebars::DirectorySourceOptions::default();
dir_conf.tpl_extension = ".html.hbs".to_owned();
dir_conf.hidden = false;
dir_conf.temporary = false;
handlebars_conf
.register_templates_directory( .register_templates_directory(
std::path::PathBuf::from(&cli_args.assets_robocraft).parent().expect("Bad robocraft asset path").join("templates"), std::path::PathBuf::from(&cli_args.assets_robocraft).parent().expect("Bad robocraft asset path").join("templates"),
handlebars::DirectorySourceOptions { dir_conf,
tpl_extension: ".html.hbs".to_owned(),
hidden: false,
temporary: false,
},
) )
.unwrap(); .unwrap();
let handlebars_ref = actix_web::web::Data::new(handlebars); let handlebars_ref = actix_web::web::Data::new(handlebars_conf);
HttpServer::new(move || { HttpServer::new(move || {
App::new() App::new()

View File

@@ -25,7 +25,7 @@ indexmap = { version = "2.0", features = ["serde"] }
# auth # auth
libfj.workspace = true libfj.workspace = true
jsonwebtoken = "9" jsonwebtoken = { version = "10", features = [ "rust_crypto" ] }
argon2 = { version = "0.5", features = [ "std" ] } argon2 = { version = "0.5", features = [ "std" ] }
# intercom # intercom