Merge branch 'master' into new-state-store
This commit is contained in:
commit
ccd8a4d602
5 changed files with 15 additions and 15 deletions
|
@ -8,7 +8,7 @@ license = "Apache-2.0"
|
|||
name = "matrix-sdk"
|
||||
readme = "README.md"
|
||||
repository = "https://github.com/matrix-org/matrix-rust-sdk"
|
||||
version = "0.1.0"
|
||||
version = "0.2.0"
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
features = ["docs"]
|
||||
|
@ -38,10 +38,10 @@ url = "2.2.0"
|
|||
zeroize = "1.2.0"
|
||||
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]
|
||||
version = "0.1.0"
|
||||
version = "0.2.0"
|
||||
path = "../matrix_sdk_base"
|
||||
default_features = false
|
||||
|
||||
|
@ -69,7 +69,7 @@ features = ["wasm-bindgen"]
|
|||
[dev-dependencies]
|
||||
async-std = { version = "1.8.0", features = ["unstable"] }
|
||||
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"] }
|
||||
serde_json = "1.0.61"
|
||||
tracing-subscriber = "0.2.15"
|
||||
|
|
|
@ -8,7 +8,7 @@ license = "Apache-2.0"
|
|||
name = "matrix-sdk-base"
|
||||
readme = "README.md"
|
||||
repository = "https://github.com/matrix-org/matrix-rust-sdk"
|
||||
version = "0.1.0"
|
||||
version = "0.2.0"
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
features = ["docs"]
|
||||
|
@ -30,8 +30,8 @@ serde_json = "1.0.61"
|
|||
zeroize = "1.2.0"
|
||||
tracing = "0.1.22"
|
||||
|
||||
matrix-sdk-common = { version = "0.1.0", path = "../matrix_sdk_common" }
|
||||
matrix-sdk-crypto = { version = "0.1.0", path = "../matrix_sdk_crypto", optional = true }
|
||||
matrix-sdk-common = { version = "0.2.0", path = "../matrix_sdk_common" }
|
||||
matrix-sdk-crypto = { version = "0.2.0", path = "../matrix_sdk_crypto", optional = true }
|
||||
|
||||
# Misc dependencies
|
||||
thiserror = "1.0.23"
|
||||
|
@ -44,7 +44,7 @@ default-features = false
|
|||
features = ["sync", "fs"]
|
||||
|
||||
[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"
|
||||
tracing-subscriber = "0.2.15"
|
||||
tempfile = "3.1.0"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
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"
|
||||
homepage = "https://github.com/matrix-org/matrix-rust-sdk"
|
||||
keywords = ["matrix", "chat", "messaging", "ruma", "nio"]
|
||||
|
@ -8,7 +8,7 @@ license = "Apache-2.0"
|
|||
name = "matrix-sdk-common"
|
||||
readme = "README.md"
|
||||
repository = "https://github.com/matrix-org/matrix-rust-sdk"
|
||||
version = "0.1.0"
|
||||
version = "0.2.0"
|
||||
|
||||
[features]
|
||||
unstable-synapse-quirks = ["ruma/unstable-synapse-quirks"]
|
||||
|
|
|
@ -8,7 +8,7 @@ license = "Apache-2.0"
|
|||
name = "matrix-sdk-crypto"
|
||||
readme = "README.md"
|
||||
repository = "https://github.com/matrix-org/matrix-rust-sdk"
|
||||
version = "0.1.0"
|
||||
version = "0.2.0"
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
features = ["docs"]
|
||||
|
@ -20,7 +20,7 @@ sqlite_cryptostore = ["sqlx"]
|
|||
docs = ["sqlite_cryptostore"]
|
||||
|
||||
[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"] }
|
||||
getrandom = "0.2.1"
|
||||
|
@ -54,5 +54,5 @@ proptest = "0.10.1"
|
|||
serde_json = "1.0.61"
|
||||
tempfile = "3.1.0"
|
||||
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"
|
||||
|
|
|
@ -8,12 +8,12 @@ license = "Apache-2.0"
|
|||
name = "matrix-sdk-test"
|
||||
readme = "README.md"
|
||||
repository = "https://github.com/matrix-org/matrix-rust-sdk"
|
||||
version = "0.1.0"
|
||||
version = "0.2.0"
|
||||
|
||||
[dependencies]
|
||||
serde_json = "1.0.61"
|
||||
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" }
|
||||
lazy_static = "1.4.0"
|
||||
serde = "1.0.118"
|
||||
|
|
Loading…
Reference in a new issue