mirror of
https://github.com/fluencelabs/marine.git
synced 2025-03-14 13:30:50 +00:00
Merge branch 'master' into better-js-interface
This commit is contained in:
Pavel Murygin
commit
b01209a4ef
126
Cargo.lock
generated
126
Cargo.lock
generated
@ -561,6 +561,16 @@ dependencies = [
|
||||
"darling_macro 0.13.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "darling"
|
||||
version = "0.14.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4529658bdda7fd6769b8614be250cdcfc3aeb0ee72fe66f9e41e5e5eb73eac02"
|
||||
dependencies = [
|
||||
"darling_core 0.14.1",
|
||||
"darling_macro 0.14.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "darling_core"
|
||||
version = "0.10.2"
|
||||
@ -603,6 +613,20 @@ dependencies = [
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "darling_core"
|
||||
version = "0.14.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "649c91bc01e8b1eac09fb91e8dbc7d517684ca6be8ebc75bb9cafc894f9fdb6f"
|
||||
dependencies = [
|
||||
"fnv",
|
||||
"ident_case",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"strsim 0.10.0",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "darling_macro"
|
||||
version = "0.10.2"
|
||||
@ -636,6 +660,17 @@ dependencies = [
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "darling_macro"
|
||||
version = "0.14.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5"
|
||||
dependencies = [
|
||||
"darling_core 0.14.1",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "defer-drop"
|
||||
version = "1.2.0"
|
||||
@ -895,12 +930,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "fluence-app-service"
|
||||
version = "0.20.2"
|
||||
version = "0.21.0"
|
||||
dependencies = [
|
||||
"log",
|
||||
"maplit",
|
||||
"marine-min-it-version 0.1.1",
|
||||
"marine-runtime 0.20.2",
|
||||
"marine-runtime 0.21.0",
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
@ -1315,19 +1350,18 @@ dependencies = [
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"serde_with",
|
||||
"serde_with 1.14.0",
|
||||
"thiserror",
|
||||
"wasmer-interface-types-fl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "it-json-serde"
|
||||
version = "0.3.2"
|
||||
version = "0.3.3"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"serde_with",
|
||||
"thiserror",
|
||||
"wasmer-interface-types-fl",
|
||||
]
|
||||
@ -1496,9 +1530,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "marine-build-rs-generator"
|
||||
version = "0.7.0"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fae9745798ab8f4d88951d018b96bad5ab466f5112511a641212d0099bdc24ba"
|
||||
checksum = "e78114a6ef0fbde6310d8d1f9e9968a0e04bbbc6526f12316c77db8f5e7855a8"
|
||||
dependencies = [
|
||||
"marine-test-macro-impl",
|
||||
]
|
||||
@ -1665,7 +1699,7 @@ dependencies = [
|
||||
"bytesize",
|
||||
"console_error_panic_hook",
|
||||
"fluence-it-types",
|
||||
"it-json-serde 0.3.2",
|
||||
"it-json-serde 0.3.3",
|
||||
"it-lilo",
|
||||
"it-memory-traits",
|
||||
"itertools 0.10.3",
|
||||
@ -1684,7 +1718,6 @@ dependencies = [
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"serde_with",
|
||||
"thiserror",
|
||||
"toml",
|
||||
"wasm-bindgen",
|
||||
@ -1820,9 +1853,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "marine-rs-sdk-test"
|
||||
version = "0.7.0"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b2fbfb5df57ebe16bcc69316b8afa6b0460f29def542d70fcc868b1c8b6256f5"
|
||||
checksum = "a7db2c33b0169aa1fddf88ef51f245a59cd0b288b3710b48172afd139fdecabe"
|
||||
dependencies = [
|
||||
"fluence-app-service 0.18.1",
|
||||
"marine-build-rs-generator",
|
||||
@ -1852,7 +1885,7 @@ dependencies = [
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"serde_with",
|
||||
"serde_with 1.14.0",
|
||||
"thiserror",
|
||||
"toml",
|
||||
"wasmer-interface-types-fl",
|
||||
@ -1863,11 +1896,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "marine-runtime"
|
||||
version = "0.20.2"
|
||||
version = "0.21.0"
|
||||
dependencies = [
|
||||
"bytesize",
|
||||
"env_logger 0.9.0",
|
||||
"it-json-serde 0.3.2",
|
||||
"it-json-serde 0.3.3",
|
||||
"itertools 0.10.3",
|
||||
"log",
|
||||
"marine-core 0.16.2",
|
||||
@ -1881,7 +1914,7 @@ dependencies = [
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"serde_with",
|
||||
"serde_with 2.0.0",
|
||||
"thiserror",
|
||||
"toml",
|
||||
"wasmer-interface-types-fl",
|
||||
@ -1901,9 +1934,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "marine-test-macro"
|
||||
version = "0.7.0"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e43e00c084db67d8d71c4fcde10e329be433f3a2bf633a58ecc4a9d7c8194c58"
|
||||
checksum = "4aa43ebbd26b6fbe1f390cd697c1fac0d6ce99a0e50c1d669e90f10cf9c4abf5"
|
||||
dependencies = [
|
||||
"marine-test-macro-impl",
|
||||
"proc-macro-error",
|
||||
@ -1914,9 +1947,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "marine-test-macro-impl"
|
||||
version = "0.7.0"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ce90a0941b7e9698bce0a1f94260d0ea10f86bcc42570d4a39c0ece813629016"
|
||||
checksum = "e9ba843cfbe262b47b587096caa845860b679ecb4a5c4746011abc5abf9c1ce9"
|
||||
dependencies = [
|
||||
"darling 0.12.4",
|
||||
"fluence-app-service 0.18.1",
|
||||
@ -2010,13 +2043,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mrepl"
|
||||
version = "0.18.3"
|
||||
version = "0.18.4"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"check-latest",
|
||||
"clap",
|
||||
"env_logger 0.9.0",
|
||||
"fluence-app-service 0.20.2",
|
||||
"fluence-app-service 0.21.0",
|
||||
"itertools 0.10.3",
|
||||
"log",
|
||||
"marine-rs-sdk-main",
|
||||
@ -2150,6 +2183,15 @@ dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num_threads"
|
||||
version = "0.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "numtoa"
|
||||
version = "0.1.0"
|
||||
@ -2815,7 +2857,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_with_macros",
|
||||
"serde_with_macros 1.5.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_with"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "89df7a26519371a3cce44fbb914c2819c84d9b897890987fa3ab096491cc0ea8"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"chrono",
|
||||
"hex",
|
||||
"indexmap",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"serde_with_macros 2.0.0",
|
||||
"time 0.3.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2830,6 +2888,18 @@ dependencies = [
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_with_macros"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "de337f322382fcdfbb21a014f7c224ee041a23785651db67b9827403178f698f"
|
||||
dependencies = [
|
||||
"darling 0.14.1",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sha1"
|
||||
version = "0.6.1"
|
||||
@ -3152,6 +3222,18 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"libc",
|
||||
"num_threads",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
version = "0.1.1"
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
[package]
|
||||
name = "fluence-app-service"
|
||||
description = "Fluence Application Service"
|
||||
version = "0.20.2"
|
||||
version = "0.21.0"
|
||||
authors = ["Fluence Labs"]
|
||||
license = "Apache-2.0"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
marine-runtime = { path = "../../marine", version = "0.20.2" }
|
||||
marine-runtime = { path = "../../marine", version = "0.21.0" }
|
||||
marine-min-it-version = { path = "../../crates/min-it-version", version = "0.1.1" }
|
||||
|
||||
maplit = "1.0.2"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "it-json-serde"
|
||||
description = "Fluence Marine interface-types serde tools"
|
||||
version = "0.3.2"
|
||||
version = "0.3.3"
|
||||
authors = ["Fluence Labs"]
|
||||
license = "Apache-2.0"
|
||||
edition = "2018"
|
||||
@ -16,5 +16,4 @@ wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" }
|
||||
serde = { version = "1.0.144", features = ["derive"] }
|
||||
serde_json = "1.0.85"
|
||||
serde_derive = "1.0.144"
|
||||
serde_with = "1.14.0"
|
||||
thiserror = "1.0.33"
|
||||
|
||||
@ -34,7 +34,6 @@ semver = "0.11.0"
|
||||
serde = { version = "1.0.144", features = ["derive"] }
|
||||
serde_json = "1.0.85"
|
||||
serde_derive = "1.0.144"
|
||||
serde_with = "1.14.0"
|
||||
log = "0.4.17"
|
||||
toml = "0.5.9"
|
||||
paste = "1.0.9"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "marine-runtime"
|
||||
description = "The Fluence Wasm Runtime"
|
||||
version = "0.20.2"
|
||||
version = "0.21.0"
|
||||
authors = ["Fluence Labs"]
|
||||
license = "Apache-2.0"
|
||||
edition = "2018"
|
||||
@ -28,7 +28,7 @@ toml = "0.5.9"
|
||||
serde = { version = "1.0.144", features = ["derive"] }
|
||||
serde_json = "1.0.85"
|
||||
serde_derive = "1.0.144"
|
||||
serde_with = "1.14.0"
|
||||
serde_with = "2.0.0"
|
||||
bytesize = {version = "1.1.0", features = ["serde"]}
|
||||
itertools = "0.10.3"
|
||||
log = "0.4.17"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "mrepl"
|
||||
description = "Fluence Marine REPL intended for testing purposes"
|
||||
version = "0.18.3"
|
||||
version = "0.18.4"
|
||||
authors = ["Fluence Labs"]
|
||||
repository = "https://github.com/fluencelabs/marine/tools/repl"
|
||||
license = "Apache-2.0"
|
||||
@ -12,7 +12,7 @@ name = "mrepl"
|
||||
path = "src/main.rs"
|
||||
|
||||
[dependencies]
|
||||
fluence-app-service = { path = "../../crates/fluence-app-service", version = "0.20.2", features = ["raw-module-api"] }
|
||||
fluence-app-service = { path = "../../crates/fluence-app-service", version = "0.21.0", features = ["raw-module-api"] }
|
||||
marine-rs-sdk-main = { version = "0.7.0", features = ["logger"] }
|
||||
|
||||
anyhow = "1.0.63"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user