diff --git a/Cargo.lock b/Cargo.lock index a46ab16..4eeb354 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1042,7 +1042,7 @@ dependencies = [ "syslog", "termios", "tokio", - "toml 0.8.9", + "toml", "vte", "yansi", ] @@ -1070,7 +1070,7 @@ dependencies = [ "serde", "stderrlog", "test-generator", - "toml 0.5.11", + "toml", ] [[package]] @@ -1404,15 +1404,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - [[package]] name = "toml" version = "0.8.9" diff --git a/Cargo.toml b/Cargo.toml index 35c138c..fb1399f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,17 @@ [workspace] resolver = "2" members = ["runtime", "shell", "stdlib", "syntax"] +default-members = ["shell"] + +[workspace.package] +version = "0.2.0" +authors = ["Stephen M. Coakley "] +license = "MIT" +edition = "2021" + +# Dependency versions used by multiple crates. +[workspace.dependencies] +log = "0.4" +scopeguard = "1.2" +serde = "1" +tokio = "1.2" diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 2cc12a6..a61ceae 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -1,19 +1,21 @@ [package] name = "riptide-runtime" -version = "0.2.0" -authors = ["Stephen M. Coakley "] description = "The Riptide programming language interpreter" -edition = "2021" rust-version = "1.70.0" +version.workspace = true +authors.workspace = true +license.workspace = true +edition.workspace = true [dependencies] async-recursion = "1.0" bstr = "1.9" directories = "3.0" futures = "0.3" -log = "0.4" +log.workspace = true regex = "1.10" -scopeguard = "1.2" +riptide-syntax.path = "../syntax" +scopeguard.workspace = true tokio-pipe = "0.2" [dependencies.gc] @@ -24,11 +26,8 @@ features = ["derive"] version = "0.27" features = ["fs", "process"] -[dependencies.riptide-syntax] -path = "../syntax" - [dependencies.tokio] -version = "1.2" +workspace = true features = [ "fs", "io-std", diff --git a/shell/Cargo.toml b/shell/Cargo.toml index 6f58e0d..3751f5e 100644 --- a/shell/Cargo.toml +++ b/shell/Cargo.toml @@ -1,9 +1,10 @@ [package] name = "riptide-shell" -version = "0.2.0" -authors = ["Stephen M. Coakley "] description = "The Riptide programming language interpreter" -edition = "2021" +version.workspace = true +authors.workspace = true +license.workspace = true +edition.workspace = true [dependencies] clipboard = "0.5" @@ -11,7 +12,9 @@ directories = "3.0" exitcode = "1.1" flume = "0.11" futures = "0.3" -scopeguard = "1.2" +riptide-runtime.path = "../runtime" +riptide-stdlib.path = "../stdlib" +scopeguard.workspace = true syslog = "6" toml = "0.8" yansi = "0.5" @@ -21,29 +24,23 @@ version = "4.4" features = ["derive"] [dependencies.log] -version = "0.4" +workspace = true features = ["std"] [dependencies.log-panics] version = "2.1" features = ["with-backtrace"] -[dependencies.riptide-runtime] -path = "../runtime" - -[dependencies.riptide-stdlib] -path = "../stdlib" - [dependencies.rusqlite] version = "0.25" features = ["bundled"] [dependencies.serde] -version = "1" +workspace = true features = ["derive"] [dependencies.tokio] -version = "1.2" +workspace = true features = [ "io-util", "process", diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml index 9f202cd..50a7dc3 100644 --- a/stdlib/Cargo.toml +++ b/stdlib/Cargo.toml @@ -1,19 +1,18 @@ [package] name = "riptide-stdlib" -version = "0.2.0" -authors = ["Stephen M. Coakley "] description = "The Riptide standard library" -edition = "2021" +version.workspace = true +authors.workspace = true +license.workspace = true +edition.workspace = true [dependencies] glob = "0.3" -log = "0.4" - -[dependencies.riptide-runtime] -path = "../runtime" +log.workspace = true +riptide-runtime.path = "../runtime" [dependencies.tokio] -version = "1.2" +workspace = true features = [ "fs", "io-util", diff --git a/syntax/Cargo.toml b/syntax/Cargo.toml index cf49c1e..f7a3c23 100644 --- a/syntax/Cargo.toml +++ b/syntax/Cargo.toml @@ -1,9 +1,10 @@ [package] name = "riptide-syntax" -version = "0.2.0" -authors = ["Stephen M. Coakley "] description = "The Riptide language parser" -edition = "2021" +version.workspace = true +authors.workspace = true +license.workspace = true +edition.workspace = true [dependencies] pest = "2.7" @@ -13,11 +14,11 @@ regex-syntax = "0.8" [dev-dependencies] difference = "2.0" glob = "0.3" -log = "0.4" +log.workspace = true stderrlog = "0.6" test-generator = "0.3" -toml = "0.5" +toml = "0.8" [dev-dependencies.serde] -version = "1" +workspace = true features = ["derive"]