Skip to content

Commit

Permalink
chore: use cargo workspace to manage dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
ImJeremyHe committed Dec 16, 2024
1 parent d73295a commit 71b29d3
Show file tree
Hide file tree
Showing 16 changed files with 184 additions and 155 deletions.
36 changes: 13 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 42 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
[package]
name = "logisheets"
version = "0.6.0"
version.workspace = true
description = "A web spreadsheets application written in Rust and Typescript"
keywords = ["excel", "spreadsheets", "ooxml", "logisheets", "xlsx"]
readme = "README.md"
repository = "https://github.com/logisky/LogiSheets"
license = "MIT"
license.workspace = true
include = [
"crates/workbook/**/*",
"crates/controller/**/*",
"src/lib.rs",
"Cargo.toml",
]
edition = "2018"
edition.workspace = true

[workspace]
members = [
"crates/buildtools",
"crates/controller",
"crates/controller/ast_checker",
"crates/controller/base",
"crates/controller/lexer",
"crates/controller/parser",
"crates/formatter",
"crates/logiscript",
"crates/sequencer",
Expand All @@ -27,10 +31,42 @@ members = [
"crates/xmldiff",
]

[workspace.package]
version = "0.7.0"
authors = ["JeremyHe <[email protected]>"]
license = "MIT"
edition = "2018"

[workspace.dependencies]
chrono = "0.4"
futures = "0.3"
gents = "0.8"
gents_derives = "0.8"
getrandom = "0.2"
im = "15.0"
lazy_static = "1.4"
pest = "2.7"
pest_derive = "2.5"
quick-xml = "0.31"
regex = "1"
serde = "1"
serde_json = "1"
thiserror = "1.0"
xmlserde = "0.10"
xmlserde_derives = "0.10"

logisheets_lexer = { path = "crates/controller/lexer", version = "0.7.0" }
logisheets_parser = { path = "crates/controller/parser", version = "0.7.0" }
logisheets_base = { path = "crates/controller/base", version = "0.7.0" }
logisheets_controller = { path = "crates/controller", version = "0.7.0" }

logisheets_workbook_derives = { path = "crates/workbook/derives", version = "0.7.0" }
logisheets_workbook = { path = "crates/workbook", version = "0.7.0" }

[dependencies]
logisheets_controller = {path = "crates/controller", version = "0.6.0"}
logisheets_workbook = {path = "crates/workbook", version = "0.6.0"}
logisheets_controller = { workspace = true }
logisheets_workbook = { workspace = true }

[dev-dependencies]
glob = "0.3.1"
logiscript = {path = "crates/logiscript", version = "0.1.0"}
logiscript = { path = "crates/logiscript" }
12 changes: 6 additions & 6 deletions crates/buildtools/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "buildtools"
version = "0.1.0"
edition = "2018"
authors = ["ImJeremyHe<[email protected]>"]
version.workspace = true
edition.workspace = true
authors.workspace = true

[dependencies]
gents = "0.8.0"
gents = { workspace = true }

logisheets_controller = {path = "../controller", features = ["gents"]}
logisheets_sequencer = {path = "../sequencer", features = ["gents"]}
logisheets_controller = { path = "../controller", features = ["gents"] }
logisheets_sequencer = { path = "../sequencer", features = ["gents"] }

[[bin]]
name = "generate"
Expand Down
40 changes: 21 additions & 19 deletions crates/controller/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,39 +1,41 @@
[package]
name = "logisheets_controller"
version = "0.6.0"
version.workspace = true
license.workspace = true
authors.workspace = true
description = "the core of LogiSheets"
authors = ["ImJeremyHe<[email protected]>"]
edition = "2018"
license = "MIT"
edition.workspace = true

[dependencies]
thiserror = "1.0.48"
chrono = "0.4.26"
thiserror = { workspace = true }
chrono = { workspace = true }
futures = "0.3.19"
colorsys = "0.6.7"
im = "15.0.0"
im = { workspace = true }
itertools = "0.10.5"
lazy_static = "1.4.0"
lazy_static = { workspace = true }
num = "0.4.0"
num-bigint = "0.4"
num-traits = "0.2"
quick-xml = {version = "0.28", features = ["serialize"]}
quick-xml = { workspace = true, features = ["serialize"] }
rand = "0.8.4"
regex = "1"
serde = {version = "1.0.152", features = ["derive"]}
regex = { workspace = true }
serde = { workspace = true, features = ["derive"] }
statrs = "0.16.1"
unicode-segmentation = "1.10.1"
wildescape = "0.1.0"
uuid ={ version = "1.4.1", features = ["v4", "fast-rng", "macro-diagnostics"]}
uuid = { version = "1.4.1", features = ["v4", "fast-rng", "macro-diagnostics"] }

logisheets_base = {version = "0.6.0", path = "./base", features = ["gents"]}
logisheets_lexer = {version = "0.6.0", path = "./lexer"}
logisheets_parser = {version = "0.6.0", path = "./parser"}
logisheets_workbook = {version = "0.6.0", path = "../workbook", features = ["gents"]}
logisheets_astchecker = {version = "0.6.0", path = "./ast_checker"}
logisheets_base = { path = "./base", features = ["gents"], version = "0.7.0" }
logisheets_lexer = { path = "./lexer", version = "0.7.0" }
logisheets_parser = { path = "./parser", version = "0.7.0" }
logisheets_workbook = { path = "../workbook", features = [
"gents",
], version = "0.7.0" }
logisheets_astchecker = { path = "./ast_checker", version = "0.7.0" }

gents = {version = "0.8.0", optional = true}
gents_derives = {version = "0.8.0", optional = true}
gents = { workspace = true, optional = true }
gents_derives = { workspace = true, optional = true }

[features]
gents = ["dep:gents", "dep:gents_derives"]
Expand Down
12 changes: 6 additions & 6 deletions crates/controller/ast_checker/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "logisheets_astchecker"
version = "0.6.0"
edition = "2018"
description = "validate the arguments in ast"
authors = ["ImJeremyHe<[email protected]>"]
license = "MIT"
version.workspace = true
edition.workspace = true
authors.workspace = true
license.workspace = true

[dependencies]
logisheets_parser = {version = "0.6.0", path = "../parser"}
logisheets_base = {version = "0.6.0", path = "../base"}
logisheets_parser = { workspace = true }
logisheets_base = { workspace = true }
24 changes: 12 additions & 12 deletions crates/controller/base/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
[package]
name = "logisheets_base"
version = "0.6.0"
description = "some basic definitions for LogiSheets"
authors = ["ImJeremyHe<[email protected]>"]
license = "MIT"
edition = "2018"
version.workspace = true
authors.workspace = true
license.workspace = true
edition.workspace = true

[dependencies]
chrono = "0.4.19"
futures = "0.3.19"
im = "15.0.0"
serde = {version = "1.0.125", features = ["derive"]}
thiserror = "1.0.48"
chrono = { workspace = true }
futures = { workspace = true }
im = { workspace = true }
serde = { workspace = true, features = ["derive"] }
thiserror = { workspace = true }

logisheets_workbook = {version = "0.6.0", path = "../../workbook"}
gents = { workspace = true, optional = true }
gents_derives = { workspace = true, optional = true }

gents = {version = "0.8.0", optional = true}
gents_derives = {version = "0.8.0", optional = true}
logisheets_workbook = { workspace = true }

[features]
gents = ["dep:gents", "dep:gents_derives"]
12 changes: 6 additions & 6 deletions crates/controller/lexer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "logisheets_lexer"
version = "0.6.0"
edition = "2018"
description = "the lexer for excel formula"
authors = ["ImJeremyHe<[email protected]>"]
license = "MIT"
version.workspace = true
edition.workspace = true
authors.workspace = true
license.workspace = true

[dependencies]
pest = "2.1.3"
pest_derive = "2.1.0"
pest = { workspace = true }
pest_derive = { workspace = true }
tracing = "0.1"
25 changes: 13 additions & 12 deletions crates/controller/parser/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
[package]
name = "logisheets_parser"
version = "0.6.0"
edition = "2018"
description = "the parser of excel formula"
authors = ["ImJeremyHe<[email protected]>"]
license = "MIT"
version.workspace = true
edition.workspace = true
authors.workspace = true
license.workspace = true

[dependencies]
thiserror = "1.0.48"
lazy_static = "1.4.0"
pest = "2.1.3"
pest_derive = "2.1.0"
chrono = "0.4.19"
regex = "1"
logisheets_lexer = {version = "0.6.0", path = "../lexer"}
logisheets_base = {version = "0.6.0", path = "../base"}
thiserror = { workspace = true }
lazy_static = { workspace = true }
pest = { workspace = true }
pest_derive = { workspace = true }
chrono = { workspace = true }
regex = { workspace = true }

logisheets_lexer = { workspace = true }
logisheets_base = { workspace = true }
Loading

0 comments on commit 71b29d3

Please sign in to comment.