From 4b90986855313c2cf8b8ef950ef0c28d13ab9223 Mon Sep 17 00:00:00 2001 From: larzie Date: Mon, 9 Dec 2024 15:31:47 +0300 Subject: [PATCH 01/16] Update --- server/central/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/central/Cargo.toml b/server/central/Cargo.toml index 0ba91484..d8d0fa38 100644 --- a/server/central/Cargo.toml +++ b/server/central/Cargo.toml @@ -22,5 +22,5 @@ sqlx = { version = "^0.7.0", features = [ # TODO: rocket_db_pools is broken in s "runtime-tokio-rustls", ] } rocket_cors = "0.6.0" -const_format = "0.2.33" +const_format = "0.2.34" hex = "0.4.3" From 7d22b9b81b7c7cd0bd8d7863332bab385651ba8d Mon Sep 17 00:00:00 2001 From: larzie Date: Mon, 9 Dec 2024 15:33:11 +0300 Subject: [PATCH 02/16] Update From ae6afae15dcc54cd67401210c5ef2168fb93d870 Mon Sep 17 00:00:00 2001 From: larzie Date: Mon, 9 Dec 2024 15:35:10 +0300 Subject: [PATCH 03/16] Update --- server/game/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/server/game/Cargo.toml b/server/game/Cargo.toml index ddac9fce..71aecebe 100644 --- a/server/game/Cargo.toml +++ b/server/game/Cargo.toml @@ -20,6 +20,7 @@ console-subscriber = { version = "0.4.1", features = ["parking_lot"] } # "full", # "tracing", # ], optional = true } + tokio = { version = "1.42.0", features = ["full"], optional = true } aho-corasick = "1.1.3" From db10769da481082e40f4c7f55768d6eb8767a7cc Mon Sep 17 00:00:00 2001 From: larzie Date: Mon, 9 Dec 2024 15:35:37 +0300 Subject: [PATCH 04/16] Update --- server/observer/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/server/observer/Cargo.toml b/server/observer/Cargo.toml index 00332dc3..c82e1981 100644 --- a/server/observer/Cargo.toml +++ b/server/observer/Cargo.toml @@ -8,4 +8,5 @@ globed-shared = { path = "../shared" } globed-derive = { path = "../derive" } observer-shared = { path = "../observer-shared" } esp = { path = "../esp" } + egui = "0.29.1" From a5403c7985c9af836226b036a9b2b0e9d424ae28 Mon Sep 17 00:00:00 2001 From: larzie Date: Mon, 9 Dec 2024 15:38:19 +0300 Subject: [PATCH 05/16] Update From 153011ea2d86af105aaf672ab6f2759a37d7e80d Mon Sep 17 00:00:00 2001 From: larzie Date: Mon, 9 Dec 2024 15:38:59 +0300 Subject: [PATCH 06/16] Update --- llgvis/Cargo.toml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/llgvis/Cargo.toml b/llgvis/Cargo.toml index 0c79dc47..30ebe91e 100644 --- a/llgvis/Cargo.toml +++ b/llgvis/Cargo.toml @@ -1,11 +1,10 @@ [package] name = "llgvis" version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +edition = "2024" [dependencies] esp = { path = "../server/esp" } globed-derive = { path = "../server/derive" } -plotters = "0.3.5" + +plotters = "0.3.7" From 8ea5156d5f1da2298335ad29d522dc05d4c90ea8 Mon Sep 17 00:00:00 2001 From: larzie Date: Mon, 9 Dec 2024 15:41:19 +0300 Subject: [PATCH 07/16] Update license --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 1627d546..dbf86407 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 dank_meme +Copyright (c) 2024 dankmeme01 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From d09cd3636c270f3fa0268d0c46e110126e4f75f7 Mon Sep 17 00:00:00 2001 From: larzie Date: Mon, 9 Dec 2024 15:46:23 +0300 Subject: [PATCH 08/16] Move this on top --- .github/workflows/server.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index a2756d0a..4c7578ce 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -11,6 +11,11 @@ jobs: strategy: matrix: include: + - name: Windows + os: windows-latest + target: x86_64-pc-windows-msvc + bin-suffix: ".exe" + - name: Linux os: ubuntu-latest target: x86_64-unknown-linux-gnu @@ -21,11 +26,6 @@ jobs: target: aarch64-unknown-linux-gnu bin-suffix: "-arm64" - - name: Windows - os: windows-latest - target: x86_64-pc-windows-msvc - bin-suffix: ".exe" - steps: - name: Checkout repository uses: actions/checkout@v4 From 819fd3f6aed2514aa30b95f45913f9e40398cc38 Mon Sep 17 00:00:00 2001 From: larzie Date: Wed, 11 Dec 2024 18:18:17 +0300 Subject: [PATCH 09/16] Update From 3d2b3e3a352dd1934ec3b88d9e71e014e1cb7af3 Mon Sep 17 00:00:00 2001 From: larzie Date: Wed, 11 Dec 2024 18:30:10 +0300 Subject: [PATCH 10/16] Use latest version --- llgvis/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llgvis/Cargo.toml b/llgvis/Cargo.toml index 30ebe91e..bb6e5ae2 100644 --- a/llgvis/Cargo.toml +++ b/llgvis/Cargo.toml @@ -7,4 +7,4 @@ edition = "2024" esp = { path = "../server/esp" } globed-derive = { path = "../server/derive" } -plotters = "0.3.7" +plotters = "*" From b3a4ee2fa837265b52aba9e04f8ac2e7788c7187 Mon Sep 17 00:00:00 2001 From: larzie Date: Wed, 11 Dec 2024 18:30:51 +0300 Subject: [PATCH 11/16] Use latest version --- server/central/Cargo.toml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/server/central/Cargo.toml b/server/central/Cargo.toml index d8d0fa38..1fc063f2 100644 --- a/server/central/Cargo.toml +++ b/server/central/Cargo.toml @@ -6,21 +6,21 @@ edition = "2024" [dependencies] globed-shared = { path = "../shared" } -async-watcher = "0.3.0" -blake2 = "0.11.0-pre.4" -digest = "0.11.0-pre.9" -ipnet = "2.10.1" -iprange = "0.6.7" -serde = { version = "1.0.215", features = ["serde_derive"] } -serde_json = "1.0.133" -tokio = { version = "1.42.0", features = ["full"] } -json_comments = "0.2.2" -rocket = { version = "0.5.1", features = ["json"] } -rocket_db_pools = { version = "0.2.0", features = ["sqlx_sqlite"] } +async-watcher = "*" +blake2 = "*" +digest = "*" +ipnet = "*" +iprange = "*" +serde = { version = "*", features = ["serde_derive"] } +serde_json = "*" +tokio = { version = "*", features = ["full"] } +json_comments = "*" +rocket = { version = "*", features = ["json"] } +rocket_db_pools = { version = "*", features = ["sqlx_sqlite"] } sqlx = { version = "^0.7.0", features = [ # TODO: rocket_db_pools is broken in sqlx 0.8.x "migrate", "runtime-tokio-rustls", ] } -rocket_cors = "0.6.0" -const_format = "0.2.34" -hex = "0.4.3" +rocket_cors = "*" +const_format = "*" +hex = "*" From f6e9197e4d34fcd8eab8c0c2cc52d3a6cbcba37a Mon Sep 17 00:00:00 2001 From: larzie Date: Wed, 11 Dec 2024 18:31:10 +0300 Subject: [PATCH 12/16] Use latest --- server/derive/Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/derive/Cargo.toml b/server/derive/Cargo.toml index 68a45441..4066c9b6 100644 --- a/server/derive/Cargo.toml +++ b/server/derive/Cargo.toml @@ -7,7 +7,7 @@ edition = "2024" proc-macro = true [dependencies] -darling = "0.20.10" -proc-macro2 = "1.0.92" -quote = "1.0.37" -syn = { version = "2.0.90", features = ["full"] } +darling = "*" +proc-macro2 = "*" +quote = "*" +syn = { version = "*", features = ["full"] } From 2ba589a975d1bd8c6274ef7a6552ed479c8ff49e Mon Sep 17 00:00:00 2001 From: larzie Date: Wed, 11 Dec 2024 18:31:29 +0300 Subject: [PATCH 13/16] Use latest version --- server/esp/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/esp/Cargo.toml b/server/esp/Cargo.toml index 6a034725..3f0eedfe 100644 --- a/server/esp/Cargo.toml +++ b/server/esp/Cargo.toml @@ -4,9 +4,9 @@ version = "1.0.0" edition = "2024" [dependencies] -simd-adler32 = { version = "0.3.7", default-features = false } -bytebuffer = "2.3.0" -crc32fast = "1.4.2" +simd-adler32 = { version = "*", default-features = false } +bytebuffer = "*" +crc32fast = "*" [dev-dependencies] globed-derive = { path = "../derive" } From a248c5f10318c2eca68865dde0b8949cccd46885 Mon Sep 17 00:00:00 2001 From: larzie Date: Wed, 11 Dec 2024 18:32:12 +0300 Subject: [PATCH 14/16] Use latest version set --- server/game/Cargo.toml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/server/game/Cargo.toml b/server/game/Cargo.toml index 71aecebe..0df765f6 100644 --- a/server/game/Cargo.toml +++ b/server/game/Cargo.toml @@ -8,24 +8,24 @@ globed-shared = { path = "../shared" } globed-derive = { path = "../derive" } esp = { path = "../esp" } -alloca = "0.4.0" -ctrlc = "3.4.5" -rustc-hash = "2.1.0" -serde = { version = "1.0.215", features = ["serde_derive"] } -serde_json = "1.0.133" -futures-util = "0.3.31" -console-subscriber = { version = "0.4.1", features = ["parking_lot"] } - -# tokio_tracing = { package = "tokio", version = "1.42.0", features = [ +alloca = "*" +ctrlc = "*" +rustc-hash = "*" +serde = { version = "*", features = ["serde_derive"] } +serde_json = "*" +futures-util = "*" +console-subscriber = { version = "*", features = ["parking_lot"] } + +# tokio_tracing = { package = "tokio", version = "*", features = [ # "full", # "tracing", # ], optional = true } -tokio = { version = "1.42.0", features = ["full"], optional = true } -aho-corasick = "1.1.3" +tokio = { version = "*", features = ["full"], optional = true } +aho-corasick = "*" [dev-dependencies] -criterion = "0.5.1" +criterion = "*" [[bench]] name = "globed-bench" From 09860e6438b8a9cf4901266d24f2350cb573e90f Mon Sep 17 00:00:00 2001 From: larzie Date: Wed, 11 Dec 2024 18:32:25 +0300 Subject: [PATCH 15/16] Use latest --- server/observer/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/observer/Cargo.toml b/server/observer/Cargo.toml index c82e1981..8f32d3cd 100644 --- a/server/observer/Cargo.toml +++ b/server/observer/Cargo.toml @@ -9,4 +9,4 @@ globed-derive = { path = "../derive" } observer-shared = { path = "../observer-shared" } esp = { path = "../esp" } -egui = "0.29.1" +egui = "*" From a6bffcd4fbd9e82f1f557f808c4342538fcc6541 Mon Sep 17 00:00:00 2001 From: larzie Date: Wed, 11 Dec 2024 18:33:04 +0300 Subject: [PATCH 16/16] Update :3 --- server/shared/Cargo.toml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/server/shared/Cargo.toml b/server/shared/Cargo.toml index eb9bf1f9..9dd59938 100644 --- a/server/shared/Cargo.toml +++ b/server/shared/Cargo.toml @@ -7,21 +7,21 @@ edition = "2024" esp = { path = "../esp" } globed-derive = { path = "../derive" } -anyhow = "1.0.94" -base64 = "0.22.1" -colored = "2.1.0" -crypto_box = { version = "0.9.1", features = ["std", "chacha20"] } -hmac = "0.13.0-pre.4" -log = "0.4.22" -nohash-hasher = "0.2.0" -parking_lot = "0.12.3" -rand = "0.9.0-beta.1" -reqwest = { version = "0.12.9", default-features = false, features = [ +anyhow = "*" +base64 = "*" +colored = "*" +crypto_box = { version = "*", features = ["std", "chacha20"] } +hmac = "*" +log = "*" +nohash-hasher = "*" +parking_lot = "*" +rand = "*" +reqwest = { version = "*", default-features = false, features = [ "rustls-tls", ] } -sha2 = "0.11.0-pre.4" -time = { version = "0.3.37", features = ["formatting"] } -serde = { version = "1.0.215", features = ["derive"] } -crypto_secretbox = { version = "0.1.1", features = ["chacha20"] } -serde_json = "1.0.133" -argon2 = "0.6.0-pre.1" +sha2 = "*" +time = { version = "*", features = ["formatting"] } +serde = { version = "*", features = ["derive"] } +crypto_secretbox = { version = "*", features = ["chacha20"] } +serde_json = "*" +argon2 = "*"