mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 10:07:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

cargo: unify a lot of crate metadata in the workspace

Browse source 
Summary: There's no need to go around specifying `rust-version` or `edition` or
`version` several times, now that we have a global workspace. Instead, inherit
workspace metadata from the top-level Cargo.toml file.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
Change-Id: Iaf905445978ed2b3377239dcdb8a6c32
This commit is contained in:
Austin Seipp 2023-08-05 17:14:11 -05:00
parent 13fff3be70
commit d858db7e85
6 changed files with 46 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -777,7 +777,7 @@ dependencies = [
[[package]]
name = "gen-protos"
version = "0.1.0"
version = "0.8.0"
dependencies = [
"prost-build",
]

12
Cargo.toml
View file

@ -4,6 +4,18 @@ cargo-features = []
resolver = "2"
members = ["cli", "lib", "lib/testutils", "lib/gen-protos"]
[workspace.package]
version = "0.8.0"
license = "Apache-2.0"
rust-version = "1.71" # NOTE: remember to update CI, contributing.md, changelog.md, and flake.nix
edition = "2021"
readme = "README.md"
homepage = "https://github.com/martinvonz/jj"
repository = "https://github.com/martinvonz/jj"
documentation = "https://github.com/martinvonz/jj"
categories = ["version-control", "development-tools"]
keywords = ["VCS", "DVCS", "SCM", "Git", "Mercurial"]
[workspace.dependencies]
anyhow = "1.0.72"
assert_cmd = "2.0.8"

22
cli/Cargo.toml
View file

@ -1,19 +1,17 @@
[package]
name = "jj-cli"
version = "0.8.0"
authors = ["Martin von Zweigbergk <martinvonz@google.com>"]
edition = "2021"
rust-version = "1.71" # Remember to update CI, and contributing.md
license = "Apache-2.0"
description = "Jujutsu (an experimental VCS)"
homepage = "https://github.com/martinvonz/jj"
repository = "https://github.com/martinvonz/jj"
documentation = "https://docs.rs/jj-cli"
readme = "README.md"
keywords = ["VCS", "DVCS", "SCM", "Git", "Mercurial"]
categories = ["command-line-utilities", "development-tools"]
description = "Jujutsu - an experimental version control system"
default-run = "jj"
version.workspace = true
edition.workspace = true
rust-version.workspace = true
license.workspace = true
homepage.workspace = true
repository.workspace = true
documentation.workspace = true
keywords.workspace = true
[[bin]]
name = "jj"
path = "src/main.rs"

20
lib/Cargo.toml
View file

@ -1,17 +1,15 @@
[package]
name = "jj-lib"
version = "0.8.0"
authors = ["Martin von Zweigbergk <martinvonz@google.com>"]
edition = "2021"
rust-version = "1.71"
license = "Apache-2.0"
description = "Library for Jujutsu (an experimental VCS)"
homepage = "https://github.com/martinvonz/jj"
repository = "https://github.com/martinvonz/jj"
documentation = "https://docs.rs/jj-lib"
readme = "../README.md"
description = "Library for Jujutsu - an experimental version control system"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
version.workspace = true
edition.workspace = true
rust-version.workspace = true
license.workspace = true
homepage.workspace = true
repository.workspace = true
documentation.workspace = true
readme.workspace = true
[[bench]]
name = "diff_bench"

8
lib/gen-protos/Cargo.toml
View file

@ -1,9 +1,11 @@
[package]
name = "gen-protos"
version = "0.1.0"
edition = "2021"
license = "Apache-2.0"
description = "Generate Protocol Buffers definitions for the jj-lib crate"
publish = false
version.workspace = true
edition.workspace = true
license.workspace = true
[dependencies]
prost-build.workspace = true

18
lib/testutils/Cargo.toml
View file

@ -1,17 +1,17 @@
[package]
name = "testutils"
version = "0.8.0"
authors = ["Martin von Zweigbergk <martinvonz@google.com>"]
edition = "2021"
rust-version = "1.61"
license = "Apache-2.0"
description = "Integration test utils for the jj-lib crate"
homepage = "https://github.com/martinvonz/jj"
repository = "https://github.com/martinvonz/jj"
documentation = "https://docs.rs/jj-lib"
readme = "../..//README.md"
publish = false
version.workspace = true
edition.workspace = true
rust-version.workspace = true
license.workspace = true
homepage.workspace = true
repository.workspace = true
documentation.workspace = true
readme.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]