Skip to content

Commit

Permalink
chore: Add a [workspace.package] section and refer to it from members
Browse files Browse the repository at this point in the history 
This means we only need to change stuff in one place from now on. Also
eliminates the need for the `update_version` script, so remove that.
  • Loading branch information
@larseggert
larseggert committed Feb 7, 2024
1 parent e45e234 commit 62001fa
Show file tree
Hide file tree
Showing 11 changed files with 74 additions and 64 deletions.
8 changes: 8 additions & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,11 @@ members = [
"neqo-interop",
"test-fixture",
]

[workspace.package]
homepage = "https://github.com/mozilla/neqo/"
repository = "https://github.com/mozilla/neqo/"
version = "0.7.0"
edition = "2018"
rust-version = "1.70.0"
license = "MIT OR Apache-2.0"
20 changes: 12 additions & 8 deletions neqo-client/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
[package]
name = "neqo-client"
version = "0.7.0"
authors = ["Martin Thomson <mt@lowentropy.net>",
authors = [
"Martin Thomson <mt@lowentropy.net>",
"Dragana Damjanovic <dragana.damjano@gmail.com>",
"Andy Grover <agrover@mozilla.com>"]
edition = "2018"
rust-version = "1.70.0"
license = "MIT OR Apache-2.0"
"Andy Grover <agrover@mozilla.com>",
]
homepage.workspace = true
repository.workspace = true
version.workspace = true
edition.workspace = true
rust-version.workspace = true
license.workspace = true

[dependencies]
futures = "0.3"
log = {version = "0.4.17", default-features = false}
neqo-common = { path="./../neqo-common" }
log = { version = "0.4.17", default-features = false }
neqo-common = { path = "./../neqo-common" }
neqo-crypto = { path = "./../neqo-crypto" }
neqo-http3 = { path = "./../neqo-http3" }
neqo-qpack = { path = "./../neqo-qpack" }
Expand Down
12 changes: 7 additions & 5 deletions neqo-common/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
[package]
name = "neqo-common"
version = "0.7.0"
authors = ["Bobby Holley <bobbyholley@gmail.com>"]
edition = "2018"
rust-version = "1.70.0"
license = "MIT OR Apache-2.0"
build = "build.rs"
homepage.workspace = true
repository.workspace = true
version.workspace = true
edition.workspace = true
rust-version.workspace = true
license.workspace = true

[dependencies]
enum-map = "2.7"
env_logger = { version = "0.10", default-features = false }
lazy_static = "1.4"
log = { version = "0.4", default-features = false }
qlog = "0.12.0"
time = {version = "0.3.23", features = ["formatting"]}
time = { version = "0.3.23", features = ["formatting"] }

[dev-dependencies]
test-fixture = { path = "../test-fixture" }
Expand Down
16 changes: 9 additions & 7 deletions neqo-crypto/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
[package]
name = "neqo-crypto"
version = "0.7.0"
authors = ["Martin Thomson <mt@lowentropy.net>"]
edition = "2018"
rust-version = "1.70.0"
build = "build.rs"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
version.workspace = true
edition.workspace = true
rust-version.workspace = true
license.workspace = true

[dependencies]
log = {version = "~0.4.17", default-features = false}
log = { version = "~0.4.17", default-features = false }
neqo-common = { path = "../neqo-common" }

[build-dependencies]
bindgen = {version = "0.69.1", default-features = false, features= ["runtime"]}
mozbuild = {version = "0.1", optional = true}
bindgen = { version = "0.69.1", default-features = false, features = ["runtime"] }
mozbuild = { version = "0.1", optional = true }
serde = "1.0.195"
serde_derive = "1.0.195"
toml = "0.5.11"
Expand Down
12 changes: 7 additions & 5 deletions neqo-http3/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
[package]
name = "neqo-http3"
version = "0.7.0"
authors = ["Dragana Damjanovic <dragana.damjano@gmail.com>"]
edition = "2018"
rust-version = "1.70.0"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
version.workspace = true
edition.workspace = true
rust-version.workspace = true
license.workspace = true

