Merge remote-tracking branch 'origin/master' into kim/log-access

clockworklabs · Sep 5, 2023 · dec9b93 · dec9b93
2 parents 810eab6 + a1e9984
commit dec9b93
Show file tree

Hide file tree

Showing 68 changed files with 2,341 additions and 373 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -17,6 +17,7 @@ bench = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+spacetimedb-core = { path = "../core", version = "0.6.0" }
 spacetimedb-lib = { path = "../lib", version = "0.6.1", features = ["cli"] }
 spacetimedb-standalone = { path = "../standalone", version = "0.6.1", optional = true }
 
@@ -32,6 +33,7 @@ email_address.workspace = true
 futures.workspace = true
 is-terminal.workspace = true
 itertools.workspace = true
+jsonwebtoken.workspace = true
 reqwest.workspace = true
 rustyline.workspace = true
 serde = { workspace = true, features = ["derive"] }