adopt wit-dylib

Cargo.toml

@@ -14,22 +14,23 @@ clap = { version = "4.5.20", features = ["derive"] }
 tar = "0.4.42"
 tempfile = "3.13.0"
 zstd = "0.13.2"
-componentize-py-shared = { path = "shared" }
-wasm-encoder = "0.239.0"
-wit-parser = "0.239.0"
-wit-component = "0.239.0"
-wasmparser = "0.239.0"
+# TODO: switch to wasm-tools 1.241.0 when available
+wasm-encoder = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "b1d8ff59" }
+wit-dylib = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "b1d8ff59" }
+wit-parser = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "b1d8ff59" }
+wit-component = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "b1d8ff59" }
+wasmparser = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "b1d8ff59" }
 indexmap = "2.6.0"
 bincode = "1.3.3"
 heck = "0.5.0"
 pyo3 = { version = "0.26.0", features = [
     "abi3-py39",
     "extension-module",
 ], optional = true }
-wasmtime = "37.0.2"
+wasmtime = { version = "37.0.2", features = [ "component-model-async" ] }
 wasmtime-wasi = "37.0.2"
 once_cell = "1.20.2"
-component-init-transform = { version = "0.2", git = "https://github.com/dicej/component-init", rev = "3800ab6e" }
+component-init-transform = { git = "https://github.com/dicej/component-init", rev = "3b9680fe" }
 async-trait = "0.1.83"
 futures = "0.3.31"
 tokio = { version = "1.41.0", features = [
@@ -80,5 +81,4 @@ test-generator = { path = "test-generator" }
 flate2 = "1.1.1"
 
 [workspace]
-members = ["runtime", "shared", "test-generator"]
-
+members = ["runtime", "test-generator"]

examples/cli/README.md

@@ -9,15 +9,15 @@ run a Python-based component targetting the [wasi-cli] `command` world.
 
 ## Prerequisites
 
-* `Wasmtime` 37.0.1 or later
+* `Wasmtime` 37.0.0 or later
 * `componentize-py` 0.18.0
 
 Below, we use [Rust](https://rustup.rs/)'s `cargo` to install `Wasmtime`.  If
 you don't have `cargo`, you can download and install from
-https://github.com/bytecodealliance/wasmtime/releases/tag/v37.0.1.
+https://github.com/bytecodealliance/wasmtime/releases/tag/v37.0.0.
 
 ```
-cargo install --version 37.0.1 wasmtime-cli
+cargo install --version 37.0.0 wasmtime-cli
 pip install componentize-py==0.18.0
 ```
 

examples/http/README.md

@@ -9,15 +9,15 @@ run a Python-based component targetting the [wasi-http] `proxy` world.
 
 ## Prerequisites
 
-* `Wasmtime` 37.0.1 or later
+* `Wasmtime` 37.0.0 or later
 * `componentize-py` 0.18.0
 
 Below, we use [Rust](https://rustup.rs/)'s `cargo` to install `Wasmtime`.  If
 you don't have `cargo`, you can download and install from
-https://github.com/bytecodealliance/wasmtime/releases/tag/v37.0.1.
+https://github.com/bytecodealliance/wasmtime/releases/tag/v37.0.0.
 
 ```
-cargo install --version 37.0.1 wasmtime-cli
+cargo install --version 37.0.0 wasmtime-cli
 pip install componentize-py==0.18.0
 ```
 

examples/matrix-math/README.md

@@ -10,7 +10,7 @@ within a guest component.
 
 ## Prerequisites
 
-* `wasmtime` 37.0.1 or later
+* `wasmtime` 37.0.0 or later
 * `componentize-py` 0.18.0
 * `NumPy`, built for WASI
 
@@ -19,10 +19,10 @@ not yet publish WASI builds.
 
 Below, we use [Rust](https://rustup.rs/)'s `cargo` to install `Wasmtime`.  If
 you don't have `cargo`, you can download and install from
-https://github.com/bytecodealliance/wasmtime/releases/tag/v37.0.1.
+https://github.com/bytecodealliance/wasmtime/releases/tag/v37.0.0.
 
 ```
-cargo install --version 37.0.1 wasmtime-cli
+cargo install --version 37.0.0 wasmtime-cli
 pip install componentize-py==0.18.0
 curl -OL https://github.com/dicej/wasi-wheels/releases/download/v0.0.2/numpy-wasi.tar.gz
 tar xf numpy-wasi.tar.gz

examples/sandbox/README.md

@@ -7,11 +7,11 @@ sandboxed Python code snippets from within a Python app.
 
 ## Prerequisites
 
-* `wasmtime-py` 37.0.1 or later
+* `wasmtime-py` 37.0.0 or later
 * `componentize-py` 0.18.0
 
 ```
-pip install componentize-py==0.18.0 wasmtime==37.0.1
+pip install componentize-py==0.18.0 wasmtime==37.0.0
 ```
 
 ## Running the demo

examples/tcp/README.md

@@ -10,15 +10,15 @@ making an outbound TCP request using `wasi-sockets`.
 
 ## Prerequisites
 
-* `Wasmtime` 37.0.1 or later
+* `Wasmtime` 37.0.0 or later
 * `componentize-py` 0.18.0
 
 Below, we use [Rust](https://rustup.rs/)'s `cargo` to install `Wasmtime`.  If
 you don't have `cargo`, you can download and install from
-https://github.com/bytecodealliance/wasmtime/releases/tag/v37.0.1.
+https://github.com/bytecodealliance/wasmtime/releases/tag/v37.0.0.
 
 ```
-cargo install --version 37.0.1 wasmtime-cli
+cargo install --version 37.0.0 wasmtime-cli
 pip install componentize-py==0.18.0
 ```
 

runtime/Cargo.toml

@@ -10,7 +10,8 @@ crate-type = ["staticlib"]
 anyhow = "1.0.91"
 once_cell = "1.20.2"
 pyo3 = { version="0.26.0", features = ["abi3-py312", "num-bigint"] }
-componentize-py-shared = { path = "../shared" }
 num-bigint = "0.4.6"
 wit-bindgen = { version = "0.40.0", default-features = false, features = ["macros", "realloc"] }
 wit-bindgen-rt = { version = "0.40.0" }
+# TODO: switch to a release when available:
+wit-dylib-ffi = { git = "https://github.com/bytecodealliance/wasm-tools", rev = "b1d8ff59", default-features = false }