Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add rust-version to Cargo.toml #802

Merged
merged 2 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,28 @@ rpath = false
[profile.bench]
debug = true

[workspace.package]
version = "0.8.1"
edition = "2021"
# update rust-toolchain.toml too!
rust-version = "1.74.0"

[workspace.dependencies]
spacetimedb = { path = "crates/bindings", version = "0.8.1" }
spacetimedb-bindings-macro = { path = "crates/bindings-macro", version = "0.8.1" }
spacetimedb-bindings-sys = { path = "crates/bindings-sys", version = "0.8.1" }
spacetimedb-cli = { path = "crates/cli", version = "0.8.1" }
spacetimedb-client-api = { path = "crates/client-api", version = "0.8.1" }
spacetimedb-client-api-messages = { path = "crates/client-api-messages", version = "0.8.1" }
spacetimedb-core = { path = "crates/core", version = "0.8.1" }
spacetimedb-lib = { path = "crates/lib", default-features = false, version = "0.8.1" }
spacetimedb-metrics = { path = "crates/metrics", version = "0.8.1" }
spacetimedb-primitives = { path = "crates/primitives", version = "0.8.1" }
spacetimedb-sats = { path = "crates/sats", version = "0.8.1" }
spacetimedb-standalone = { path = "crates/standalone", version = "0.8.1" }
spacetimedb-table = { path = "crates/table", version = "0.8.1" }
spacetimedb-vm = { path = "crates/vm", version = "0.8.1" }

ahash = "0.8"
anyhow = { version = "1.0.68", features = ["backtrace"] }
anymap = "0.12"
Expand Down
4 changes: 2 additions & 2 deletions crates/bench/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "spacetimedb-bench"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
license-file = "LICENSE"
description = "Bench library/utility for SpacetimeDB"

Expand Down
7 changes: 4 additions & 3 deletions crates/bindings-macro/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
[package]
name = "spacetimedb-bindings-macro"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
license-file = "LICENSE"
description = "Easy support for interacting between SpacetimeDB and Rust."
rust-version.workspace = true

[lib]
proc-macro = true
# Benching off, because of https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options
bench = false

[dependencies]
spacetimedb-primitives = { path = "../primitives", version = "0.8.1" }
spacetimedb-primitives.workspace = true

bitflags.workspace = true
humantime.workspace = true
Expand Down
7 changes: 4 additions & 3 deletions crates/bindings-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
[package]
name = "spacetimedb-bindings-sys"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
license-file = "LICENSE"
description = "Easy support for interacting between SpacetimeDB and Rust."
rust-version.workspace = true

[lib]
# Benching off, because of https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options
bench = false

[dependencies]
getrandom = {workspace = true, optional = true}
spacetimedb-primitives = { path = "../primitives", version = "0.8.1" }
spacetimedb-primitives.workspace = true
13 changes: 7 additions & 6 deletions crates/bindings/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[package]
name = "spacetimedb"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
license-file = "LICENSE"
description = "Easy support for interacting between SpacetimeDB and Rust."
rust-version.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib]
Expand All @@ -16,10 +17,10 @@ bench = false
getrandom = ["spacetimedb-bindings-sys/getrandom"]

[dependencies]
spacetimedb-bindings-sys = { path = "../bindings-sys", version = "0.8.1" }
spacetimedb-lib = { path = "../lib", default-features = false, version = "0.8.1"}
spacetimedb-bindings-macro = { path = "../bindings-macro", version = "0.8.1"}
spacetimedb-primitives = { path = "../primitives", version = "0.8.1" }
spacetimedb-bindings-sys.workspace = true
spacetimedb-lib.workspace = true
spacetimedb-bindings-macro.workspace = true
spacetimedb-primitives.workspace = true

derive_more.workspace = true
log.workspace = true
Expand Down
13 changes: 7 additions & 6 deletions crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[package]
name = "spacetimedb-cli"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
license-file = "LICENSE"
description = "A command line interface for SpacetimeDB"
rust-version.workspace = true

