Skip to content

Commit

Permalink
Merge #2423
Browse files Browse the repository at this point in the history
2423: Prepare for 2.0.0 release r=MarkMcCaskey a=MarkMcCaskey


# Review

- [x] Add a short description of the change to the CHANGELOG.md file


Co-authored-by: Mark McCaskey <mark@wasmer.io>
  • Loading branch information
bors[bot] and MarkMcCaskey committed Jun 15, 2021
2 parents e6c8fcd + 0c0fdad commit 327192c
Show file tree
Hide file tree
Showing 31 changed files with 162 additions and 160 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -8,6 +8,8 @@ Looking for changes that affect our C API? See the [C API Changelog](lib/c-api/C

## **[Unreleased]**

## 2.0.0 - 2020/06/16

### Added
- [#2411](https://github.com/wasmerio/wasmer/pull/2411) Extract types from `wasi` to a new `wasi-types` crate.
- [#2390](https://github.com/wasmerio/wasmer/pull/2390) Make `wasmer-vm` to compile on Windows 32bits.
Expand Down
50 changes: 25 additions & 25 deletions Cargo.lock

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

32 changes: 16 additions & 16 deletions Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "wasmer-workspace"
version = "2.0.0-rc2"
version = "2.0.0"
description = "Wasmer workspace"
authors = ["Wasmer Engineering Team <engineering@wasmer.io>"]
repository = "https://github.com/wasmerio/wasmer"
Expand All @@ -10,21 +10,21 @@ publish = false
autoexamples = false

[dependencies]
wasmer = { version = "2.0.0-rc2", path = "lib/api", default-features = false }
wasmer-compiler = { version = "2.0.0-rc2", path = "lib/compiler" }
wasmer-compiler-cranelift = { version = "2.0.0-rc2", path = "lib/compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "2.0.0-rc2", path = "lib/compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "2.0.0-rc2", path = "lib/compiler-llvm", optional = true }
wasmer-emscripten = { version = "2.0.0-rc2", path = "lib/emscripten", optional = true }
wasmer-engine = { version = "2.0.0-rc2", path = "lib/engine" }
wasmer-engine-universal = { version = "2.0.0-rc2", path = "lib/engine-universal", optional = true }
wasmer-engine-dylib = { version = "2.0.0-rc2", path = "lib/engine-dylib", optional = true }
wasmer-engine-staticlib = { version = "2.0.0-rc2", path = "lib/engine-staticlib", optional = true }
wasmer-wasi = { version = "2.0.0-rc2", path = "lib/wasi", optional = true }
wasmer-wast = { version = "2.0.0-rc2", path = "tests/lib/wast", optional = true }
wasmer-cache = { version = "2.0.0-rc2", path = "lib/cache", optional = true }
wasmer-types = { version = "2.0.0-rc2", path = "lib/types" }
wasmer-middlewares = { version = "2.0.0-rc2", path = "lib/middlewares", optional = true }
wasmer = { version = "2.0.0", path = "lib/api", default-features = false }
wasmer-compiler = { version = "2.0.0", path = "lib/compiler" }
wasmer-compiler-cranelift = { version = "2.0.0", path = "lib/compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "2.0.0", path = "lib/compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "2.0.0", path = "lib/compiler-llvm", optional = true }
wasmer-emscripten = { version = "2.0.0", path = "lib/emscripten", optional = true }
wasmer-engine = { version = "2.0.0", path = "lib/engine" }
wasmer-engine-universal = { version = "2.0.0", path = "lib/engine-universal", optional = true }
wasmer-engine-dylib = { version = "2.0.0", path = "lib/engine-dylib", optional = true }
wasmer-engine-staticlib = { version = "2.0.0", path = "lib/engine-staticlib", optional = true }
wasmer-wasi = { version = "2.0.0", path = "lib/wasi", optional = true }
wasmer-wast = { version = "2.0.0", path = "tests/lib/wast", optional = true }
wasmer-cache = { version = "2.0.0", path = "lib/cache", optional = true }
wasmer-types = { version = "2.0.0", path = "lib/types" }
wasmer-middlewares = { version = "2.0.0", path = "lib/middlewares", optional = true }
cfg-if = "1.0"

[workspace]
Expand Down
22 changes: 11 additions & 11 deletions lib/api/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "wasmer"
version = "2.0.0-rc2"
version = "2.0.0"
description = "High-performant WebAssembly runtime"
categories = ["wasm"]
keywords = ["wasm", "webassembly", "runtime", "vm"]
Expand All @@ -11,16 +11,16 @@ readme = "README.md"
edition = "2018"

[dependencies]
wasmer-vm = { path = "../vm", version = "2.0.0-rc2" }
wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "2.0.0-rc2", optional = true }
wasmer-compiler-cranelift = { path = "../compiler-cranelift", version = "2.0.0-rc2", optional = true }
wasmer-compiler-llvm = { path = "../compiler-llvm", version = "2.0.0-rc2", optional = true }
wasmer-compiler = { path = "../compiler", version = "2.0.0-rc2" }
wasmer-derive = { path = "../derive", version = "2.0.0-rc2" }
wasmer-engine = { path = "../engine", version = "2.0.0-rc2" }
wasmer-engine-universal = { path = "../engine-universal", version = "2.0.0-rc2", optional = true }
wasmer-engine-dylib = { path = "../engine-dylib", version = "2.0.0-rc2", optional = true }
wasmer-types = { path = "../types", version = "2.0.0-rc2" }
wasmer-vm = { path = "../vm", version = "2.0.0" }
wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "2.0.0", optional = true }
wasmer-compiler-cranelift = { path = "../compiler-cranelift", version = "2.0.0", optional = true }
wasmer-compiler-llvm = { path = "../compiler-llvm", version = "2.0.0", optional = true }
wasmer-compiler = { path = "../compiler", version = "2.0.0" }
wasmer-derive = { path = "../derive", version = "2.0.0" }
wasmer-engine = { path = "../engine", version = "2.0.0" }
wasmer-engine-universal = { path = "../engine-universal", version = "2.0.0", optional = true }
wasmer-engine-dylib = { path = "../engine-dylib", version = "2.0.0", optional = true }
wasmer-types = { path = "../types", version = "2.0.0" }
indexmap = { version = "1.6", features = ["serde-1"] }
cfg-if = "1.0"
wat = { version = "1.0", optional = true }
Expand Down
26 changes: 13 additions & 13 deletions lib/c-api/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "wasmer-c-api"
version = "2.0.0-rc2"
version = "2.0.0"
description = "Wasmer C API library"
categories = ["wasm", "api-bindings"]
keywords = ["wasm", "webassembly", "runtime"]
Expand All @@ -15,18 +15,18 @@ edition = "2018"
crate-type = ["cdylib", "rlib", "staticlib"]

[dependencies]
wasmer = { version = "2.0.0-rc2", path = "../api", default-features = false }
wasmer-compiler-cranelift = { version = "2.0.0-rc2", path = "../compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "2.0.0-rc2", path = "../compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "2.0.0-rc2", path = "../compiler-llvm", optional = true }
wasmer-emscripten = { version = "2.0.0-rc2", path = "../emscripten", optional = true }
wasmer-engine = { version = "2.0.0-rc2", path = "../engine" }
wasmer-engine-universal = { version = "2.0.0-rc2", path = "../engine-universal", optional = true }
wasmer-engine-dylib = { version = "2.0.0-rc2", path = "../engine-dylib", optional = true }
wasmer-engine-staticlib = { version = "2.0.0-rc2", path = "../engine-staticlib", optional = true }
wasmer-middlewares = { version = "2.0.0-rc2", path = "../middlewares", optional = true }
wasmer-wasi = { version = "2.0.0-rc2", path = "../wasi", optional = true }
wasmer-types = { version = "2.0.0-rc2", path = "../types" }
wasmer = { version = "2.0.0", path = "../api", default-features = false }
wasmer-compiler-cranelift = { version = "2.0.0", path = "../compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "2.0.0", path = "../compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "2.0.0", path = "../compiler-llvm", optional = true }
wasmer-emscripten = { version = "2.0.0", path = "../emscripten", optional = true }
wasmer-engine = { version = "2.0.0", path = "../engine" }
wasmer-engine-universal = { version = "2.0.0", path = "../engine-universal", optional = true }
wasmer-engine-dylib = { version = "2.0.0", path = "../engine-dylib", optional = true }
wasmer-engine-staticlib = { version = "2.0.0", path = "../engine-staticlib", optional = true }
wasmer-middlewares = { version = "2.0.0", path = "../middlewares", optional = true }
wasmer-wasi = { version = "2.0.0", path = "../wasi", optional = true }
wasmer-types = { version = "2.0.0", path = "../types" }
enumset = "1.0"
cfg-if = "1.0"
lazy_static = "1.4"
Expand Down
4 changes: 2 additions & 2 deletions lib/c-api/wasmer.h
Expand Up @@ -75,11 +75,11 @@
#define WASMER_MIDDLEWARES_ENABLED

// This file corresponds to the following Wasmer version.
#define WASMER_VERSION "2.0.0-rc2"
#define WASMER_VERSION "2.0.0"
#define WASMER_VERSION_MAJOR 2
#define WASMER_VERSION_MINOR 0
#define WASMER_VERSION_PATCH 0
#define WASMER_VERSION_PRE "rc2"
#define WASMER_VERSION_PRE ""

#endif // WASMER_H_PRELUDE

Expand Down
10 changes: 5 additions & 5 deletions lib/cache/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "wasmer-cache"
version = "2.0.0-rc2"
version = "2.0.0"
description = "Cache system for Wasmer WebAssembly runtime"
categories = ["wasm", "caching"]
keywords = ["wasm", "webassembly", "cache"]
Expand All @@ -11,7 +11,7 @@ readme = "README.md"
edition = "2018"

[dependencies]
wasmer = { path = "../api", version = "2.0.0-rc2", default-features = false }
wasmer = { path = "../api", version = "2.0.0", default-features = false }
hex = "0.4"
thiserror = "1"
blake3 = "0.3"
Expand All @@ -20,9 +20,9 @@ blake3 = "0.3"
criterion = "0.3"
tempfile = "3"
rand = "0.8.3"
wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "2.0.0-rc2" }
wasmer-engine-universal = { path = "../engine-universal", version = "2.0.0-rc2" }
wasmer-engine-dylib = { path = "../engine-dylib", version = "2.0.0-rc2" }
wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "2.0.0" }
wasmer-engine-universal = { path = "../engine-universal", version = "2.0.0" }
wasmer-engine-dylib = { path = "../engine-dylib", version = "2.0.0" }

[[bench]]
name = "bench_filesystem_cache"
Expand Down

0 comments on commit 327192c

Please sign in to comment.