Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release-5.1.0' into 5198-cli-sup…
Browse files Browse the repository at this point in the history
…port-wasm_c_api-backends-together-with-native-ones
  • Loading branch information
xdoardo committed Dec 3, 2024
2 parents 8785594 + 5790d22 commit ff0c2be
Show file tree
Hide file tree
Showing 30 changed files with 118 additions and 119 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Looking for changes that affect our C API? See the [C API Changelog](lib/c-api/C
## 5.0.2 - 22/11/2024

This release mostly consists of bug fixes and clean ups.
## 5.1.0 - 22/11/2024

## Added

Expand Down
44 changes: 22 additions & 22 deletions Cargo.lock

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

24 changes: 12 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ rust-version.workspace = true
version.workspace = true

[dependencies]
wasmer = { version = "=5.0.2", path = "lib/api", default-features = false }
wasmer-compiler = { version = "=5.0.2", path = "lib/compiler", features = [
wasmer = { version = "=5.1.0", path = "lib/api", default-features = false }
wasmer-compiler = { version = "=5.1.0", path = "lib/compiler", features = [
"compiler",
], optional = true }
wasmer-compiler-cranelift = { version = "=5.0.2", path = "lib/compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "=5.0.2", path = "lib/compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "=5.0.2", path = "lib/compiler-llvm", optional = true }
wasmer-compiler-cranelift = { version = "=5.1.0", path = "lib/compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "=5.1.0", path = "lib/compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "=5.1.0", path = "lib/compiler-llvm", optional = true }
wasmer-wasix = { path = "lib/wasix", optional = true }
wasmer-wast = { version = "=5.0.2", path = "tests/lib/wast", optional = true }
wasi-test-generator = { version = "=5.0.2", path = "tests/wasi-wast", optional = true }
wasmer-cache = { version = "=5.0.2", path = "lib/cache", optional = true }
wasmer-types = { version = "=5.0.2", path = "lib/types" }
wasmer-middlewares = { version = "=5.0.2", path = "lib/middlewares", optional = true }
wasmer-wast = { version = "=5.1.0", path = "tests/lib/wast", optional = true }
wasi-test-generator = { version = "=5.1.0", path = "tests/wasi-wast", optional = true }
wasmer-cache = { version = "=5.1.0", path = "lib/cache", optional = true }
wasmer-types = { version = "=5.1.0", path = "lib/types" }
wasmer-middlewares = { version = "=5.1.0", path = "lib/middlewares", optional = true }

# Third party dependencies
cfg-if = "1.0"
Expand Down Expand Up @@ -83,7 +83,7 @@ homepage = "https://wasmer.io/"
license = "MIT"
repository = "https://github.com/wasmerio/wasmer"
rust-version = "1.81"
version = "5.0.2"
version = "5.1.0"

[workspace.dependencies]
# Repo-local crates
Expand Down Expand Up @@ -132,7 +132,7 @@ glob = "0.3"
rustc_version = "0.4"

[dev-dependencies]
wasmer = { version = "=5.0.2", path = "lib/api", features = [
wasmer = { version = "=5.1.0", path = "lib/api", features = [
"compiler",
"singlepass",
"sys",
Expand Down
23 changes: 11 additions & 12 deletions lib/api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ derive_more = { version = "1.0.0", features = ["from", "debug"] }
# Dependencies and Development Dependencies for `sys`.
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
# - Mandatory dependencies for `sys`.
wasmer-vm = { path = "../vm", version = "=5.0.2" }
wasmer-compiler = { path = "../compiler", version = "=5.0.2" }
wasmer-derive = { path = "../derive", version = "=5.0.2" }
wasmer-types = { path = "../types", version = "=5.0.2" }
wasmer-vm = { path = "../vm", version = "=5.1.0" }
wasmer-compiler = { path = "../compiler", version = "=5.1.0" }
wasmer-derive = { path = "../derive", version = "=5.1.0" }
wasmer-types = { path = "../types", version = "=5.1.0" }
target-lexicon = { version = "0.12.2", default-features = false }
# - Optional dependencies for `sys`.
wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "=5.0.2", optional = true }
wasmer-compiler-cranelift = { path = "../compiler-cranelift", version = "=5.0.2", optional = true }
wasmer-compiler-llvm = { path = "../compiler-llvm", version = "=5.0.2", optional = true }
wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "=5.1.0", optional = true }
wasmer-compiler-cranelift = { path = "../compiler-cranelift", version = "=5.1.0", optional = true }
wasmer-compiler-llvm = { path = "../compiler-llvm", version = "=5.1.0", optional = true }

wasm-bindgen = { version = "0.2.74", optional = true }
js-sys = { version = "0.3.51", optional = true }
Expand All @@ -79,17 +79,17 @@ windows-sys = "0.59"
wat = "1.0"
tempfile = "3.6.0"
anyhow = "1.0"
macro-wasmer-universal-test = { version = "5.0.2", path = "./macro-wasmer-universal-test" }
macro-wasmer-universal-test = { version = "5.1.0", path = "./macro-wasmer-universal-test" }

# Dependencies and Develoment Dependencies for `js`.
[target.'cfg(target_arch = "wasm32")'.dependencies]
# - Mandatory dependencies for `js`.
wasmer-types = { path = "../types", version = "=5.0.2", default-features = false, features = [
wasmer-types = { path = "../types", version = "=5.1.0", default-features = false, features = [
"std",
] }
wasm-bindgen = "0.2.74"
js-sys = "0.3.51"
wasmer-derive = { path = "../derive", version = "=5.0.2" }
wasmer-derive = { path = "../derive", version = "=5.1.0" }
# - Optional dependencies for `js`.
wasmparser = { workspace = true, default-features = false, optional = true }
hashbrown = { version = "0.11", optional = true }
Expand All @@ -102,8 +102,7 @@ target-lexicon = { workspace = true }
wat = "1.0"
anyhow = "1.0"
wasm-bindgen-test = "0.3.0"
macro-wasmer-universal-test = { version = "5.0.2", path = "./macro-wasmer-universal-test" }

macro-wasmer-universal-test = { version = "5.1.0", path = "./macro-wasmer-universal-test" }
# Specific to `js`.
#
# `wasm-opt` is on by default in for the release profile, but it can be
Expand Down
2 changes: 1 addition & 1 deletion lib/api/macro-wasmer-universal-test/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "macro-wasmer-universal-test"
version = "5.0.2"
version = "5.1.0"
edition = "2021"
license = "MIT"
description = "Universal test macro for wasmer-test"
Expand Down
14 changes: 7 additions & 7 deletions lib/c-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ crate-type = ["staticlib", "cdylib"] #"cdylib", "rlib", "staticlib"]
[dependencies]
# We rename `wasmer` to `wasmer-api` to avoid the conflict with this
# library name (see `[lib]`).
wasmer-api = { version = "=5.0.2", path = "../api", default-features = false, package = "wasmer" }
wasmer-compiler = { version = "=5.0.2", path = "../compiler", optional = true }
wasmer-compiler-cranelift = { version = "=5.0.2", path = "../compiler-cranelift", optional = true }
wasmer-compiler-llvm = { version = "=5.0.2", path = "../compiler-llvm", optional = true }
wasmer-compiler-singlepass = { version = "=5.0.2", path = "../compiler-singlepass", optional = true }
wasmer-middlewares = { version = "=5.0.2", path = "../middlewares", optional = true }
wasmer-types = { version = "=5.0.2", path = "../types" }
wasmer-api = { version = "=5.1.0", path = "../api", default-features = false, package = "wasmer" }
wasmer-compiler = { version = "=5.1.0", path = "../compiler", optional = true }
wasmer-compiler-cranelift = { version = "=5.1.0", path = "../compiler-cranelift", optional = true }
wasmer-compiler-llvm = { version = "=5.1.0", path = "../compiler-llvm", optional = true }
wasmer-compiler-singlepass = { version = "=5.1.0", path = "../compiler-singlepass", optional = true }
wasmer-middlewares = { version = "=5.1.0", path = "../middlewares", optional = true }
wasmer-types = { version = "=5.1.0", path = "../types" }
wasmer-wasix = { path = "../wasix", version="=0.32.0", features = ["host-fs", "host-vnet"], optional = true }
webc = { workspace = true, optional = true }
virtual-fs = { version = "0.20.0", path = "../virtual-fs", optional = true, default-features = false, features = ["static-fs"] }
Expand Down
4 changes: 2 additions & 2 deletions lib/c-api/examples/wasmer-capi-examples-runner/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer-capi-examples-runner"
version = "5.0.2"
version = "5.1.0"
edition = "2021"
license = "MIT"
description = "wasmer-capi-examples-runner"
Expand All @@ -9,4 +9,4 @@ description = "wasmer-capi-examples-runner"
cc = "1.0"
target-lexicon = "0.11"
regex = "1.6"
walkdir = "2.3.2"
walkdir = "2.3.2"
4 changes: 2 additions & 2 deletions lib/c-api/tests/wasmer-c-api-test-runner/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer-c-api-test-runner"
version = "5.0.2"
version = "5.1.0"
edition = "2021"
license = "MIT"
description = "wasmer-c-api-test-runner"
Expand All @@ -9,4 +9,4 @@ description = "wasmer-c-api-test-runner"
cc = "1.0"
target-lexicon = "0.11"
regex = "1.6"
walkdir = "2.3.2"
walkdir = "2.3.2"
6 changes: 3 additions & 3 deletions lib/cache/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ rust-version.workspace = true
version.workspace = true

[dependencies]
wasmer = { path = "../api", version = "=5.0.2", default-features = false }
wasmer = { path = "../api", version = "=5.1.0", default-features = false }
hex = "0.4"
thiserror = "1"
blake3 = "1.0"
Expand All @@ -26,8 +26,8 @@ clap_derive = { version = "=4.4.7" }
clap_lex = { version = "=0.6.0" }
tempfile = "3.6.0"
rand = "0.8.3"
wasmer = { path = "../api", version = "=5.0.2", default-features = false, features = ["sys", "cranelift"] }
wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "=5.0.2" }
wasmer = { path = "../api", version = "=5.1.0", default-features = false, features = ["sys", "cranelift"] }
wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "=5.1.0" }

[features]
default = ["filesystem"]
Expand Down
Loading

0 comments on commit ff0c2be

Please sign in to comment.