From 467cc1c1ef3e5abd42670c686022f3b2c688c5c3 Mon Sep 17 00:00:00 2001 From: Valery Antopol Date: Wed, 21 Feb 2024 18:04:17 +0400 Subject: [PATCH] feat!: update sdk and marine (#117) 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 4157d51..a9e2e49 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -670,9 +670,9 @@ dependencies = [ [[package]] name = "fluence-app-service" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec5358cd011d91885b81539bc36f8f67075cd6bb1bf260c7ab35a7ff31b5870d" +checksum = "7e95950035a16589b5ed736ee920839e475b864965b4e4061e2bc1faaf58f1f2" dependencies = [ "log", "maplit", @@ -1210,10 +1210,21 @@ dependencies = [ ] [[package]] -name = "marine-core" -version = "0.28.0" +name = "marine-call-parameters" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b9a08bd99ea96356abdac57700a58496dc4034d1f48000fb54e532fc5021c8d" +checksum = "05495180730abae04abe209386ce367309a82110edb65fcdb1f3080f819bc1a0" +dependencies = [ + "marine-macro 0.14.0", + "marine-rs-sdk-main 0.14.0", + "serde", +] + +[[package]] +name = "marine-core" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81f40fac4650a022a2ce8d7b6df5614062fc32cb25fb44e61027997e90a3aff6" dependencies = [ "anyhow", "bytesize", @@ -1240,13 +1251,13 @@ dependencies = [ [[package]] name = "marine-it-generator" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64902f7fee0488f2b1e27e8f595772f1a7a386d07f74e55a07def1ad967a64fd" +checksum = "23bdd0119dc71f98e2f0a4bef305e43b9a4d9b9adbead12bc05b0fac1d5a247c" dependencies = [ "it-lilo", "marine-it-parser", - "marine-macro-impl 0.13.0", + "marine-macro-impl 0.14.0", "once_cell", "serde", "serde_json", @@ -1314,6 +1325,16 @@ dependencies = [ "marine-rs-sdk-main 0.13.0", ] +[[package]] +name = "marine-macro" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f502185316f584a9373cceb6ff24a11d260dfd39505c817056bc127cd1a96a08" +dependencies = [ + "marine-macro-impl 0.14.0", + "marine-rs-sdk-main 0.14.0", +] + [[package]] name = "marine-macro-impl" version = "0.10.3" @@ -1353,6 +1374,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "marine-macro-impl" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e50fbc0e70ee4cde7802f0748acfb197d7770c7feffb980ce8c29bddd007519e" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn 1.0.109", +] + [[package]] name = "marine-macro-testing-utils" version = "0.1.0" @@ -1376,14 +1410,14 @@ dependencies = [ [[package]] name = "marine-module-info-parser" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e39ef4b727e6e895b0b53682dc35463e00004aa0089d49797b4f289227ea3b5d" +checksum = "9b312830884d07fc495a43e867d9641163897f0b0b047842cf1172cc61f57075" dependencies = [ "anyhow", "chrono", "derivative", - "marine-rs-sdk-main 0.13.0", + "marine-rs-sdk-main 0.14.0", "marine-wasm-backend-traits", "semver", "serde", @@ -1410,13 +1444,13 @@ dependencies = [ [[package]] name = "marine-rs-sdk" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f33834365d1e6dd041e821a758000f32bed5b960edb09f9d8c61e340dd82e29" +checksum = "f93d2bd852fea1fea8097c195044430347eda98fd6a3752119b549192d5ac4ba" dependencies = [ - "marine-call-parameters 0.13.0", - "marine-macro 0.13.0", - "marine-rs-sdk-main 0.13.0", + "marine-call-parameters 0.14.0", + "marine-macro 0.14.0", + "marine-rs-sdk-main 0.14.0", "marine-timestamp-macro", "serde", ] @@ -1451,6 +1485,16 @@ dependencies = [ "serde", ] +[[package]] +name = "marine-rs-sdk-main" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b79c165fc21438b069babeec5ae36ba0eade5e08fb1d92dabbe6b41014ce841" +dependencies = [ + "log", + "serde", +] + [[package]] name = "marine-rs-sdk-test" version = "0.14.0" @@ -1466,9 +1510,9 @@ dependencies = [ [[package]] name = "marine-runtime" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e26c68703d0dc853790adf27813734a696dc75182a93c2a7b3d24a86eed56254" +checksum = "6c599c7c13e976170a1211e31fe2fb4557e0479cbdba331b19a5a9e87f145f52" dependencies = [ "bytesize", "it-json-serde", @@ -1477,10 +1521,11 @@ dependencies = [ "log", "marine-call-parameters 0.10.3", "marine-call-parameters 0.12.0", + "marine-call-parameters 0.13.0", "marine-core", "marine-module-interface", "marine-rs-sdk", - "marine-rs-sdk-main 0.13.0", + "marine-rs-sdk-main 0.14.0", "marine-utils", "marine-wasm-backend-traits", "marine-wasmtime-backend", @@ -1525,9 +1570,9 @@ dependencies = [ [[package]] name = "marine-timestamp-macro" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5086357724dc2a65e7abe39c85d58b9971198f8678ebc642a69aae1bbc7ae0" +checksum = "d03f267ac0a29f543ef12a1a519ff8d98e74ac66e1c580f2930d41ce2c50507d" dependencies = [ "chrono", "quote", diff --git a/Cargo.toml b/Cargo.toml index 996fa6c..5661f63 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.14.0" } marine-build-rs-generator = { path = "crates/marine-build-rs-generator", version = "=0.14.0" } -fluence-app-service = { version = "0.33.0", features = ["raw-module-api"] } +fluence-app-service = { version = "0.34.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 8fcf466..f613708 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.33.0", features = ["raw-module-api"] } +fluence-app-service = { version = "0.34.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 ffc29f0..63b3f25 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.13.0" +marine-rs-sdk = "0.14.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 4b612ef..83e02bf 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.13.0" +marine-rs-sdk = "0.14.0" diff --git a/examples/multi-service/producer/Cargo.toml b/examples/multi-service/producer/Cargo.toml index 85a0ff1..5bc8bb1 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.13.0" +marine-rs-sdk = "0.14.0" diff --git a/examples/single-service/Cargo.toml b/examples/single-service/Cargo.toml index 0c41129..b5e589b 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.13.0" +marine-rs-sdk = "0.14.0" [dev-dependencies] marine-rs-sdk-test = { path = "../.." }