[lib]
bench = false
Expand All @@ -17,10 +18,10 @@ bench = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
spacetimedb-primitives = { path = "../primitives", version = "0.8.1" }
spacetimedb-core = { path = "../core", version = "0.8.1" }
spacetimedb-lib = { path = "../lib", version = "0.8.1", features = ["cli"] }
spacetimedb-standalone = { path = "../standalone", version = "0.8.1", optional = true }
spacetimedb-primitives.workspace = true
spacetimedb-core.workspace = true
spacetimedb-lib = { workspace = true, features = ["cli"] }
spacetimedb-standalone = { workspace = true, optional = true }

anyhow.workspace = true
base64.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/client-api-messages/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "spacetimedb-client-api-messages"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
license-file = "LICENSE"
description = "Types for the SpacetimeDB client API messages"

Expand Down
9 changes: 5 additions & 4 deletions crates/client-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
[package]
name = "spacetimedb-client-api"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
license-file = "LICENSE"
description = "The HTTP API for SpacetimeDB"

[dependencies]
spacetimedb-core = { path = "../core", version = "0.8.1" }
spacetimedb-core.workspace = true
spacetimedb-lib = { workspace = true, features = ["serde"] }

tokio = { version = "1.2", features = ["full"] }
lazy_static = "1.4.0"
spacetimedb-lib = { path = "../lib", version = "0.8.1" }
log = "0.4.4"
serde = "1.0.136"
serde_json = { version = "1.0", features = ["raw_value"] }
Expand Down
19 changes: 10 additions & 9 deletions crates/core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[package]
name = "spacetimedb-core"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
license-file = "LICENSE"
description = "The core library for SpacetimeDB"
rust-version.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib]
Expand All @@ -18,13 +19,13 @@ name = "odb_flavor_bench"
harness = false

[dependencies]
spacetimedb-lib = { path = "../lib", version = "0.8.1" }
spacetimedb-client-api-messages = { path = "../client-api-messages", version = "0.8.1" }
spacetimedb-metrics = { path = "../metrics", version = "0.8.1" }
spacetimedb-primitives = { path = "../primitives", version = "0.8.1" }
spacetimedb-sats = { path = "../sats", version = "0.8.1" }
spacetimedb-table = { path = "../table", version = "0.8.1" }
spacetimedb-vm = { path = "../vm", version = "0.8.1" }
spacetimedb-lib.workspace = true
spacetimedb-client-api-messages.workspace = true
spacetimedb-metrics.workspace = true
spacetimedb-primitives.workspace = true
spacetimedb-sats.workspace = true
spacetimedb-table.workspace = true
spacetimedb-vm.workspace = true

anyhow.workspace = true
async-trait.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/data-structures/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "spacetimedb-data-structures"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
license-file = "LICENSE"
description = "Assorted data structures used in spacetimedb"

Expand Down
13 changes: 7 additions & 6 deletions crates/lib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[package]
name = "spacetimedb-lib"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
license-file = "LICENSE"
description = "A common library for SpacetimeDB"
rust-version.workspace = true

[lib]
# Benching off, because of https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options
Expand All @@ -21,10 +22,10 @@ cli = ["clap"]
proptest = ["dep:proptest", "dep:proptest-derive"]

[dependencies]
spacetimedb-bindings-macro = { path = "../bindings-macro", version = "0.8.1" }
spacetimedb-sats = { path = "../sats", version = "0.8.1" }
spacetimedb-primitives = { path = "../primitives", version = "0.8.1" }
spacetimedb-metrics = { path = "../metrics", version = "0.8.1" }
spacetimedb-bindings-macro.workspace = true
spacetimedb-sats.workspace = true
spacetimedb-primitives.workspace = true
spacetimedb-metrics.workspace = true

anyhow.workspace = true
bitflags.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/metrics/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "spacetimedb-metrics"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
license-file = "LICENSE"
description = "Prometheus utilities for SpacetimeDB"

