diff --git a/Cargo.lock b/Cargo.lock index b6c11b1..4e7f4c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -239,7 +239,6 @@ dependencies = [ "diamond-types", "jni", "jni-toolbox", - "lazy_static", "mlua", "napi", "napi-build", @@ -247,7 +246,7 @@ dependencies = [ "pyo3", "pyo3-build-config", "serde", - "thiserror", + "thiserror 2.0.11", "tokio", "tokio-stream", "tonic", @@ -755,7 +754,7 @@ dependencies = [ "jni-sys", "libloading 0.7.4", "log", - "thiserror", + "thiserror 1.0.69", "walkdir", "windows-sys 0.45.0", ] @@ -1735,9 +1734,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.16.0" +version = "3.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" +checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230" dependencies = [ "cfg-if", "fastrand", @@ -1753,7 +1752,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +dependencies = [ + "thiserror-impl 2.0.11", ] [[package]] @@ -1767,6 +1775,17 @@ dependencies = [ "syn 2.0.98", ] +[[package]] +name = "thiserror-impl" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.98", +] + [[package]] name = "thread_local" version = "1.1.8" @@ -2053,9 +2072,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "uuid" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0" +checksum = "8c1f41ffb7cf259f1ecc2876861a17e7142e63ead296f671f81f6ae85903e0d6" dependencies = [ "getrandom 0.3.1", "serde", diff --git a/Cargo.toml b/Cargo.toml index 026e48a..57cc328 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,15 +21,15 @@ crate-type = ["cdylib", "rlib"] [dependencies] # core tracing = "0.1" -thiserror = "1.0" +thiserror = "2.0" # crdt diamond-types = "1.0" # proto codemp-proto = "0.7" -uuid = { version = "1.10", features = ["v4"] } +uuid = { version = "1.13", features = ["v4"] } tonic = { version = "0.12", features = ["tls", "tls-roots"] } # api -tokio = { version = "1.40", features = ["macros", "rt-multi-thread", "sync"] } +tokio = { version = "1.43", features = ["macros", "rt-multi-thread", "sync"] } xxhash-rust = { version = "0.8", features = ["xxh3"] } # client tokio-stream = "0.1" @@ -39,7 +39,6 @@ dashmap = "6.1" tracing-subscriber = { version = "0.3", optional = true } # glue (java) -lazy_static = { version = "1.5", optional = true } jni = { version = "0.21", features = ["invocation"], optional = true } jni-toolbox = { version = "0.2", optional = true, features = ["uuid"] } @@ -71,10 +70,10 @@ serialize = ["dep:serde", "uuid/serde"] # special tests which require more setup test-e2e = [] # ffi -java = ["dep:lazy_static", "dep:jni", "dep:tracing-subscriber", "dep:jni-toolbox"] +java = ["dep:jni", "dep:tracing-subscriber", "dep:jni-toolbox"] js = ["dep:napi-build", "dep:tracing-subscriber", "dep:napi", "dep:napi-derive"] py = ["dep:pyo3", "dep:tracing-subscriber", "dep:pyo3-build-config"] -lua = ["serialize", "dep:mlua", "dep:tracing-subscriber", "dep:lazy_static"] +lua = ["serialize", "dep:mlua", "dep:tracing-subscriber"] # ffi variants lua-jit = ["mlua?/luajit"] lua-54 = ["mlua?/lua54"]