Updates dependencies to use Cargo workspace

Updates any common dependencies across the workspace to use the cargo workspaces dependency feature. Also uses the workspace rust edition feature. Signed-off-by: Jess Bowers <58604+jessbowers@users.noreply.github.com>
jsontypedef · Oct 26, 2023 · b727aa6 · b727aa6
1 parent a42555d
commit b727aa6
Show file tree

Hide file tree

Showing 13 changed files with 66 additions and 54 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,2 +1,14 @@
+[workspace.package]
+version = "0.4.1"
+edition = "2018"
+authors = ["Ulysse Carion <ulysse@segment.com>"]
+
 [workspace]
 members = ["crates/*"]
+
+[workspace.dependencies]
+jtd = "0.2.1"
+serde_json = "1.0"
+lazy_static = "1.4.0"
+jtd-codegen = { path = "./crates/core" }
+jtd_codegen_test = { path = "./crates/test" }
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "jtd_codegen_cli"
-version = "0.4.1"
-authors = ["Ulysse Carion <ulysse@segment.com>"]
-edition = "2018"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
 
 [[bin]]
 name = "jtd-codegen"
 path = "src/main.rs"
 
 [dependencies]
-jtd-codegen = { path = "../core" }
+jtd-codegen.workspace = true
 jtd_codegen_target_csharp_system_text = { path = "../target_csharp_system_text" }
 jtd_codegen_target_go = { path = "../target_go" }
 jtd_codegen_target_java_jackson = { path = "../target_java_jackson" }
@@ -19,8 +19,8 @@ jtd_codegen_target_ruby_sig = { path = "../target_ruby_sig" }
 jtd_codegen_target_rust = { path = "../target_rust" }
 jtd_codegen_target_typescript = { path = "../target_typescript" }
 serde = "1.0"
-serde_json = "1.0"
-jtd = "0.2.1"
+serde_json.workspace = true
+jtd.workspace = true
 clap = { version = "2.33.3", features = ["yaml"] }
 colored = "2.0.0"
 anyhow = "1.0"
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -2,13 +2,13 @@
 name = "jtd-codegen"
 version = "0.1.0"
 authors = ["Ulysse Carion <ulysse@segment.com>"]
-edition = "2018"
+edition.workspace = true
 description = "A framework for generating code from JSON Typedef schemas"
 license = "MIT"
 
 [dependencies]
 thiserror = "1.0.22"
 teeter_inflector = { version = "0.11.4", package = "Inflector" }
-jtd = "0.2.1"
-serde_json = "1.0"
+jtd.workspace = true
+serde_json.workspace = true
 textwrap = "0.13"
diff --git a/crates/target_csharp_system_text/Cargo.toml b/crates/target_csharp_system_text/Cargo.toml
@@ -2,12 +2,12 @@
 name = "jtd_codegen_target_csharp_system_text"
 version = "0.2.1"
 authors = ["Ulysse Carion <ulysse@segment.com>"]
-edition = "2018"
+edition.workspace = true
 
 [dependencies]
-jtd-codegen = { path = "../core" }
-lazy_static = "1.4.0"
-serde_json = "1.0"
+jtd-codegen.workspace = true
+lazy_static.workspace = true
+serde_json.workspace = true
 
 [dev-dependencies]
-jtd_codegen_test = { path = "../test" }
+jtd_codegen_test.workspace = true
diff --git a/crates/target_go/Cargo.toml b/crates/target_go/Cargo.toml
@@ -2,12 +2,12 @@
 name = "jtd_codegen_target_go"
 version = "0.2.1"
 authors = ["Ulysse Carion <ulysse@segment.com>"]
-edition = "2018"
+edition.workspace = true
 
 [dependencies]
-jtd-codegen = { path = "../core" }
-lazy_static = "1.4.0"
-serde_json = "1.0"
+jtd-codegen.workspace = true
+lazy_static.workspace = true
+serde_json.workspace = true
 
 [dev-dependencies]
-jtd_codegen_test = { path = "../test" }
+jtd_codegen_test.workspace = true
diff --git a/crates/target_java_jackson/Cargo.toml b/crates/target_java_jackson/Cargo.toml
@@ -2,13 +2,13 @@
 name = "jtd_codegen_target_java_jackson"
 version = "0.2.1"
 authors = ["Ulysse Carion <ulysse@segment.com>"]
-edition = "2018"
+edition.workspace = true
 
 [dependencies]
-jtd-codegen = { path = "../core" }
-lazy_static = "1.4.0"
+jtd-codegen.workspace = true
+lazy_static.workspace = true
 askama = "0.8"
-serde_json = "1.0"
+serde_json.workspace = true
 
 [dev-dependencies]
