Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

chore: use released wasmcloud-component-adapters #684

Merged
merged 1 commit into from
Jul 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 0 additions & 2 deletions crates/wash-lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
13 changes: 0 additions & 13 deletions crates/wash-lib/src/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -318,22 +318,9 @@ pub(crate) fn get_wasi_preview2_adapter_bytes(config: &ActorConfig) -> Result<Ve
return std::fs::read(path)
.with_context(|| format!("failed to read wasm bytes from [{}]", path.display()));
}
get_wasi_preview2_adapter_default_bytes()
}

#[cfg(target_family = "unix")]
fn get_wasi_preview2_adapter_default_bytes() -> Result<Vec<u8>> {
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<Vec<u8>> {
bail!("building wasi preview2 components is not yet supported on windows")
}

/// Placeholder for future functionality for building providers
#[allow(unused)]
fn build_provider(
Expand Down
Loading