From 7d6188418832cbae14623f687fc03d577fcad191 Mon Sep 17 00:00:00 2001 From: Valery Antopol Date: Tue, 20 Feb 2024 17:23:00 +0400 Subject: [PATCH] feat!: update marine-rs-sdk and fluence-app-service to support __marine_host_api_v2 (#115) * update marine-rs-sdk and marine * update sdk and marine --- Cargo.lock | 87 ++++++++++++++++------ Cargo.toml | 2 +- crates/marine-test-macro-impl/Cargo.toml | 2 +- examples/build_rs/Cargo.toml | 2 +- examples/multi-service/consumer/Cargo.toml | 2 +- examples/multi-service/producer/Cargo.toml | 2 +- examples/single-service/Cargo.toml | 2 +- 7 files changed, 72 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e1b2818..1513210 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -670,9 +670,9 @@ dependencies = [ [[package]] name = "fluence-app-service" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a778e8164aa18de47e53c65f04f56b8dee7d3a7decef0d76313f41d855d990d2" +checksum = "ec5358cd011d91885b81539bc36f8f67075cd6bb1bf260c7ab35a7ff31b5870d" dependencies = [ "log", "maplit", @@ -1199,10 +1199,21 @@ dependencies = [ ] [[package]] -name = "marine-core" -version = "0.27.0" +name = "marine-call-parameters" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7a647c1c71708d7888f4ffb345c941707834bbd6d045902f87b9d9cb6221f" +checksum = "8d16852b36a3cfc8fa044955380901e78109db0035dc93eea4f666d8f3979072" +dependencies = [ + "marine-macro 0.13.0", + "marine-rs-sdk-main 0.13.0", + "serde", +] + +[[package]] +name = "marine-core" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b9a08bd99ea96356abdac57700a58496dc4034d1f48000fb54e532fc5021c8d" dependencies = [ "anyhow", "bytesize", @@ -1229,13 +1240,13 @@ dependencies = [ [[package]] name = "marine-it-generator" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d2788f00beff11b53596c9bd4b4f0e0e9722e4a3562f87245c0cda9acfb6f2" +checksum = "64902f7fee0488f2b1e27e8f595772f1a7a386d07f74e55a07def1ad967a64fd" dependencies = [ "it-lilo", "marine-it-parser", - "marine-macro-impl 0.12.0", + "marine-macro-impl 0.13.0", "once_cell", "serde", "serde_json", @@ -1293,6 +1304,16 @@ dependencies = [ "marine-rs-sdk-main 0.12.0", ] +[[package]] +name = "marine-macro" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cec2cd19fedf559833d0f1e6a33cbcc5cf0efa338bb0975346ff12538a3cdde4" +dependencies = [ + "marine-macro-impl 0.13.0", + "marine-rs-sdk-main 0.13.0", +] + [[package]] name = "marine-macro-impl" version = "0.10.3" @@ -1319,6 +1340,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "marine-macro-impl" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e09acb3ada67e69a301b6d7b52a915a36176c5eedb312647de7d5b6cf17f51e4" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn 1.0.109", +] + [[package]] name = "marine-macro-testing-utils" version = "0.1.0" @@ -1342,14 +1376,14 @@ dependencies = [ [[package]] name = "marine-module-info-parser" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756f037bef1271185452eb8297435751af31d8c62f7b04841bacf1b24d562c83" +checksum = "e39ef4b727e6e895b0b53682dc35463e00004aa0089d49797b4f289227ea3b5d" dependencies = [ "anyhow", "chrono", "derivative", - "marine-rs-sdk-main 0.12.0", + "marine-rs-sdk-main 0.13.0", "marine-wasm-backend-traits", "semver", "serde", @@ -1376,13 +1410,13 @@ dependencies = [ [[package]] name = "marine-rs-sdk" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7662e4c6c08f7cd1b63cd6ff8e473e3239a9d3dd10fb46bec357cb8331423268" +checksum = "6f33834365d1e6dd041e821a758000f32bed5b960edb09f9d8c61e340dd82e29" dependencies = [ - "marine-call-parameters 0.12.0", - "marine-macro 0.12.0", - "marine-rs-sdk-main 0.12.0", + "marine-call-parameters 0.13.0", + "marine-macro 0.13.0", + "marine-rs-sdk-main 0.13.0", "marine-timestamp-macro", "serde", ] @@ -1407,6 +1441,16 @@ dependencies = [ "serde", ] +[[package]] +name = "marine-rs-sdk-main" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58b487a1a1b288ba06c832942eadb43384cd99c9754c1454e1e061dd9866be92" +dependencies = [ + "log", + "serde", +] + [[package]] name = "marine-rs-sdk-test" version = "0.13.0" @@ -1422,9 +1466,9 @@ dependencies = [ [[package]] name = "marine-runtime" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2daa12b5143d9a152d6ae2f6accdc884887a653a2b259af901df86a6f49833" +checksum = "e26c68703d0dc853790adf27813734a696dc75182a93c2a7b3d24a86eed56254" dependencies = [ "bytesize", "it-json-serde", @@ -1432,10 +1476,11 @@ dependencies = [ "itertools", "log", "marine-call-parameters 0.10.3", + "marine-call-parameters 0.12.0", "marine-core", "marine-module-interface", "marine-rs-sdk", - "marine-rs-sdk-main 0.12.0", + "marine-rs-sdk-main 0.13.0", "marine-utils", "marine-wasm-backend-traits", "marine-wasmtime-backend", @@ -1480,9 +1525,9 @@ dependencies = [ [[package]] name = "marine-timestamp-macro" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47ec0d664570661ecba1feba2dda610ab63f23733edf189dcde7b5ed23966144" +checksum = "1a5086357724dc2a65e7abe39c85d58b9971198f8678ebc642a69aae1bbc7ae0" dependencies = [ "chrono", "quote", diff --git a/Cargo.toml b/Cargo.toml index e5eb3f2..d9512fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ trybuild = "1.0" [dependencies] marine-test-macro = { path = "crates/marine-test-macro", version = "=0.13.0" } marine-build-rs-generator = { path = "crates/marine-build-rs-generator", version = "=0.13.0" } -fluence-app-service = { version = "0.32.0", features = ["raw-module-api"] } +fluence-app-service = { version = "0.33.0", features = ["raw-module-api"] } serde = { version = "1.0.162", features = ["derive"] } serde_json = "1.0.96" diff --git a/crates/marine-test-macro-impl/Cargo.toml b/crates/marine-test-macro-impl/Cargo.toml index 051db15..821a9fd 100644 --- a/crates/marine-test-macro-impl/Cargo.toml +++ b/crates/marine-test-macro-impl/Cargo.toml @@ -14,7 +14,7 @@ license = "Apache-2.0" all-features = true [dependencies] -fluence-app-service = { version = "0.32.0", features = ["raw-module-api"] } +fluence-app-service = { version = "0.33.0", features = ["raw-module-api"] } marine-it-parser = "0.15.0" itertools = "0.10.5" darling = "0.20.1" diff --git a/examples/build_rs/Cargo.toml b/examples/build_rs/Cargo.toml index d1acf3d..b3c4ffe 100644 --- a/examples/build_rs/Cargo.toml +++ b/examples/build_rs/Cargo.toml @@ -12,7 +12,7 @@ name = "build_rs_test" path = "src/main.rs" [dependencies] -marine-rs-sdk = "0.12.0" +marine-rs-sdk = "0.13.0" [dev-dependencies] marine-rs-sdk-test = { path = "../.." } diff --git a/examples/multi-service/consumer/Cargo.toml b/examples/multi-service/consumer/Cargo.toml index ecc16a0..0b0b630 100644 --- a/examples/multi-service/consumer/Cargo.toml +++ b/examples/multi-service/consumer/Cargo.toml @@ -10,4 +10,4 @@ name = "consumer" path = "src/main.rs" [dependencies] -marine-rs-sdk = "0.12.0" +marine-rs-sdk = "0.13.0" diff --git a/examples/multi-service/producer/Cargo.toml b/examples/multi-service/producer/Cargo.toml index 7a7bfb8..73508aa 100644 --- a/examples/multi-service/producer/Cargo.toml +++ b/examples/multi-service/producer/Cargo.toml @@ -10,4 +10,4 @@ name = "producer" path = "src/main.rs" [dependencies] -marine-rs-sdk = "0.12.0" +marine-rs-sdk = "0.13.0" diff --git a/examples/single-service/Cargo.toml b/examples/single-service/Cargo.toml index 37e9ebc..53a604c 100644 --- a/examples/single-service/Cargo.toml +++ b/examples/single-service/Cargo.toml @@ -12,7 +12,7 @@ name = "greeting" path = "src/main.rs" [dependencies] -marine-rs-sdk = "0.12.0" +marine-rs-sdk = "0.13.0" [dev-dependencies] marine-rs-sdk-test = { path = "../.." }