-jtd_codegen_test = { path = "../test" }
+jtd_codegen_test.workspace = true
diff --git a/crates/target_python/Cargo.toml b/crates/target_python/Cargo.toml
@@ -2,12 +2,12 @@
 name = "jtd_codegen_target_python"
 version = "0.3.1"
 authors = ["Ulysse Carion <ulysse@segment.com>"]
-edition = "2018"
+edition.workspace = true
 
 [dependencies]
-jtd-codegen = { path = "../core" }
-lazy_static = "1.4.0"
-serde_json = "1.0"
+jtd-codegen.workspace = true
+lazy_static.workspace = true
+serde_json.workspace = true
 
 [dev-dependencies]
-jtd_codegen_test = { path = "../test" }
+jtd_codegen_test.workspace = true
diff --git a/crates/target_ruby/Cargo.toml b/crates/target_ruby/Cargo.toml
@@ -2,12 +2,12 @@
 name = "jtd_codegen_target_ruby"
 version = "0.1.1"
 authors = ["Ulysse Carion <ulysse@segment.com>"]
-edition = "2018"
+edition.workspace = true
 
 [dependencies]
-jtd-codegen = { path = "../core" }
-lazy_static = "1.4.0"
-serde_json = "1.0"
+jtd-codegen.workspace = true
+lazy_static.workspace = true
+serde_json.workspace = true
 
 [dev-dependencies]
-jtd_codegen_test = { path = "../test" }
+jtd_codegen_test.workspace = true
diff --git a/crates/target_ruby_sig/Cargo.toml b/crates/target_ruby_sig/Cargo.toml
@@ -2,12 +2,12 @@
 name = "jtd_codegen_target_ruby_sig"
 version = "0.1.1"
 authors = ["Ulysse Carion <ulysse@segment.com>"]
-edition = "2018"
+edition.workspace = true
 
 [dependencies]
-jtd-codegen = { path = "../core" }
-lazy_static = "1.4.0"
-serde_json = "1.0"
+jtd-codegen.workspace = true
+lazy_static.workspace = true
+serde_json.workspace = true
 
 [dev-dependencies]
-jtd_codegen_test = { path = "../test" }
+jtd_codegen_test.workspace = true
diff --git a/crates/target_rust/Cargo.toml b/crates/target_rust/Cargo.toml
@@ -2,12 +2,12 @@
 name = "jtd_codegen_target_rust"
 version = "0.2.1"
 authors = ["Ulysse Carion <ulysse@segment.com>"]
-edition = "2018"
+edition.workspace = true
 
 [dependencies]
-jtd-codegen = { path = "../core" }
-lazy_static = "1.4.0"
-serde_json = "1.0"
+jtd-codegen.workspace = true
+lazy_static.workspace = true
+serde_json.workspace = true
 
 [dev-dependencies]
-jtd_codegen_test = { path = "../test" }
+jtd_codegen_test.workspace = true
diff --git a/crates/target_rust/docker/Cargo.toml b/crates/target_rust/docker/Cargo.toml
@@ -2,7 +2,7 @@
 name = "jtd_e2e_test"
 version = "0.1.0"
 authors = ["Ulysse Carion <ulysse@segment.com>"]
-edition = "2018"
+edition.workspace = true
 
 [dependencies]
 chrono = { version = "0.4", features = ["serde"] }

diff --git a/crates/target_typescript/Cargo.toml b/crates/target_typescript/Cargo.toml
@@ -2,13 +2,13 @@
 name = "jtd_codegen_target_typescript"
 version = "0.2.1"
 authors = ["Ulysse Carion <ulysse@segment.com>"]
-edition = "2018"
+edition.workspace = true
 
 [dependencies]
-jtd-codegen = { path = "../core" }
-lazy_static = "1.4.0"
-serde_json = "1.0"
+jtd-codegen.workspace = true
+lazy_static.workspace = true
+serde_json.workspace = true
 regex = "1"
 
 [dev-dependencies]
-jtd_codegen_test = { path = "../test" }
+jtd_codegen_test.workspace = true
diff --git a/crates/test/Cargo.toml b/crates/test/Cargo.toml
@@ -2,12 +2,12 @@
 name = "jtd_codegen_test"
 version = "0.1.0"
 authors = ["Ulysse Carion <ulysse@segment.com>"]
-edition = "2018"
+edition.workspace = true
 
 [dependencies]
-jtd-codegen = { path = "../core" }
-jtd = "0.2.1"
-serde_json = "1.0"
+jtd-codegen.workspace = true
+jtd.workspace = true
+serde_json.workspace = true
 tempfile = "3"
 jtd-fuzz = "0.1.21"
 rand = "0.7"