move internal dependencies to shared version (#1379)

leonardoalt · web-flow · commit 34d04ed87311 · 2024-05-15T10:46:34.000Z
Trying this out which will make releases much easier
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,6 +36,29 @@ license = "MIT"
 homepage = "https://powdr.org"
 repository = "https://github.com/powdr-labs/powdr"
 
+[workspace.dependencies]
+# workspace crates
+powdr = { path = "./powdr", version = "0.1.0-alpha.1" }
+powdr-airgen = { path = "./airgen", version = "0.1.0-alpha.1" }
+powdr-ast = { path = "./ast", version = "0.1.0-alpha.1" }
+powdr-asm-to-pil = { path = "./asm-to-pil", version = "0.1.0-alpha.1" }
+powdr-asm-utils = { path = "./asm-utils", version = "0.1.0-alpha.1" }
+powdr-analysis = { path = "./analysis", version = "0.1.0-alpha.1" }
+powdr-backend = { path = "./backend", version = "0.1.0-alpha.1" }
+powdr-executor = { path = "./executor", version = "0.1.0-alpha.1" }
+powdr-importer = { path = "./importer", version = "0.1.0-alpha.1" }
+powdr-linker = { path = "./linker", version = "0.1.0-alpha.1" }
+powdr-number = { path = "./number", version = "0.1.0-alpha.1" }
+powdr-parser = { path = "./parser", version = "0.1.0-alpha.1" }
+powdr-parser-util = { path = "./parser-util", version = "0.1.0-alpha.1" }
+powdr-pil-analyzer = { path = "./pil-analyzer", version = "0.1.0-alpha.1" }
+powdr-pilopt = { path = "./pilopt", version = "0.1.0-alpha.1" }
+powdr-pipeline = { path = "./pipeline", version = "0.1.0-alpha.1" }
+powdr-riscv = { path = "./riscv", version = "0.1.0-alpha.1" }
+powdr-riscv-executor = { path = "./riscv-executor", version = "0.1.0-alpha.1" }
+powdr-riscv-syscalls = { path = "./riscv-syscalls", version = "0.1.0-alpha.1" }
+powdr-schemas = { path = "./schemas", version = "0.1.0-alpha.1" }
+
 [profile.pr-tests]
 inherits = "dev"
 opt-level = 3
diff --git a/airgen/Cargo.toml b/airgen/Cargo.toml
@@ -8,9 +8,9 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-powdr-ast = { path = "../ast" }
-powdr-number = { path = "../number" }
-powdr-analysis = { path = "../analysis" }
+powdr-ast.workspace = true
+powdr-number.workspace = true
+powdr-analysis.workspace = true
 
 log = "0.4.17"
 
diff --git a/analysis/Cargo.toml b/analysis/Cargo.toml
@@ -8,17 +8,17 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-powdr-asm-to-pil = { path = "../asm-to-pil" }
-powdr-ast = { path = "../ast" }
-powdr-number = { path = "../number" }
-powdr-parser = { path = "../parser" }
+powdr-asm-to-pil.workspace = true
+powdr-ast.workspace = true
+powdr-number.workspace = true
+powdr-parser.workspace = true
 
 itertools = "^0.10"
 lazy_static = "1.4.0"
 log = "0.4.18"
 
 [dev-dependencies]
-powdr-importer = { path = "../importer" }
+powdr-importer.workspace = true
 pretty_assertions = "1.4.0"
 test-log = "0.2.12"
 env_logger = "0.10.0"
diff --git a/asm-to-pil/Cargo.toml b/asm-to-pil/Cargo.toml
@@ -8,9 +8,9 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-powdr-ast = { path = "../ast" }
-powdr-number = { path = "../number" }
-powdr-parser = { path = "../parser" }
+powdr-ast.workspace = true
+powdr-number.workspace = true
+powdr-parser.workspace = true
 
 lazy_static = "1.4.0"
 log = "0.4.17"
diff --git a/ast/Cargo.toml b/ast/Cargo.toml
@@ -8,7 +8,7 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-powdr-number = { path = "../number" }
+powdr-number.workspace = true
 
 itertools = "0.11.0"
 num-traits = "0.2.15"
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -13,10 +13,10 @@ halo2 = ["dep:halo2_proofs", "dep:halo2_curves", "dep:snark-verifier", "dep:halo
 estark-polygon = ["dep:pil-stark-prover"]
 
 [dependencies]
-powdr-ast = { path = "../ast" }
-powdr-number = { path = "../number" }
-powdr-pil-analyzer = { path = "../pil-analyzer" }
-powdr-executor = { path = "../executor" }
+powdr-ast.workspace = true
+powdr-number.workspace = true
+powdr-pil-analyzer.workspace = true
+powdr-executor.workspace = true
 
 starky = { git = "https://github.com/0xEigenLabs/eigen-zkvm.git", rev = "cf405b2e2cecb8567cfd083a55936b71722276d5" }
 pil-stark-prover = { git = "https://github.com/powdr-labs/pil-stark-prover.git", rev = "769b1153f3ae2d7cbab4c8acf33865ed13f8a823", optional = true }
diff --git a/cli-rs/Cargo.toml b/cli-rs/Cargo.toml
@@ -8,10 +8,10 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-powdr-number = { path = "../number" }
-powdr-riscv = { path = "../riscv" }
-powdr-riscv-executor = { path = "../riscv-executor" }
-powdr-pipeline = { path = "../pipeline" }
+powdr-number.workspace = true
+powdr-riscv.workspace = true
+powdr-riscv-executor.workspace = true
+powdr-pipeline.workspace = true
 
 clap = { version = "^4.3", features = ["derive"] }
 env_logger = "0.10.0"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -14,11 +14,11 @@ halo2 = ["powdr-backend/halo2", "powdr-pipeline/halo2"]
 estark-polygon = ["powdr-backend/estark-polygon", "powdr-pipeline/estark-polygon"]
 
 [dependencies]
-powdr-backend = { path = "../backend" }
-powdr-number = { path = "../number" }
-powdr-parser = { path = "../parser" }
-powdr-pilopt = { path = "../pilopt" }
-powdr-pipeline = { path = "../pipeline" }
+powdr-backend.workspace = true
+powdr-number.workspace = true
+powdr-parser.workspace = true
+powdr-pilopt.workspace = true
+powdr-pipeline.workspace = true
 
 clap = { version = "^4.3", features = ["derive"] }
 env_logger = "0.10.0"
diff --git a/executor/Cargo.toml b/executor/Cargo.toml
@@ -8,10 +8,10 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-powdr-ast = { path = "../ast" }
-powdr-number = { path = "../number" }
-powdr-parser-util = { path = "../parser-util" }
-powdr-pil-analyzer = { path = "../pil-analyzer" }
+powdr-ast.workspace = true
+powdr-number.workspace = true
+powdr-parser-util.workspace = true
+powdr-pil-analyzer.workspace = true
 
 itertools = "^0.10"
 log = { version = "0.4.17" }
diff --git a/importer/Cargo.toml b/importer/Cargo.toml
@@ -8,9 +8,9 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-powdr-ast = { path = "../ast" }
-powdr-number = { path = "../number" }
-powdr-parser = { path = "../parser" }
+powdr-ast.workspace = true
+powdr-number.workspace = true
+powdr-parser.workspace = true
 
 pretty_assertions = "1.4.0"
 
diff --git a/linker/Cargo.toml b/linker/Cargo.toml
@@ -8,17 +8,17 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-powdr-analysis = { path = "../analysis" }
-powdr-ast = { path = "../ast" }
-powdr-number = { path = "../number" }
+powdr-analysis.workspace = true
+powdr-ast.workspace = true
+powdr-number.workspace = true
 
 pretty_assertions = "1.4.0"
 itertools = "^0.10"
 
 [dev-dependencies]
-powdr-airgen = { path = "../airgen" }
-powdr-importer = { path = "../importer" }
-powdr-parser = { path = "../parser" }
+powdr-airgen.workspace = true
+powdr-importer.workspace = true
+powdr-parser.workspace = true
 
 [lints.clippy]
 uninlined_format_args = "deny"
diff --git a/parser/Cargo.toml b/parser/Cargo.toml
@@ -9,9 +9,9 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-powdr-ast = { path = "../ast" }
-powdr-number = { path = "../number" }
-powdr-parser-util = { path = "../parser-util" }
+powdr-ast.workspace = true
+powdr-number.workspace = true
+powdr-parser-util.workspace = true
 
 lazy_static = "1.4.0"
 lalrpop-util = {version = "^0.19", features = ["lexer"]}
diff --git a/pil-analyzer/Cargo.toml b/pil-analyzer/Cargo.toml
@@ -8,10 +8,10 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-powdr-ast = { path = "../ast" }
-powdr-number = { path = "../number" }
-powdr-parser = { path = "../parser" }
-powdr-parser-util = { path = "../parser-util" }
+powdr-ast.workspace = true
+powdr-number.workspace = true
+powdr-parser.workspace = true
+powdr-parser-util.workspace = true
 lazy_static = "1.4.0"
 
 itertools = "^0.10"
diff --git a/pilopt/Cargo.toml b/pilopt/Cargo.toml
@@ -8,14 +8,14 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-powdr-ast = { path = "../ast" }
-powdr-number = { path = "../number" }
+powdr-ast.workspace = true
+powdr-number.workspace = true
 
 log = "0.4.17"
 pretty_assertions = "1.4.0"
 
 [dev-dependencies]
-powdr-pil-analyzer = { path = "../pil-analyzer" }
+powdr-pil-analyzer.workspace = true
 
 [lints.clippy]
 uninlined_format_args = "deny"
diff --git a/pipeline/Cargo.toml b/pipeline/Cargo.toml
@@ -13,21 +13,21 @@ halo2 = ["powdr-backend/halo2"]
 estark-polygon = ["powdr-backend/estark-polygon"]
 
 [dependencies]
-powdr-airgen = { path = "../airgen" }
-powdr-analysis = { path = "../analysis" }
-powdr-asm-to-pil = { path = "../asm-to-pil" }
-powdr-asm-utils = { path = "../asm-utils" }
-powdr-ast = { path = "../ast" }
-powdr-backend = { path = "../backend" }
-powdr-executor = { path = "../executor" }
-powdr-importer = { path = "../importer" }
-powdr-linker = { path = "../linker" }
-powdr-number = { path = "../number" }
-powdr-parser = { path = "../parser" }
-powdr-parser-util = { path = "../parser-util" }
-powdr-pilopt = { path = "../pilopt" }
-powdr-pil-analyzer = { path = "../pil-analyzer" }
-powdr-schemas = { path = "../schemas" }
+powdr-airgen.workspace = true
+powdr-analysis.workspace = true
+powdr-asm-to-pil.workspace = true
+powdr-asm-utils.workspace = true
+powdr-ast.workspace = true
+powdr-backend.workspace = true
+powdr-executor.workspace = true
+powdr-importer.workspace = true
+powdr-linker.workspace = true
+powdr-number.workspace = true
+powdr-parser.workspace = true
+powdr-parser-util.workspace = true
+powdr-pilopt.workspace = true
+powdr-pil-analyzer.workspace = true
+powdr-schemas.workspace = true
 
 itertools = "^0.10"
 log = "0.4.17"
diff --git a/powdr-test/Cargo.toml b/powdr-test/Cargo.toml
@@ -8,7 +8,7 @@ homepage.workspace = true
 repository.workspace = true
 
 [dependencies]
-powdr = { path = "../powdr" }
+powdr.workspace = true
 
 [dev-dependencies]
 env_logger = "0.10.2"
diff --git a/powdr/Cargo.toml b/powdr/Cargo.toml
@@ -8,14 +8,14 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-powdr-ast = { path = "../ast" }
-powdr-backend = { path = "../backend" }
-powdr-executor = { path = "../executor" }
-powdr-number = { path = "../number" }
-powdr-pil-analyzer = { path = "../pil-analyzer" }
-powdr-pipeline = { path = "../pipeline" }
-powdr-riscv = { path = "../riscv" }
-powdr-riscv-executor = { path = "../riscv-executor" }
+powdr-ast.workspace = true
+powdr-backend.workspace = true
+powdr-executor.workspace = true
+powdr-number.workspace = true
+powdr-pil-analyzer.workspace = true
+powdr-pipeline.workspace = true
+powdr-riscv.workspace = true
+powdr-riscv-executor.workspace = true
 
 [features]
 default = ["halo2"]
diff --git a/riscv-executor/Cargo.toml b/riscv-executor/Cargo.toml
@@ -8,14 +8,13 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-powdr-analysis = { path = "../analysis" }
-powdr-ast = { path = "../ast" }
-powdr-executor = { path = "../executor" }
-powdr-importer = { path = "../importer" }
-powdr-number = { path = "../number" }
-powdr-parser = { path = "../parser" }
-powdr-riscv-syscalls = { path = "../riscv-syscalls" }
-
+powdr-analysis.workspace = true
+powdr-ast.workspace = true
+powdr-executor.workspace = true
+powdr-importer.workspace = true
+powdr-number.workspace = true
+powdr-parser.workspace = true
+powdr-riscv-syscalls.workspace = true
 
 log = "0.4.17"
 itertools = "0.11"
diff --git a/riscv-runtime/Cargo.toml b/riscv-runtime/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://github.com/powdr-labs/powdr"
 [dependencies]
 serde = { version = "1.0", default-features = false, features = ["alloc", "derive", "rc"] }
 serde_cbor = { version = "0.11.2", default-features = false, features = ["alloc"] }
-powdr-riscv-syscalls = { path = "../riscv-syscalls" }
+powdr-riscv-syscalls = { path = "../riscv-syscalls", version = "0.1.0-alpha.1" }
 
 [workspace]
 
diff --git a/riscv/Cargo.toml b/riscv/Cargo.toml
@@ -14,15 +14,15 @@ complex-tests = []
 estark-polygon = ["powdr-pipeline/estark-polygon"]
 
 [dependencies]
-powdr-ast = { path = "../ast" }
-powdr-asm-utils = { path = "../asm-utils" }
-powdr-executor = { path = "../executor" }
-powdr-number = { path = "../number" }
-powdr-parser = { path = "../parser" }
-powdr-parser-util = { path = "../parser-util" }
-powdr-pipeline = { path = "../pipeline" }
-powdr-riscv-executor = { path = "../riscv-executor" }
-powdr-riscv-syscalls = { path = "../riscv-syscalls" }
+powdr-ast.workspace = true
+powdr-asm-utils.workspace = true
+powdr-executor.workspace = true
+powdr-number.workspace = true
+powdr-parser.workspace = true
+powdr-parser-util.workspace = true
+powdr-pipeline.workspace = true
+powdr-riscv-executor.workspace = true
+powdr-riscv-syscalls.workspace = true
 
 lazy_static = "1.4.0"
 itertools = "^0.10"
@@ -41,8 +41,8 @@ regex-syntax = { version = "0.6", default_features = false, features = [
 lalrpop = "^0.19"
 
 [dev-dependencies]
-powdr-number = { path = "../number" }
-powdr-backend = { path = "../backend" }
+powdr-number.workspace = true
+powdr-backend.workspace = true
 
 test-log = "0.2.12"
 env_logger = "0.10.0"
diff --git a/schemas/Cargo.toml b/schemas/Cargo.toml
@@ -9,8 +9,8 @@ repository.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-powdr-ast = { path = "../ast" }
-powdr-number = { path = "../number" }
+powdr-ast.workspace = true
+powdr-number.workspace = true
 
 serde = { version = "1.0", default-features = false, features = ["alloc", "derive", "rc"] }
 schemars = { version = "0.8.16", features = ["preserve_order"]}