[dependencies]
enumset = "1.1.2"
lazy_static = "1.4"
log = {version = "0.4.17", default-features = false}
log = { version = "0.4.17", default-features = false }
neqo-common = { path = "./../neqo-common" }
neqo-crypto = { path = "./../neqo-crypto" }
neqo-qpack = { path = "./../neqo-qpack" }
Expand Down
12 changes: 7 additions & 5 deletions neqo-interop/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
[package]
name = "neqo-interop"
version = "0.7.0"
authors = ["EKR <ekr@rtfm.com>"]
edition = "2018"
rust-version = "1.70.0"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
version.workspace = true
edition.workspace = true
rust-version.workspace = true
license.workspace = true

[dependencies]
lazy_static = "1.4"
neqo-common = { path="./../neqo-common" }
neqo-common = { path = "./../neqo-common" }
neqo-crypto = { path = "./../neqo-crypto" }
neqo-http3 = { path = "./../neqo-http3" }
neqo-qpack = { path = "./../neqo-qpack" }
Expand Down
2 changes: 1 addition & 1 deletion neqo-qpack/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"

[dependencies]
lazy_static = "~1.4.0"
log = {version = "~0.4.17", default-features = false}
log = { version = "~0.4.17", default-features = false }
neqo-common = { path = "./../neqo-common" }
neqo-crypto = { path = "./../neqo-crypto" }
neqo-transport = { path = "./../neqo-transport" }
Expand Down
14 changes: 8 additions & 6 deletions neqo-server/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
[package]
name = "neqo-server"
version = "0.7.0"
authors = ["Dragana Damjanovic <dragana.damjano@gmail.com>"]
edition = "2018"
rust-version = "1.70.0"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
version.workspace = true
edition.workspace = true
rust-version.workspace = true
license.workspace = true

[dependencies]
futures = "0.3"
log = {version = "0.4.17", default-features = false}
neqo-common = { path="./../neqo-common" }
log = { version = "0.4.17", default-features = false }
neqo-common = { path = "./../neqo-common" }
neqo-crypto = { path = "./../neqo-crypto" }
neqo-http3 = { path = "./../neqo-http3" }
neqo-qpack = { path = "./../neqo-qpack" }
Expand Down
12 changes: 7 additions & 5 deletions neqo-transport/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
[package]
name = "neqo-transport"
version = "0.7.0"
authors = ["EKR <ekr@rtfm.com>", "Andy Grover <agrover@mozilla.com>"]
edition = "2018"
rust-version = "1.70.0"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
version.workspace = true
edition.workspace = true
rust-version.workspace = true
license.workspace = true

[dependencies]
indexmap = "1.9.3"
Expand Down Expand Up @@ -38,4 +40,4 @@ required-features = ["bench"]
[[bench]]
name = "range_tracker"
harness = false
required-features = ["bench"]
required-features = ["bench"]
14 changes: 8 additions & 6 deletions test-fixture/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
[package]
name = "test-fixture"
version = "0.7.0"
authors = ["Martin Thomson <mt@lowentropy.net>"]
edition = "2018"
rust-version = "1.70.0"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
version.workspace = true
edition.workspace = true
rust-version.workspace = true
license.workspace = true

[dependencies]
lazy_static = "1.4"
log = {version = "0.4.17", default-features = false}
log = { version = "0.4.17", default-features = false }
neqo-common = { path = "../neqo-common" }
neqo-crypto = { path = "../neqo-crypto" }
neqo-http3 = { path = "../neqo-http3" }
Expand All @@ -17,4 +19,4 @@ neqo-transport = { path = "../neqo-transport" }
qlog = "0.12.0"

[features]
deny-warnings = []
deny-warnings = []
16 changes: 0 additions & 16 deletions update_version
View file

This file was deleted.

0 comments on commit 62001fa

Please sign in to comment.