diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95a5ec3..55d62db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-13, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/Cargo.lock b/Cargo.lock index 19a64b1..3a688dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -157,9 +157,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" @@ -215,9 +215,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" @@ -633,9 +633,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -649,9 +649,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -659,9 +659,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", @@ -673,9 +673,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", @@ -842,9 +842,9 @@ dependencies = [ [[package]] name = "extism" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2687bfd28990a4725ddaf8a4374bff6d2debfd239d0fd6e55e2a7f476c5aec99" +checksum = "d04edf6dcef24f6b28de8d709c73fabf3577323a8774e30cd03a1a00f35240e1" dependencies = [ "anyhow", "cbindgen", @@ -855,7 +855,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "toml 0.8.13", + "toml 0.8.14", "tracing", "tracing-subscriber", "ureq", @@ -867,12 +867,12 @@ dependencies = [ [[package]] name = "extism-convert" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a63bfc6d371d3b51d6094fd96c4c32a084ceefece3b4f4b328f30067d29da064" +checksum = "b96dda334f4d05d02504c7c6fd8b2a5fb9caf77aea956fd5a25e467d6df4e813" dependencies = [ "anyhow", - "base64 0.22.0", + "base64 0.22.1", "bytemuck", "extism-convert-macros", "prost", @@ -883,9 +883,9 @@ dependencies = [ [[package]] name = "extism-convert-macros" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "519ccf960500c87244bef99caf8e58222ac95bf1abb06a32f5217b4788857aa6" +checksum = "2f542da6bda406e348633328bf13b71c15b08dc14a92b62fb724ac17f0081fe1" dependencies = [ "manyhow", "proc-macro-crate", @@ -896,23 +896,23 @@ dependencies = [ [[package]] name = "extism-manifest" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c7d16695dc6b72418e23b58c943411a08264332af403ae9870997b4d495c3d" +checksum = "97da8e6e2803cc3ac8cde2529e027da013413555c421edfabddbf8a637f52548" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "serde", "serde_json", ] [[package]] name = "extism-pdk" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f9a87d636d30b75e697642dd4f6cff2054db5a7a5d69d6601041a76265bb681" +checksum = "c26a361aeddab8ebbb6157eeed9a8341358d6843c5f5a53677466caf5f0b5eaf" dependencies = [ "anyhow", - "base64 0.21.7", + "base64 0.22.1", "extism-convert", "extism-manifest", "extism-pdk-derive", @@ -922,9 +922,9 @@ dependencies = [ [[package]] name = "extism-pdk-derive" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d83995c2023720a0fd5ef2a349c89c1670efb37a979228b0218705f5ddb50d4b" +checksum = "3a024b0f20295098d1d19ad443fad077c1d8c1d81d09a2c20f0618ebd201517e" dependencies = [ "proc-macro2", "quote", @@ -1600,11 +1600,17 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lzma-sys" @@ -1666,9 +1672,9 @@ checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memfd" @@ -1805,27 +1811,6 @@ dependencies = [ "libc", ] -[[package]] -name = "num_enum" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "object" version = "0.32.2" @@ -2062,12 +2047,11 @@ dependencies = [ [[package]] name = "proto_core" -version = "0.35.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c762a3fc2461cfcbed5169dcd20512a38491e02ead9c946628f6fa698188012" +checksum = "24ed8c482d67030af431250b71785a2d94fff9c9d189ab04851f7ef97d161f0a" dependencies = [ "cached", - "human-sort", "indexmap 2.2.6", "miette", "minisign-verify", @@ -2087,7 +2071,6 @@ dependencies = [ "starbase_events", "starbase_styles", "starbase_utils", - "system_env", "thiserror", "tracing", "url", @@ -2098,9 +2081,9 @@ dependencies = [ [[package]] name = "proto_pdk" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14625e6a19b3904f616d5d0041b30e16a922ada09e5b4e7b32d6622ebdee0e9b" +checksum = "4a0cdbc3e9a79af9604fcad65dc16b8478d317ab0f6acd583ebb13edc2ade7be" dependencies = [ "extism-pdk", "proto_pdk_api", @@ -2111,9 +2094,9 @@ dependencies = [ [[package]] name = "proto_pdk_api" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a919534a8bbb6b667a5c866e26bc442194d58c9b5a3d6f946d98c73dd29437ed" +checksum = "faa4b628780934f3184277dcde34e0be5a11aafa4b8a987c9b3123cb52ccdb7f" dependencies = [ "rustc-hash", "semver", @@ -2127,11 +2110,10 @@ dependencies = [ [[package]] name = "proto_pdk_test_utils" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b1c9e7b55e456f629ae32e84d3fe03ed7ab5bcea15c39c52c1f99644cba663" +checksum = "3ba0dfb99e075d567287ed748dcf45c0038bab768cfe95786828b95bf7412625" dependencies = [ - "extism", "proto_core", "proto_pdk_api", "serde", @@ -2142,9 +2124,9 @@ dependencies = [ [[package]] name = "proto_shim" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b9bcdc4ca89c9f457eae2c50e03154ddd6deb7b40593b7456786ba7d4935954" +checksum = "88ee42b1824bc24b6a9e2d7f9744f0fda67de2c1fbd4d5acd3a12098525d4929" dependencies = [ "command-group", "dirs 5.0.1", @@ -2307,7 +2289,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "bytes", "encoding_rs", "futures-core", @@ -2453,7 +2435,7 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "rustls-pki-types", ] @@ -2516,9 +2498,9 @@ dependencies = [ [[package]] name = "schematic" -version = "0.15.2" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb426f2d2532207066880373c8ce4563d6081aba7f5f0fe0238ca472da77497" +checksum = "a2a97356d9a387d6963940ab05de6ac9dbee0c3c97090247954c3d4c2ddc5b8d" dependencies = [ "garde", "indexmap 2.2.6", @@ -2529,15 +2511,15 @@ dependencies = [ "serde_path_to_error", "starbase_styles", "thiserror", - "toml 0.8.13", + "toml 0.8.14", "tracing", ] [[package]] name = "schematic_macros" -version = "0.15.1" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a7224975c12290c2e152c0554cfbb936018de66b480e82067fc7eaf0153652" +checksum = "906eff11b3963e20f5d33fb6dfc67d84351769917970c0d7ebf86e1782d869b5" dependencies = [ "convert_case", "darling", @@ -2548,13 +2530,14 @@ dependencies = [ [[package]] name = "schematic_types" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c881455700a86164b6c578b4cbbef17eac2fbcc0cb51c4473edda11161f8efd" +checksum = "788660c0972a2aab386e2b4b8bd304e0b21c21751e2722cead28d059597d3dad" dependencies = [ "indexmap 2.2.6", "serde_json", - "toml 0.8.13", + "toml 0.8.14", + "url", ] [[package]] @@ -2711,6 +2694,12 @@ dependencies = [ "libc", ] +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "similar" version = "2.4.0" @@ -2768,9 +2757,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "starbase_archive" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f93b74e21c0a0898b34801b248aa59c12af6cb28e1acd9255387b1d4e7f024" +checksum = "54d347cbbd17a64ae97be309a1afaf86a3db4c46859ec1d111befe495ce5276e" dependencies = [ "binstall-tar", "flate2", @@ -2811,9 +2800,9 @@ dependencies = [ [[package]] name = "starbase_sandbox" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4527717975a09f1eea17706fe771e76de32e55632bcb67b871b5f389dc5b6f21" +checksum = "9dc8cc21fc2c389549297a2049074bf22a34aceb8ed8d31be6e1df42648abcb8" dependencies = [ "assert_cmd", "assert_fs", @@ -2838,9 +2827,9 @@ dependencies = [ [[package]] name = "starbase_utils" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1746271ce4694b6ab794c10494cbb03fac22c643e5f706a46a60975fb9318b2" +checksum = "036e612de9948748656e525a0464c0866b2471616a65d8131db7ad6a200a0db0" dependencies = [ "dirs 5.0.1", "fs4", @@ -2854,7 +2843,7 @@ dependencies = [ "starbase_styles", "thiserror", "tokio", - "toml 0.8.13", + "toml 0.8.14", "tracing", "url", "wax", @@ -2868,9 +2857,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" @@ -2954,9 +2943,9 @@ dependencies = [ [[package]] name = "system_env" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f5ebaa3f28bef9be9e986a72937103a9fb4659e8da6170706936a9a80d1a304" +checksum = "2c064041fa3a15e81801a7853412a5188d0796e7638b0a9578dd72a52d03304d" dependencies = [ "schematic", "serde", @@ -3037,9 +3026,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -3056,9 +3045,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", @@ -3101,14 +3090,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.13", + "toml_edit 0.22.14", ] [[package]] @@ -3133,9 +3122,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.13" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap 2.2.6", "serde", @@ -3315,6 +3304,7 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] @@ -3340,9 +3330,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "version_spec" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd5948fd42878c5fcaf8afe91cd7ee22ca36da7b99a61fdf9123fe60b898a69" +checksum = "5cb928fc92912272002d6cc0c484d345867936785dec98ee16aae18429793550" dependencies = [ "human-sort", "regex", @@ -3381,9 +3371,9 @@ dependencies = [ [[package]] name = "warpgate" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a7c6ef5c29ba1cee1d7616da20415471e03816ea1bb6e1907705fbe2294797" +checksum = "2506eb3a4dbb45af4e2e409055483f904ed56f20943e43442ae1eb85b75df924" dependencies = [ "extism", "miette", @@ -3391,7 +3381,6 @@ dependencies = [ "once_map", "regex", "reqwest", - "rustc-hash", "schematic", "serde", "serde_json", @@ -3407,9 +3396,9 @@ dependencies = [ [[package]] name = "warpgate_api" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bdd9d3f91f9c38b90c34fb9c893ce656383f5465bce3ea6c56825df0f3afd45" +checksum = "06b88df2c2215ce9236dbf8da85a66d4c27810fec26e370ff416b5a13d1d182b" dependencies = [ "anyhow", "rustc-hash", @@ -3422,9 +3411,9 @@ dependencies = [ [[package]] name = "warpgate_pdk" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f1b738dbd3be1d299c162ea57dbae8c5af345fc2df0f76886975f559981f507" +checksum = "ed1de6614f14a2ca8fe4513b8a35c64dc8010be55206b2120cc1c1cf8802e5ce" dependencies = [ "extism-pdk", "serde", @@ -4347,7 +4336,7 @@ checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zig_plugin" -version = "0.5.0" +version = "0.5.1" dependencies = [ "extism-pdk", "proto_pdk", @@ -4359,9 +4348,9 @@ dependencies = [ [[package]] name = "zip" -version = "1.1.4" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" +checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39" dependencies = [ "arbitrary", "crc32fast", @@ -4369,8 +4358,23 @@ dependencies = [ "displaydoc", "flate2", "indexmap 2.2.6", - "num_enum", + "memchr", "thiserror", + "zopfli", +] + +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 46f33c4..4675045 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zig_plugin" -version = "0.5.0" +version = "0.5.1" edition = "2021" license = "MIT" publish = false @@ -9,14 +9,14 @@ publish = false crate-type = ['cdylib'] [dependencies] -extism-pdk = "1.1.0" -proto_pdk = "0.18.0" -serde = "1.0.200" +extism-pdk = "1.2.0" +proto_pdk = "0.20.0" +serde = "1.0.203" [dev-dependencies] -proto_pdk_test_utils = "0.22.0" -starbase_sandbox = "0.6.0" -tokio = { version = "1.37.0", features = ["full"] } +proto_pdk_test_utils = "0.24.0" +starbase_sandbox = "0.6.2" +tokio = { version = "1.38.0", features = ["full"] } [features] default = ["wasm"] diff --git a/tests/versions_test.rs b/tests/versions_test.rs index 32d3152..9a64669 100644 --- a/tests/versions_test.rs +++ b/tests/versions_test.rs @@ -3,7 +3,7 @@ use proto_pdk_test_utils::*; generate_resolve_versions_tests!("zig-test", { "0.10" => "0.10.1", "0.11.0" => "0.11.0", - "0" => "0.12.0", + "0" => "0.13.0", }); #[test]