Skip to content

Commit d216208

Browse files
committed
Update dependencies and use workspace.dependencies
Refactor shared dependencies at the workspace level.
1 parent 336a415 commit d216208

File tree

9 files changed

+61
-36
lines changed

9 files changed

+61
-36
lines changed

.github/workflows/ci.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v3
1515
- uses: actions-rs/toolchain@v1
1616
with:
17-
toolchain: 1.67.1
17+
toolchain: 1.70.0
1818
override: true
1919
- name: cargo fetch
2020
uses: actions-rs/cargo@v1
@@ -43,7 +43,7 @@ jobs:
4343
- uses: actions/checkout@v3
4444
- uses: actions-rs/toolchain@v1
4545
with:
46-
toolchain: 1.67.1
46+
toolchain: 1.70.0
4747
override: true
4848
- name: Add target
4949
run: rustup target add ${{ matrix.target }}
@@ -52,7 +52,7 @@ jobs:
5252
with:
5353
command: fetch
5454
- name: Build for target
55-
run: cargo build --verbose --no-default-features --target ${{ matrix.target }}
55+
run: cargo build --verbose --no-default-features --target ${{ matrix.target }} -p tlock_age
5656

5757
bitrot:
5858
name: Bitrot
@@ -62,7 +62,7 @@ jobs:
6262
- uses: actions/checkout@v3
6363
- uses: actions-rs/toolchain@v1
6464
with:
65-
toolchain: 1.67.1
65+
toolchain: 1.70.0
6666
override: true
6767
- name: cargo check
6868
uses: actions-rs/cargo@v1
@@ -71,20 +71,20 @@ jobs:
7171
args: --tests --examples --benches --all-features
7272

7373
clippy:
74-
name: Clippy (1.67.1)
74+
name: Clippy (1.70.0)
7575
runs-on: ubuntu-latest
7676

7777
steps:
7878
- uses: actions/checkout@v3
7979
- uses: actions-rs/toolchain@v1
8080
with:
81-
toolchain: 1.67.1
81+
toolchain: 1.70.0
8282
components: clippy
8383
override: true
8484
- name: Clippy check
8585
uses: actions-rs/clippy-check@v1
8686
with:
87-
name: Clippy (1.67.1)
87+
name: Clippy (1.70.0)
8888
token: ${{ secrets.GITHUB_TOKEN }}
8989
args: --all-features --all-targets -- -D warnings
9090

@@ -96,7 +96,7 @@ jobs:
9696
- uses: actions/checkout@v3
9797
- uses: actions-rs/toolchain@v1
9898
with:
99-
toolchain: 1.67.1
99+
toolchain: 1.70.0
100100
override: true
101101
- name: cargo fetch
102102
uses: actions-rs/cargo@v1
@@ -119,7 +119,7 @@ jobs:
119119
- uses: actions/checkout@v3
120120
- uses: actions-rs/toolchain@v1
121121
with:
122-
toolchain: 1.67.1
122+
toolchain: 1.70.0
123123
components: rustfmt
124124
override: true
125125
- name: Check formatting

Cargo.toml

+11
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,14 @@ members = [
55
"tlock",
66
"tlock_age"
77
]
8+
9+
[workspace.dependencies]
10+
age = "0.9"
11+
age-core = "0.9"
12+
anyhow = "1.0"
13+
criterion = "0.4"
14+
drand_core = "0.0.14"
15+
getrandom = "0.2"
16+
hex = "0.4"
17+
rand = { version = "0.8", default-features = false }
18+
thiserror = "1.0.51"

age-plugin-tlock/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9+
### Changed
10+
11+
- Update dependencies
12+
913
## [0.1.0] - 2023-08-06
1014

1115
### Added

age-plugin-tlock/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ categories = ["command-line-utilities", "cryptography"]
1212
license = "MIT"
1313

