fix dependency conflicts related to wit-bindgen

This temporarily points to my fork of `wit-bindgen` until bytecodealliance/wit-bindgen#700 is merged. Signed-off-by: Joel Dice <joel.dice@fermyon.com>
dicej · Oct 12, 2023 · 2c2156c · 2c2156c
1 parent 9badc77
commit 2c2156c
Show file tree

Hide file tree

Showing 18 changed files with 319 additions and 976 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -116,7 +116,7 @@ wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "c796ce
   "component-model",
 ] }
 wasmtime-wasi-http = { git = "https://github.com/bytecodealliance/wasmtime", rev = "c796ce7376a57a40605f03e74bd78cefcc9acf3a" }
-spin-componentize = { git = "https://github.com/fermyon/spin-componentize", rev = "628412da730b7608cc549cd42ebdfcf781ee418f" }
+spin-componentize = { git = "https://github.com/fermyon/spin-componentize", rev = "02643f88924369b7ada1cf86b675d340e52abc5b" }
 hyper = { version = "=1.0.0-rc.3", features = ["full"] }
 http-body-util = "=0.1.0-rc.2"
 

diff --git a/crates/core/tests/core-wasi-test/Cargo.toml b/crates/core/tests/core-wasi-test/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 debug = true
 
 [dependencies]
-wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "46fba30bb667a3a4962f63b1cc28b84427b49114" }
+# TODO: switch this back to upstream once https://github.com/bytecodealliance/wit-bindgen/pull/700 is merged
+wit-bindgen = { git = "https://github.com/dicej/wit-bindgen", rev = "60195574dc59f9ba56801a0c7fe5bba1382592d1" }
 
 [workspace]