Merge pull request #112 from dotxlem/uprev-wasmtime

Uprev to wasmtime 18
akkoro · Mar 4, 2024 · 76cf998 · 76cf998
2 parents cb87889 + 36f4102
commit 76cf998
Show file tree

Hide file tree

Showing 16 changed files with 12,611 additions and 12,755 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -36,8 +36,7 @@ walkdir = "2.3"
 z85 = "3"
 zip = "0.6"
 
-wasmtime = "11.0"
-#wasmtime = { git = "https://github.com/bytecodealliance/wasmtime.git", package = "wasmtime", rev = "a330867" }
+wasmtime = "18.0"
 
 assemblylift-core = { version = "0.4.0-beta.0", path = "../core" }
 assemblylift-core-iomod = { version = "0.4.0-beta.0", path = "../core/iomod" }

diff --git a/cli/src/commands/cast/wasm/wasi_snapshot_preview1.command.wasm b/cli/src/commands/cast/wasm/wasi_snapshot_preview1.command.wasm
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -25,23 +25,14 @@ tokio = { version = "1.4", features = ["full"] }
 tracing = "0.1"
 uuid = { version = "1.3", features = ["v4", "fast-rng"] }
 
-#assemblylift-wasi-host = { git = "https://github.com/bytecodealliance/preview2-prototyping.git", rev = "4e84fc2", package = "host" }
-#assemblylift-wasi-common = { git = "https://github.com/bytecodealliance/preview2-prototyping.git", rev = "4e84fc2", package = "wasi-common" }
-#assemblylift-wasi-cap-std-sync = { git = "https://github.com/bytecodealliance/preview2-prototyping.git", rev = "4e84fc2", package = "wasi-cap-std-sync" }
-wasmtime = { version = "11.0", features = ["default", "component-model"] }
-wasmtime-wasi = { version = "11.0", features = ["preview2"] }
-#wasmtime = { git = "https://github.com/bytecodealliance/wasmtime.git", package = "wasmtime", rev = "a330867" } 
-#wasmtime-wasi = { git = "https://github.com/bytecodealliance/wasmtime.git", package = "wasmtime-wasi", rev = "a330867" }
-#wasm-encoder = "0.29"
-wasm-encoder = { git = "https://github.com/bytecodealliance/wasm-tools.git", package = "wasm-encoder", rev = "0263c2f" }
-#wasm-tools = "1.0"
-wit-tools = { git = "https://github.com/bytecodealliance/wasm-tools.git", package = "wasm-tools", rev = "0263c2f" }
-wat = "1.0"
-wast = "60.0"
-#wit-component = "0.11.0"
-wit-component = { git = "https://github.com/bytecodealliance/wasm-tools.git", package = "wit-component", rev = "0263c2f" }
-#wit-parser = "0.8.0"
-wit-parser = { git = "https://github.com/bytecodealliance/wasm-tools.git", package = "wit-parser", rev = "0263c2f" }
+wasmtime = { version = "18.0", features = ["default", "component-model"] }
+wasmtime-wasi = { version = "18.0", features = ["preview2"] }
+
+wat = "1.0.85"
+wast = "70.0.2"
+wasm-encoder = "0.41"
+wit-component = "0.20.1"
+wit-parser = "0.13.1"
 
 assemblylift-core-iomod = { path = "./iomod" }
 

diff --git a/core/guest/Cargo.toml b/core/guest/Cargo.toml
@@ -13,6 +13,6 @@ clap = { version = "4", features = ["cargo"] }
 direct-executor = "0.3"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-wit-bindgen = "0.8.0"
+wit-bindgen = "0.15"
 
 assemblylift-core-guest-macros = { version = "0.4.0-beta.0", path = "./macros" }