Expand Down
4 changes: 2 additions & 2 deletions crates/primitives/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "spacetimedb-primitives"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
license-file = "LICENSE"
description = "Primitives such as TableId and ColumnIndexAttribute"

Expand Down
10 changes: 5 additions & 5 deletions crates/sats/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "spacetimedb-sats"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
license-file = "LICENSE"
description = "Spacetime Algebraic Type Notation"

Expand All @@ -13,9 +13,9 @@ serde = ["dep:serde"]
proptest = ["dep:proptest", "dep:proptest-derive"]

[dependencies]
spacetimedb-bindings-macro = { path = "../bindings-macro", version = "0.8.1" }
spacetimedb-primitives = { path = "../primitives", version = "0.8.1" }
spacetimedb-metrics = { path = "../metrics", version = "0.8.1" }
spacetimedb-bindings-macro.workspace = true
spacetimedb-primitives.workspace = true
spacetimedb-metrics.workspace = true

arrayvec.workspace = true
bitflags.workspace = true
Expand Down
10 changes: 5 additions & 5 deletions crates/sdk/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[package]
name = "spacetimedb-sdk"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
license-file = "LICENSE"
description = "A Rust SDK for clients to interface with SpacetimeDB"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
spacetimedb-sats = { path = "../sats", version = "0.8.1" }
spacetimedb-lib = { path = "../lib", version = "0.8.1" }
spacetimedb-client-api-messages = { path = "../client-api-messages", version = "0.8.1" }
spacetimedb-sats.workspace = true
spacetimedb-lib = { workspace = true, features = ["serde"]}
spacetimedb-client-api-messages.workspace = true

anyhow.workspace = true
anymap.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/sdk/tests/connect_disconnect_client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "connect_disconnect_client"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 2 additions & 2 deletions crates/sdk/tests/test-client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "test-client"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 2 additions & 2 deletions crates/sdk/tests/test-counter/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "test-counter"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 2 additions & 2 deletions crates/sqltest/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "sqltest"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
description = "Sql integration test for SpacetimeDB"

[dependencies]
Expand Down
10 changes: 5 additions & 5 deletions crates/standalone/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "spacetimedb-standalone"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
license-file = "LICENSE"
description = "An executable for running a single SpacetimeDB standalone instance"

Expand All @@ -17,9 +17,9 @@ harness = true # Use libtest harness.
required-features = [] # Features required to build this target (N/A for lib)

[dependencies]
spacetimedb-core = { path = "../core", version = "0.8.1" }
spacetimedb-lib = { path = "../lib", version = "0.8.1", features = ["cli"] }
spacetimedb-client-api = { path = "../client-api", version = "0.8.1" }
spacetimedb-core.workspace = true
spacetimedb-lib = { workspace = true, features = ["cli"] }
spacetimedb-client-api.workspace = true

anyhow.workspace = true
async-trait.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/table/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "spacetimedb-table"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true
license-file = "LICENSE"
description = "A database Table implementation and friends"

Expand Down
14 changes: 7 additions & 7 deletions crates/testing/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "spacetimedb-testing"
version = "0.8.1"
edition = "2021"
version.workspace = true
edition.workspace = true

[dependencies]
spacetimedb-cli = { path = "../cli", version = "0.8.1" }
spacetimedb-lib = { path = "../lib", version = "0.8.1" }
spacetimedb-core = { path = "../core", version = "0.8.1" }
spacetimedb-standalone = { path = "../standalone", version = "0.8.1" }
spacetimedb-client-api = { path = "../client-api", version = "0.8.1" }
spacetimedb-cli.workspace = true
spacetimedb-lib.workspace = true
spacetimedb-core.workspace = true
spacetimedb-standalone.workspace = true
spacetimedb-client-api.workspace = true

anyhow.workspace = true
env_logger.workspace = true
Expand Down
Loading
Loading