Skip to content

Commit

Permalink
Merge wasmerio#1966
Browse files Browse the repository at this point in the history 
1966: Prepare for 1.0.0-rc1 release r=MarkMcCaskey a=MarkMcCaskey



# Review

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


Co-authored-by: Mark McCaskey <[email protected]>
  • Loading branch information
@bors
bors[bot] and Mark McCaskey authored Dec 23, 2020
2 parents fd38d73 + 1ac42e2 commit c6e8d78
Show file tree
Hide file tree
Showing 45 changed files with 214 additions and 215 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

## **[Unreleased]**

## 1.0.0-rc1 - 2020-12-23

### Added

* [#1894](https://github.com/wasmerio/wasmer/pull/1894) Added exports `wasmer::{CraneliftOptLevel, LLVMOptLevel}` to allow using `Cranelift::opt_level` and `LLVM::opt_level` directly via the `wasmer` crate
Expand Down
48 changes: 24 additions & 24 deletions Cargo.lock
View file

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
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer-workspace"
version = "1.0.0-beta2"
version = "1.0.0-rc1"
description = "Wasmer workspace"
authors = ["Wasmer Engineering Team <[email protected]>"]
repository = "https://github.com/wasmerio/wasmer"
Expand All @@ -10,21 +10,21 @@ publish = false
autoexamples = false

[dependencies]
wasmer = { version = "1.0.0-beta2", path = "lib/api", default-features = false }
wasmer-compiler = { version = "1.0.0-beta2", path = "lib/compiler" }
wasmer-compiler-cranelift = { version = "1.0.0-beta2", path = "lib/compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "1.0.0-beta2", path = "lib/compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "1.0.0-beta2", path = "lib/compiler-llvm", optional = true }
wasmer-emscripten = { version = "1.0.0-beta2", path = "lib/emscripten", optional = true }
wasmer-engine = { version = "1.0.0-beta2", path = "lib/engine" }
wasmer-engine-jit = { version = "1.0.0-beta2", path = "lib/engine-jit", optional = true }
wasmer-engine-native = { version = "1.0.0-beta2", path = "lib/engine-native", optional = true }
wasmer-engine-object-file = { version = "1.0.0-beta2", path = "lib/engine-object-file", optional = true }
wasmer-wasi = { version = "1.0.0-beta2", path = "lib/wasi", optional = true }
wasmer-wast = { version = "1.0.0-beta2", path = "tests/lib/wast", optional = true }
wasmer-cache = { version = "1.0.0-beta2", path = "lib/cache", optional = true }
wasmer-types = { version = "1.0.0-beta2", path = "lib/wasmer-types" }
wasmer-middlewares = { version = "1.0.0-beta2", path = "lib/middlewares", optional = true }
wasmer = { version = "1.0.0-rc1", path = "lib/api", default-features = false }
wasmer-compiler = { version = "1.0.0-rc1", path = "lib/compiler" }
wasmer-compiler-cranelift = { version = "1.0.0-rc1", path = "lib/compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "1.0.0-rc1", path = "lib/compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "1.0.0-rc1", path = "lib/compiler-llvm", optional = true }
wasmer-emscripten = { version = "1.0.0-rc1", path = "lib/emscripten", optional = true }
wasmer-engine = { version = "1.0.0-rc1", path = "lib/engine" }
wasmer-engine-jit = { version = "1.0.0-rc1", path = "lib/engine-jit", optional = true }
wasmer-engine-native = { version = "1.0.0-rc1", path = "lib/engine-native", optional = true }
wasmer-engine-object-file = { version = "1.0.0-rc1", path = "lib/engine-object-file", optional = true }
wasmer-wasi = { version = "1.0.0-rc1", path = "lib/wasi", optional = true }
wasmer-wast = { version = "1.0.0-rc1", path = "tests/lib/wast", optional = true }
wasmer-cache = { version = "1.0.0-rc1", path = "lib/cache", optional = true }
wasmer-types = { version = "1.0.0-rc1", path = "lib/wasmer-types" }
wasmer-middlewares = { version = "1.0.0-rc1", path = "lib/middlewares", optional = true }
cfg-if = "1.0"

[workspace]
Expand Down
15 changes: 6 additions & 9 deletions docs/migration_to_1.0.0.md
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
# Migrating from Wasmer 0.x to Wasmer 1.0.0

Wasmer 1.0.0 is currently in beta and is our primary focus. This document will
Wasmer 1.0.0 is getting ready for a full release and is our primary focus. This document will
describe the differences between Wasmer 0.x and Wasmer 1.0.0 and provide examples
to make migrating to the new API as simple as possible.

Some features are still under development during the beta of Wasmer 1.0.0. This document
will aim to make clear what these features are.

## Table of Contents

- [Rationale for changes in 1.0.0](#rationale-for-changes-in-100)
Expand Down Expand Up @@ -343,11 +340,11 @@ you'll be able to delegate most of the work to Wasmer:
```

[examples]: https://docs.wasmer.io/integrations/examples
[wasmer]: https://crates.io/crates/wasmer/1.0.0-beta1
[wasmer-wasi]: https://crates.io/crates/wasmer-wasi/1.0.0-beta1
[wasmer-emscripten]: https://crates.io/crates/wasmer-emscripten/1.0.0-beta1
[wasmer-engine]: https://crates.io/crates/wasmer-engine/1.0.0-beta1
[wasmer-compiler]: https://crates.io/crates/wasmer-compiler/1.0.0-beta1
[wasmer]: https://crates.io/crates/wasmer/1.0.0-rc1
[wasmer-wasi]: https://crates.io/crates/wasmer-wasi/1.0.0-rc1
[wasmer-emscripten]: https://crates.io/crates/wasmer-emscripten/1.0.0-rc1
[wasmer-engine]: https://crates.io/crates/wasmer-engine/1.0.0-rc1
[wasmer-compiler]: https://crates.io/crates/wasmer-compiler/1.0.0-rc1
[wasmer.io]: https://wasmer.io
[wasmer-nightly]: https://github.com/wasmerio/wasmer-nightly/
[getting-started]: https://docs.wasmer.io/ecosystem/wasmer/getting-started
Expand Down
22 changes: 11 additions & 11 deletions lib/api/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer"
version = "1.0.0-beta2"
version = "1.0.0-rc1"
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 = "1.0.0-beta2" }
wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "1.0.0-beta2", optional = true }
wasmer-compiler-cranelift = { path = "../compiler-cranelift", version = "1.0.0-beta2", optional = true }
wasmer-compiler-llvm = { path = "../compiler-llvm", version = "1.0.0-beta2", optional = true }
wasmer-compiler = { path = "../compiler", version = "1.0.0-beta2" }
wasmer-derive = { path = "../derive", version = "1.0.0-beta2" }
wasmer-engine = { path = "../engine", version = "1.0.0-beta2" }
wasmer-engine-jit = { path = "../engine-jit", version = "1.0.0-beta2", optional = true }
wasmer-engine-native = { path = "../engine-native", version = "1.0.0-beta2", optional = true }
wasmer-types = { path = "../wasmer-types", version = "1.0.0-beta2" }
wasmer-vm = { path = "../vm", version = "1.0.0-rc1" }
wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "1.0.0-rc1", optional = true }
wasmer-compiler-cranelift = { path = "../compiler-cranelift", version = "1.0.0-rc1", optional = true }
wasmer-compiler-llvm = { path = "../compiler-llvm", version = "1.0.0-rc1", optional = true }
wasmer-compiler = { path = "../compiler", version = "1.0.0-rc1" }
wasmer-derive = { path = "../derive", version = "1.0.0-rc1" }
wasmer-engine = { path = "../engine", version = "1.0.0-rc1" }
wasmer-engine-jit = { path = "../engine-jit", version = "1.0.0-rc1", optional = true }
wasmer-engine-native = { path = "../engine-native", version = "1.0.0-rc1", optional = true }
wasmer-types = { path = "../wasmer-types", version = "1.0.0-rc1" }
indexmap = { version = "1.4", features = ["serde-1"] }
cfg-if = "0.1"
wat = { version = "1.0", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion lib/api/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Add to your `Cargo.toml`

```toml
[dependencies]
wasmer = "1.0.0-beta"
wasmer = "1.0.0-rc"
```

```rust
Expand Down
28 changes: 14 additions & 14 deletions lib/c-api/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmer-c-api"
version = "1.0.0-beta2"
version = "1.0.0-rc1"
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 = "1.0.0-beta2", path = "../api", default-features = false }
wasmer-compiler = { version = "1.0.0-beta2", path = "../compiler" }
wasmer-compiler-cranelift = { version = "1.0.0-beta2", path = "../compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "1.0.0-beta2", path = "../compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "1.0.0-beta2", path = "../compiler-llvm", optional = true }
wasmer-emscripten = { version = "1.0.0-beta2", path = "../emscripten", optional = true }
wasmer-engine = { version = "1.0.0-beta2", path = "../engine" }
wasmer-engine-jit = { version = "1.0.0-beta2", path = "../engine-jit", optional = true }
wasmer-engine-native = { version = "1.0.0-beta2", path = "../engine-native", optional = true }
wasmer-engine-object-file = { version = "1.0.0-beta2", path = "../engine-object-file", optional = true }
wasmer-wasi = { version = "1.0.0-beta2", path = "../wasi", optional = true }
wasmer-types = { version = "1.0.0-beta2", path = "../wasmer-types" }
wasmer = { version = "1.0.0-rc1", path = "../api", default-features = false }
wasmer-compiler = { version = "1.0.0-rc1", path = "../compiler" }
wasmer-compiler-cranelift = { version = "1.0.0-rc1", path = "../compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "1.0.0-rc1", path = "../compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "1.0.0-rc1", path = "../compiler-llvm", optional = true }
wasmer-emscripten = { version = "1.0.0-rc1", path = "../emscripten", optional = true }
wasmer-engine = { version = "1.0.0-rc1", path = "../engine" }
wasmer-engine-jit = { version = "1.0.0-rc1", path = "../engine-jit", optional = true }
wasmer-engine-native = { version = "1.0.0-rc1", path = "../engine-native", optional = true }
wasmer-engine-object-file = { version = "1.0.0-rc1", path = "../engine-object-file", optional = true }
wasmer-wasi = { version = "1.0.0-rc1", path = "../wasi", optional = true }
wasmer-types = { version = "1.0.0-rc1", path = "../wasmer-types" }
cfg-if = "1.0"
lazy_static = "1.4"
libc = { version = "^0.2", default-features = false }
Expand All @@ -37,7 +37,7 @@ typetag = { version = "0.1", optional = true }
paste = "1.0"
# for generating code in the same way thot the wasm-c-api does
# Commented out for now until we can find a solution to the exported function problem
# wasmer-wasm-c-api = { version = "1.0.0-beta2", path = "crates/wasm-c-api" }
# wasmer-wasm-c-api = { version = "1.0.0-rc1", path = "crates/wasm-c-api" }

[dev-dependencies]
inline-c = "0.1.4"
Expand Down
Loading

0 comments on commit c6e8d78

Please sign in to comment.