1414
[dependencies]
15-
age = "0.9.2"
16-
age-core = "0.9.0"
15+
age = { workspace = true }
16+
age-core = { workspace = true }
1717
age-plugin = "0.4.0"
1818
bincode = "2.0.0-rc.3"
19-
clap = { version = "4.3.19", features = ["derive"] }
20-
clap-verbosity-flag = "2.0.1"
21-
drand_core = "0.0.11"
22-
hex = "0.4.3"
23-
thiserror = "1.0.44"
19+
clap = { version = "4.4.11", features = ["derive"] }
20+
clap-verbosity-flag = "2.1.1"
21+
drand_core = { workspace = true }
22+
hex = { workspace = true }
23+
thiserror = { workspace = true }
2424
tlock_age = { version = "0.0.4", path = "../tlock_age", features = ["internal"] }

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.67.1
1+
1.70.0

tlock/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9+
### Changed
10+
11+
- Update dependencies
12+
13+
## [0.0.4] - 2023-08-23
14+
915
### Added
1016

1117
- Feature rfc9380 enabled by default

tlock/Cargo.toml

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@ categories = ["cryptography"]
1212
license = "MIT"
1313

1414
[dependencies]
15-
anyhow = "1"
15+
anyhow = { workspace = true }
1616
ark-bls12-381 = "0.4.0"
1717
ark-ec = "0.4.2"
1818
ark-ff = "0.4.2"
1919
ark-serialize = "0.4.2"
2020
itertools = "0.10.5"
21-
rand = { version = "0.8.5", default-features = false, features = ["getrandom"]}
21+
rand = { workspace = true, default-features = false, features = ["getrandom"]}
2222
serde = { version = "1.0", features = ["derive"] }
23-
serde_with = "2.3.1"
24-
sha2 = "0.10.6"
25-
thiserror = "1.0.40"
26-
tracing = "0.1.37"
23+
serde_with = "2.3.3"
24+
sha2 = "0.10.8"
25+
thiserror = { workspace = true }
26+
tracing = "0.1.40"
2727

2828
[target.'cfg(wasm32)'.dependencies]
29-
getrandom = { version = "0.2.8", features = ["js"] }
29+
getrandom = { workspace = true, features = ["js"] }
3030

3131
[dev-dependencies]
32-
criterion = { version = "0.4.0", features = ["html_reports"] }
33-
drand_core = "0.0.9"
34-
hex = "0.4"
32+
criterion = { workspace = true, features = ["html_reports"] }
33+
drand_core = { workspace = true }
34+
hex = { workspace = true }
3535

3636
[target.'cfg(unix)'.dev-dependencies]
3737
pprof = { version = "0.11", features = ["criterion", "flamegraph"] }

tlock_age/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9+
### Changed
10+
11+
- Update dependencies
12+
913
## [0.0.3] - 2023-07-23
1014

1115
### Fixed

tlock_age/Cargo.toml

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ categories = ["cryptography"]
1212
license = "MIT"
1313

1414
[dependencies]
15-
age = "0.9"
16-
age-core = "0.9"
17-
anyhow = "1.0.69"
18-
hex = "0.4.3"
19-
thiserror = "1.0.40"
15+
age = { workspace = true }
16+
age-core = { workspace = true }
17+
anyhow = { workspace = true }
18+
hex = { workspace = true }
19+
thiserror = { workspace = true }
2020
tlock = { path = "../tlock", version = "0.0.4" }
2121

2222
[dev-dependencies]
23-
criterion = { version = "0.4.0", features = ["html_reports"] }
24-
drand_core = "0.0.13"
25-
rand = "0.8.5"
23+
criterion = { workspace = true, features = ["html_reports"] }
24+
drand_core = { workspace = true }
25+
rand = { workspace = true, default-features = true }
2626

2727
[target.'cfg(wasm32)'.dev-dependencies]
28-
getrandom = { version = "0.2.8", features = ["js"] }
28+
getrandom = { workspace = true, features = ["js"] }
2929

3030
[target.'cfg(unix)'.dev-dependencies]
3131
pprof = { version = "0.11", features = ["criterion", "flamegraph"] }

0 commit comments

Comments
 (0)