char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into new-state-store

master
Damir Jelić 2021-01-05 17:03:24 +01:00
parent f3acf582ec 4f2cad8f62
commit ccd8a4d602
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
matrix_sdk/Cargo.toml
View File

@ -8,7 +8,7 @@ license = "Apache-2.0"
name = "matrix-sdk" name = "matrix-sdk"
readme = "README.md" readme = "README.md"
repository = "https://github.com/matrix-org/matrix-rust-sdk" repository = "https://github.com/matrix-org/matrix-rust-sdk"
version = "0.1.0" version = "0.2.0"
[package.metadata.docs.rs] [package.metadata.docs.rs]
features = ["docs"] features = ["docs"]
@ -38,10 +38,10 @@ url = "2.2.0"
zeroize = "1.2.0" zeroize = "1.2.0"
mime = "0.3.16" mime = "0.3.16"
matrix-sdk-common = { version = "0.1.0", path = "../matrix_sdk_common" } matrix-sdk-common = { version = "0.2.0", path = "../matrix_sdk_common" }
[dependencies.matrix-sdk-base] [dependencies.matrix-sdk-base]
version = "0.1.0" version = "0.2.0"
path = "../matrix_sdk_base" path = "../matrix_sdk_base"
default_features = false default_features = false
@ -69,7 +69,7 @@ features = ["wasm-bindgen"]
[dev-dependencies] [dev-dependencies]
async-std = { version = "1.8.0", features = ["unstable"] } async-std = { version = "1.8.0", features = ["unstable"] }
dirs = "3.0.1" dirs = "3.0.1"
matrix-sdk-test = { version = "0.1.0", path = "../matrix_sdk_test" } matrix-sdk-test = { version = "0.2.0", path = "../matrix_sdk_test" }
tokio = { version = "0.2.24", default-features = false, features = ["rt-threaded", "macros"] } tokio = { version = "0.2.24", default-features = false, features = ["rt-threaded", "macros"] }
serde_json = "1.0.61" serde_json = "1.0.61"
tracing-subscriber = "0.2.15" tracing-subscriber = "0.2.15"

8
matrix_sdk_base/Cargo.toml
View File

@ -8,7 +8,7 @@ license = "Apache-2.0"
name = "matrix-sdk-base" name = "matrix-sdk-base"
readme = "README.md" readme = "README.md"
repository = "https://github.com/matrix-org/matrix-rust-sdk" repository = "https://github.com/matrix-org/matrix-rust-sdk"
version = "0.1.0" version = "0.2.0"
[package.metadata.docs.rs] [package.metadata.docs.rs]
features = ["docs"] features = ["docs"]
@ -30,8 +30,8 @@ serde_json = "1.0.61"
zeroize = "1.2.0" zeroize = "1.2.0"
tracing = "0.1.22" tracing = "0.1.22"
matrix-sdk-common = { version = "0.1.0", path = "../matrix_sdk_common" } matrix-sdk-common = { version = "0.2.0", path = "../matrix_sdk_common" }
matrix-sdk-crypto = { version = "0.1.0", path = "../matrix_sdk_crypto", optional = true } matrix-sdk-crypto = { version = "0.2.0", path = "../matrix_sdk_crypto", optional = true }
# Misc dependencies # Misc dependencies
thiserror = "1.0.23" thiserror = "1.0.23"
@ -44,7 +44,7 @@ default-features = false
features = ["sync", "fs"] features = ["sync", "fs"]
[dev-dependencies] [dev-dependencies]
matrix-sdk-test = { version = "0.1.0", path = "../matrix_sdk_test" } matrix-sdk-test = { version = "0.2.0", path = "../matrix_sdk_test" }
http = "0.2.2" http = "0.2.2"
tracing-subscriber = "0.2.15" tracing-subscriber = "0.2.15"
tempfile = "3.1.0" tempfile = "3.1.0"

4
matrix_sdk_common/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
authors = ["Damir Jelić <poljar@termina.org.uk>"] authors = ["Damir Jelić <poljar@termina.org.uk>"]
description = "Collection of common types used in the matrix-sdk" description = "Collection of common types and imports used in the matrix-sdk"
edition = "2018" edition = "2018"
homepage = "https://github.com/matrix-org/matrix-rust-sdk" homepage = "https://github.com/matrix-org/matrix-rust-sdk"
keywords = ["matrix", "chat", "messaging", "ruma", "nio"] keywords = ["matrix", "chat", "messaging", "ruma", "nio"]
@ -8,7 +8,7 @@ license = "Apache-2.0"
name = "matrix-sdk-common" name = "matrix-sdk-common"
readme = "README.md" readme = "README.md"
repository = "https://github.com/matrix-org/matrix-rust-sdk" repository = "https://github.com/matrix-org/matrix-rust-sdk"
version = "0.1.0" version = "0.2.0"
[features] [features]
unstable-synapse-quirks = ["ruma/unstable-synapse-quirks"] unstable-synapse-quirks = ["ruma/unstable-synapse-quirks"]

6
matrix_sdk_crypto/Cargo.toml
View File

@ -8,7 +8,7 @@ license = "Apache-2.0"
name = "matrix-sdk-crypto" name = "matrix-sdk-crypto"
readme = "README.md" readme = "README.md"
repository = "https://github.com/matrix-org/matrix-rust-sdk" repository = "https://github.com/matrix-org/matrix-rust-sdk"
version = "0.1.0" version = "0.2.0"
[package.metadata.docs.rs] [package.metadata.docs.rs]
features = ["docs"] features = ["docs"]
@ -20,7 +20,7 @@ sqlite_cryptostore = ["sqlx"]
docs = ["sqlite_cryptostore"] docs = ["sqlite_cryptostore"]
[dependencies] [dependencies]
matrix-sdk-common = { version = "0.1.0", path = "../matrix_sdk_common" } matrix-sdk-common = { version = "0.2.0", path = "../matrix_sdk_common" }
olm-rs = { version = "1.0.0", features = ["serde"] } olm-rs = { version = "1.0.0", features = ["serde"] }
getrandom = "0.2.1" getrandom = "0.2.1"
@ -54,5 +54,5 @@ proptest = "0.10.1"
serde_json = "1.0.61" serde_json = "1.0.61"
tempfile = "3.1.0" tempfile = "3.1.0"
http = "0.2.2" http = "0.2.2"
matrix-sdk-test = { version = "0.1.0", path = "../matrix_sdk_test" } matrix-sdk-test = { version = "0.2.0", path = "../matrix_sdk_test" }
indoc = "1.0.3" indoc = "1.0.3"

4
matrix_sdk_test/Cargo.toml
View File

@ -8,12 +8,12 @@ license = "Apache-2.0"
name = "matrix-sdk-test" name = "matrix-sdk-test"
readme = "README.md" readme = "README.md"
repository = "https://github.com/matrix-org/matrix-rust-sdk" repository = "https://github.com/matrix-org/matrix-rust-sdk"
version = "0.1.0" version = "0.2.0"
[dependencies] [dependencies]
serde_json = "1.0.61" serde_json = "1.0.61"
http = "0.2.2" http = "0.2.2"
matrix-sdk-common = { version = "0.1.0", path = "../matrix_sdk_common" } matrix-sdk-common = { version = "0.2.0", path = "../matrix_sdk_common" }
matrix-sdk-test-macros = { version = "0.1.0", path = "../matrix_sdk_test_macros" } matrix-sdk-test-macros = { version = "0.1.0", path = "../matrix_sdk_test_macros" }
lazy_static = "1.4.0" lazy_static = "1.4.0"
serde = "1.0.118" serde = "1.0.118"