diff --git a/Cargo.lock b/Cargo.lock index 221969f5..5638f055 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4600,7 +4600,8 @@ dependencies = [ [[package]] name = "wasmcloud-component-adapters" version = "0.1.0" -source = "git+https://github.com/wasmCloud/wasmcloud-component-adapters#f8aa1a3b53155c02be884f88967721753d2d36fd" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4bb225223a158ee1562fe3417fd34328b9e585f82a96b7f06622c404512073f" dependencies = [ "anyhow", "base64 0.21.2", diff --git a/Cargo.toml b/Cargo.toml index aed49258..40568f81 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -148,9 +148,9 @@ walkdir = "2.3" wascap = "0.11.0" wash-lib = { version = "0.9.0", path = "./crates/wash-lib" } wasmbus-rpc = "0.14.0" -wasmcloud-component-adapters = { git = "https://github.com/wasmCloud/wasmcloud-component-adapters" } +wasmcloud-component-adapters = { version = "0.1.0" } wasmcloud-control-interface = "0.27" wasmcloud-test-util = "0.10.0" weld-codegen = "0.7.0" which = "4.4.0" -wit-component = "0.13.0" +wit-component = "0.13.0" diff --git a/crates/wash-lib/Cargo.toml b/crates/wash-lib/Cargo.toml index 10e49327..042d1ccf 100644 --- a/crates/wash-lib/Cargo.toml +++ b/crates/wash-lib/Cargo.toml @@ -69,8 +69,6 @@ wasmcloud-control-interface = { workspace = true } weld-codegen = { workspace = true } wasmbus-rpc = { workspace = true } wit-component = { workspace = true } - -[target.'cfg(unix)'.dependencies] wasmcloud-component-adapters = { workspace = true } [dev-dependencies] diff --git a/crates/wash-lib/src/build.rs b/crates/wash-lib/src/build.rs index 806ecea7..c4124a4f 100644 --- a/crates/wash-lib/src/build.rs +++ b/crates/wash-lib/src/build.rs @@ -318,22 +318,9 @@ pub(crate) fn get_wasi_preview2_adapter_bytes(config: &ActorConfig) -> Result Result> { Ok(wasmcloud_component_adapters::WASI_PREVIEW1_REACTOR_COMPONENT_ADAPTER.into()) } -/// Bytes from wasmcloud_component_adapters cannot be used on -/// windows yet due to a lack of support of a dependency (nix-nar) for building on windows. -/// This can be removed once `wasmcloud_component_adapters` builds on windows. -#[cfg(target_family = "windows")] -fn get_wasi_preview2_adapter_default_bytes() -> Result> { - bail!("building wasi preview2 components is not yet supported on windows") -} - /// Placeholder for future functionality for building providers #[allow(unused)] fn build_provider(