Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(deps)!: update marine-rs-sdk-to 0.10.0 #364

Merged
merged 12 commits into from
Sep 13, 2023
Merged

feat(deps)!: update marine-rs-sdk-to 0.10.0 #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9822a51
feat!: update marine-rs-sdk-to 0.9.0
ValeryAntopol Aug 28, 2023
f34caa4
bump versions manually
ValeryAntopol Aug 28, 2023
ddff544
update lockfile
ValeryAntopol Aug 28, 2023
86ceada
update rust toolchain, so wasm-pack can be installed
ValeryAntopol Aug 28, 2023
0978b61
use marine-rs-sdk from git
ValeryAntopol Sep 11, 2023
64b8f77
Merge branch 'master' into feat/update-marine-rs-sdk
ValeryAntopol Sep 11, 2023
11e1d0f
update Cargo.lock
ValeryAntopol Sep 11, 2023
00ea8b7
update sqlite-wasm-connector
ValeryAntopol Sep 13, 2023
aab376a
use marine-rs-sdk 0.10.0
ValeryAntopol Sep 13, 2023
38ac4f9
update marine version in examples
ValeryAntopol Sep 13, 2023
ed4ea1c
update Cargo.lock
ValeryAntopol Sep 13, 2023
60e2344
fmt
ValeryAntopol Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
167 changes: 84 additions & 83 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[workspace]
members = [

"core",
"core/tests/wasm_tests/lilo_after_2gb",
"crates/fluence-app-service",
Expand Down
4 changes: 2 additions & 2 deletions core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "marine-core"
description = "Core of Marine, the Fluence Wasm Runtime"
version = "0.23.0"
version = "0.24.0"
authors = ["Fluence Labs"]
license = "Apache-2.0"
edition = "2021"
Expand All @@ -11,7 +11,7 @@ name = "marine_core"
path = "src/lib.rs"

[dependencies]
marine-module-info-parser = { path = "../crates/module-info-parser", version = "0.8.0" }
marine-module-info-parser = { path = "../crates/module-info-parser", version = "0.9.0" }
marine-it-interfaces = { path = "../crates/it-interfaces", version = "0.8.1" }
marine-it-parser = { path = "../crates/it-parser", version = "0.13.0" }
marine-it-generator = { path = "../crates/it-generator", version = "0.11.0" }
Expand Down
2 changes: 1 addition & 1 deletion core/tests/wasm_tests/lilo_after_2gb/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ name = "lilo_after_2gb"
path = "src/pure.rs"

[dependencies]
marine-rs-sdk ="0.7.0"
marine-rs-sdk = "0.10.0"
safe-transmute = "0.11.0"
4 changes: 2 additions & 2 deletions crates/fluence-app-service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[package]
name = "fluence-app-service"
description = "Fluence Application Service"
version = "0.28.0"
version = "0.29.0"
authors = ["Fluence Labs"]
license = "Apache-2.0"
edition = "2021"

[dependencies]
marine-runtime = { path = "../../marine", version = "0.29.0" }
marine-runtime = { path = "../../marine", version = "0.30.0" }
marine-min-it-version = { path = "../../crates/min-it-version", version = "0.3.0" }
marine-wasm-backend-traits = {path = "../wasm-backend-traits", version = "0.3.0"}
marine-wasmtime-backend = { path = "../wasmtime-backend", version = "0.3.0"}
Expand Down
4 changes: 2 additions & 2 deletions crates/module-info-parser/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "marine-module-info-parser"
description = "Fluence Marine Wasm module info (manifest and version) parser"
version = "0.8.0"
version = "0.9.0"
authors = ["Fluence Labs"]
license = "Apache-2.0"
edition = "2021"
Expand All @@ -11,7 +11,7 @@ name = "marine_module_info_parser"
path = "src/lib.rs"

[dependencies]
marine-rs-sdk-main = "0.8.1"
marine-rs-sdk-main = {version = "0.10.0", default-features = false }

marine-wasm-backend-traits = { path = "../wasm-backend-traits", version = "0.3.0"}

Expand Down
2 changes: 1 addition & 1 deletion examples/call_parameters/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ name = "call_parameters"
path = "src/main.rs"

[dependencies]
marine-rs-sdk ="0.7.0"
marine-rs-sdk = "0.10.0"
2 changes: 1 addition & 1 deletion examples/failing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ name = "failing"
path = "src/main.rs"

[dependencies]
marine-rs-sdk = "0.8.1"
marine-rs-sdk = "0.10.0"
2 changes: 1 addition & 1 deletion examples/greeting/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ name = "greeting"
path = "src/main.rs"

[dependencies]
marine-rs-sdk = "0.8.1"
marine-rs-sdk = "0.10.0"
2 changes: 1 addition & 1 deletion examples/greeting_record/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ name = "greeting-record"
path = "src/main.rs"

[dependencies]
marine-rs-sdk = {version = "0.7.0", features = ["logger"]}
marine-rs-sdk = { version = "0.10.0", features = ["logger"] }
log = "0.4.8"

2 changes: 1 addition & 1 deletion examples/ipfs-node/effector/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ name = "ipfs_effector"
path = "src/main.rs"

[dependencies]
marine-rs-sdk ={ version = "0.7.0", features = ["logger"] }
marine-rs-sdk = { version = "0.10.0", features = ["logger"] }
log = "0.4.14"
2 changes: 1 addition & 1 deletion examples/ipfs-node/pure/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ name = "ipfs_pure"
path = "src/main.rs"

[dependencies]
marine-rs-sdk ={ version = "0.7.0", features = ["logger"] }
marine-rs-sdk = { version = "0.10.0", features = ["logger"] }
log = "0.4.14"
2 changes: 1 addition & 1 deletion examples/motivational-example/donkey/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ name = "donkey"
path = "src/main.rs"

[dependencies]
marine-rs-sdk ={ version = "0.7.0", features = ["logger"] }
marine-rs-sdk = { version = "0.10.0", features = ["logger"] }
2 changes: 1 addition & 1 deletion examples/motivational-example/shrek/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ path = "src/main.rs"
name = "shrek"

[dependencies]
marine-rs-sdk ={ version = "0.7.0", features = ["logger"] }
marine-rs-sdk = { version = "0.10.0", features = ["logger"] }
2 changes: 1 addition & 1 deletion examples/records/effector/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ name = "records_effector"
path = "src/main.rs"

[dependencies]
marine-rs-sdk ="0.7.0"
marine-rs-sdk = "0.10.0"
test-record = { path = "../test-record" }
2 changes: 1 addition & 1 deletion examples/records/pure/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ name = "records_pure"
path = "src/main.rs"

[dependencies]
marine-rs-sdk ="0.7.0"
marine-rs-sdk = "0.10.0"
test-record = { path = "../test-record" }
2 changes: 1 addition & 1 deletion examples/records/test-record/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ name = "test_record"
path = "src/test_record.rs"

[dependencies]
marine-rs-sdk ="0.7.0"
marine-rs-sdk = "0.10.0"
4 changes: 2 additions & 2 deletions examples/sqlite/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ name = "sqlite_test"
path = "src/main.rs"

[dependencies]
marine-rs-sdk = "0.7.1"
marine-sqlite-connector = "0.8.2"
marine-rs-sdk = "0.9.0"
marine-sqlite-connector = "0.9.0"
2 changes: 1 addition & 1 deletion examples/url-downloader/curl_adapter/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ path = "src/main.rs"
name = "curl_adapter"

[dependencies]
marine-rs-sdk ={ version = "0.7.0", features = ["logger"] }
marine-rs-sdk = { version = "0.10.0", features = ["logger"] }
log = "0.4.8"
2 changes: 1 addition & 1 deletion examples/url-downloader/facade/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ name = "facade"
path = "src/main.rs"

[dependencies]
marine-rs-sdk ={ version = "0.7.0", features = ["logger"] }
marine-rs-sdk = { version = "0.10.0", features = ["logger"] }
anyhow = "1.0.31"
log = "0.4.8"
2 changes: 1 addition & 1 deletion examples/url-downloader/local_storage/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name = "local_storage"
path = "src/main.rs"

[dependencies]
marine-rs-sdk ={ version = "0.7.0", features = ["logger"] }
marine-rs-sdk = { version = "0.10.0", features = ["logger"] }
wasm-tracing-allocator = "0.1.0"

log = "0.4.8"
9 changes: 5 additions & 4 deletions marine/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "marine-runtime"
description = "The Fluence Wasm Runtime"
version = "0.29.0"
version = "0.30.0"
authors = ["Fluence Labs"]
license = "Apache-2.0"
edition = "2021"
Expand All @@ -11,11 +11,12 @@ name = "marine"
path = "src/lib.rs"

[dependencies]
marine-core = { path = "../core", version = "0.23.0", default-features = false}
marine-core = { path = "../core", version = "0.24.0", default-features = false}
marine-module-interface = { path = "../crates/module-interface", version = "0.7.1" }
marine-utils = { path = "../crates/utils", version = "0.5.0" }
marine-rs-sdk-main = { version = "0.8.1", features = ["logger"] }
marine-rs-sdk = { version = "0.8.1", features = ["logger"] }
marine-rs-sdk-main = {version = "0.10.0", default-features = false, features = ["logger"] }
marine-rs-sdk = {version = "0.10.0", default-features = false, features = ["logger"] }

it-json-serde = { path = "../crates/it-json-serde", version = "0.4.1" }
marine-wasm-backend-traits = { path = "../crates/wasm-backend-traits", version = "0.3.0"}
marine-wasmtime-backend = { path = "../crates/wasmtime-backend", version = "0.3.0", optional = true}
Expand Down
2 changes: 1 addition & 1 deletion marine/tests/wasm_tests/arguments_passing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ name = "arguments_passing_effector"
path = "src/effector.rs"

[dependencies]
marine-rs-sdk ="0.7.0"
marine-rs-sdk = "0.10.0"
safe-transmute = "0.11.0"
2 changes: 1 addition & 1 deletion marine/tests/wasm_tests/arrays_passing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ name = "arrays_passing_effector"
path = "src/effector.rs"

[dependencies]
marine-rs-sdk ="0.7.0"
marine-rs-sdk = "0.10.0"
safe-transmute = "0.11.0"
2 changes: 1 addition & 1 deletion marine/tests/wasm_tests/records_passing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ name = "records_passing_pure"
path = "src/pure.rs"

[dependencies]
marine-rs-sdk ="0.7.0"
marine-rs-sdk = "0.10.0"
safe-transmute = "0.11.0"
2 changes: 1 addition & 1 deletion marine/tests/wasm_tests/wasi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ name = "wasi_effector"
path = "src/effector.rs"

[dependencies]
marine-rs-sdk ="0.7.0"
marine-rs-sdk = "0.10.0"
safe-transmute = "0.11.0"
2 changes: 1 addition & 1 deletion tools/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ path = "src/main.rs"
[dependencies]
marine-it-generator = { path = "../../crates/it-generator", version = "0.11.0" }
marine-it-parser = { path = "../../crates/it-parser", version = "0.13.0" }
marine-module-info-parser = { path = "../../crates/module-info-parser", version = "0.8.0" }
marine-module-info-parser = { path = "../../crates/module-info-parser", version = "0.9.0" }

cargo_toml = "0.15.2"
cargo-lock = "8.0.3"
Expand Down
4 changes: 2 additions & 2 deletions tools/repl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ name = "mrepl"
path = "src/main.rs"

[dependencies]
fluence-app-service = { path = "../../crates/fluence-app-service", version = "0.28.0", features = ["raw-module-api"] }
marine-rs-sdk-main = { version = "0.8.1", features = ["logger"] }
fluence-app-service = { path = "../../crates/fluence-app-service", version = "0.29.0", features = ["raw-module-api"] }
marine-rs-sdk-main = { version = "0.10.0", default-features = false, features = ["logger"] }
marine-wasm-backend-traits = {path = "../../crates/wasm-backend-traits", version = "0.3.0"}

anyhow = "1.0.71"
Expand Down