Skip to content

Commit 0d5b545

Browse files
authored
Update dependencies versions (#756)
Some dependencies have new versions. It is a good chance to bump the dependency versions, too, after we bump the Rust toolchain versions. One notable dependency is `enum-map`. Its latest version is 2.4.2, but we locked its version to 2.1.0 because it required a newer Rust toolchain. Now we can depend on its latest version, instead. We also changed the `rust-version` property in `Cargo.toml` to `1.61.0` because `enum-map-derive` depends on that, and `1.61.0` is not new compared to the `1.66.1` we use. See: #507 (comment) This closes #693
1 parent 8f30147 commit 0d5b545

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

.github/workflows/post-review-ci.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ jobs:
3434
repository: ${{ needs.binding-refs.outputs.v8_binding_repo }}
3535
path: mmtk-v8
3636
ref: ${{ needs.binding-refs.outputs.v8_binding_ref }}
37+
- name: Use mmtk-core Rust toolchain for bindings
38+
run: |
39+
cp mmtk-core/rust-toolchain mmtk-v8/mmtk
3740
- name: Overwrite MMTk core in V8 binding
3841
run: |
3942
rm -rf mmtk-v8/repos/*
@@ -68,6 +71,9 @@ jobs:
6871
repository: ${{ needs.binding-refs.outputs.openjdk_binding_repo }}
6972
path: mmtk-openjdk
7073
ref: ${{ needs.binding-refs.outputs.openjdk_binding_ref }}
74+
- name: Use mmtk-core Rust toolchain for bindings
75+
run: |
76+
cp mmtk-core/rust-toolchain mmtk-openjdk/mmtk
7177
- name: Setup
7278
run: |
7379
cd mmtk-openjdk
@@ -76,7 +82,8 @@ jobs:
7682
sed -i 's/^mmtk[[:space:]]=/#ci:mmtk=/g' mmtk/Cargo.toml
7783
sed -i 's/^#[[:space:]]mmtk/mmtk/g' mmtk/Cargo.toml
7884
- name: Overwrite MMTk core in openjdk binding
79-
run: cp -r mmtk-core mmtk-openjdk/repos/
85+
run: |
86+
cp -r mmtk-core mmtk-openjdk/repos/
8087
- name: Test
8188
run: |
8289
cd mmtk-openjdk
@@ -99,6 +106,9 @@ jobs:
99106
repository: ${{ needs.binding-refs.outputs.jikesrvm_binding_repo }}
100107
path: mmtk-jikesrvm
101108
ref: ${{ needs.binding-refs.outputs.jikesrvm_binding_ref }}
109+
- name: Use mmtk-core Rust toolchain for bindings
110+
run: |
111+
cp mmtk-core/rust-toolchain mmtk-jikesrvm/mmtk
102112
- name: Setup
103113
run: |
104114
cd mmtk-jikesrvm
@@ -131,6 +141,9 @@ jobs:
131141
repository: ${{ needs.binding-refs.outputs.julia_binding_repo }}
132142
path: mmtk-julia
133143
ref: ${{ needs.binding-refs.outputs.julia_binding_ref }}
144+
- name: Use mmtk-core Rust toolchain for bindings
145+
run: |
146+
cp mmtk-core/rust-toolchain mmtk-julia/mmtk
134147
- name: Setup
135148
run: |
136149
cd mmtk-julia

Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repository = "https://github.com/mmtk/mmtk-core"
1010
readme = "README.md"
1111
categories = ["memory-management"]
1212
keywords = ["gc", "garbage", "collection", "garbage-collection", "allocation"]
13-
rust-version = "1.57.0"
13+
rust-version = "1.61.0"
1414
build = "build.rs"
1515

1616
[lib]
@@ -23,19 +23,19 @@ doctest = false
2323
mmtk-macros = { version = "0.16.0", path = "macros/" }
2424

2525
libc = "0.2"
26-
jemalloc-sys = { version = "0.3.2", features = ["disable_initial_exec_tls"], optional = true }
26+
jemalloc-sys = { version = "0.5.3", features = ["disable_initial_exec_tls"], optional = true }
2727
mimalloc-sys = { version = "0.1.6", optional = true }
2828
lazy_static = "1.1"
2929
log = { version = "0.4", features = ["max_level_trace", "release_max_level_off"] }
3030
crossbeam = "0.8.1"
3131
num_cpus = "1.8"
32-
enum-map = "=2.1"
32+
enum-map = "2.4.2"
3333
downcast-rs = "1.1.1"
34-
atomic-traits = "0.2.0"
34+
atomic-traits = "0.3.0"
3535
atomic = "0.5.1"
3636
num-traits = "0.2"
37-
spin = "0.5.2"
38-
env_logger = "0.8.2"
37+
spin = "0.9.5"
38+
env_logger = "0.10.0"
3939
pfm = { version = "0.1.0-beta.1", optional = true }
4040
atomic_refcell = "0.1.7"
4141
strum = "0.24"
@@ -46,11 +46,11 @@ sys-info = "0.9"
4646
regex = "1.7.0"
4747

4848
[dev-dependencies]
49-
rand = "0.7.3"
49+
rand = "0.8.5"
5050
paste = "1.0.8"
5151

5252
[build-dependencies]
53-
built = { version = "0.5.1", features = ["git2"] }
53+
built = { version = "0.6.0", features = ["git2"] }
5454

5555
[features]
5656
default = []

0 commit comments

Comments
 (0)