Merge branch 'ruma-0.6'

This commit is contained in:
Jonas Platte 2022-05-27 13:29:43 +02:00
commit 62c4d7ab72
No known key found for this signature in database
GPG key ID: AAA7A61F696C3E0C
10 changed files with 23 additions and 10 deletions

View file

@ -21,7 +21,7 @@ client = []
server = []
[dependencies]
ruma-client-api = { version = "0.14.0", path = "../ruma-client-api", features = ["client"], optional = true }
ruma-client-api = { version = "0.14.1", path = "../ruma-client-api", features = ["client"], optional = true }
ruma-common = { version = "0.9.2", path = "../ruma-common", features = ["api", "events"] }
serde = { version = "1.0.118", features = ["derive"] }
serde_json = "1.0.61"

View file

@ -5,6 +5,8 @@ Breaking changes:
* Remove `PartialEq` implementations for a number of types
* If the lack of such an `impl` causes problems, please open a GitHub issue
# 0.14.1
Improvements:
* Add `From<&UserId>` and `From<&OwnedUserId>` implementations for `UserIdentifier`

View file

@ -7,7 +7,7 @@ license = "MIT"
name = "ruma-client-api"
readme = "README.md"
repository = "https://github.com/ruma/ruma"
version = "0.14.0"
version = "0.14.1"
edition = "2021"
rust-version = "1.59"

View file

@ -42,12 +42,12 @@ hyper-rustls-crate = { package = "hyper-rustls", version = "0.23.0", optional =
hyper-tls = { version = "0.5.0", optional = true }
isahc-crate = { package = "isahc", version = "1.3.1", optional = true }
reqwest = { version = "0.11.4", optional = true, default-features = false }
ruma-client-api = { version = "0.14.0", path = "../ruma-client-api", optional = true, features = ["client"] }
ruma-client-api = { version = "0.14.1", path = "../ruma-client-api", optional = true, features = ["client"] }
ruma-common = { version = "0.9.2", path = "../ruma-common", features = ["api"] }
serde = { version = "1.0.118", features = ["derive"] }
serde_json = "1.0.61"
tracing = { version = "0.1.30", default-features = false, features = ["std"] }
[dev-dependencies]
ruma-client-api = { version = "0.14.0", path = "../ruma-client-api", features = ["client"] }
ruma-client-api = { version = "0.14.1", path = "../ruma-client-api", features = ["client"] }
tokio-stream = "0.1.8"

View file

@ -1,5 +1,16 @@
# [unreleased]
# 0.6.3
Bug fixes:
* Fix serialization and deserialization of events with a dynamic `event_type`
Improvements:
* Add `From<&UserId>` and `From<&OwnedUserId>` implementations for `UserIdentifier`
* Add `UserIdentifier::email` constructor
# 0.6.2
Improvements:

View file

@ -7,7 +7,7 @@ homepage = "https://www.ruma.io/"
repository = "https://github.com/ruma/ruma"
readme = "README.md"
license = "MIT"
version = "0.6.2"
version = "0.6.3"
edition = "2021"
rust-version = "1.59"
@ -187,7 +187,7 @@ ruma-signatures = { version = "0.11.0", path = "../ruma-signatures", optional =
ruma-state-res = { version = "0.7.0", path = "../ruma-state-res", optional = true }
ruma-appservice-api = { version = "0.6.0", path = "../ruma-appservice-api", optional = true }
ruma-client-api = { version = "0.14.0", path = "../ruma-client-api", optional = true }
ruma-client-api = { version = "0.14.1", path = "../ruma-client-api", optional = true }
ruma-federation-api = { version = "0.5.0", path = "../ruma-federation-api", optional = true }
ruma-identity-service-api = { version = "0.5.0", path = "../ruma-identity-service-api", optional = true }
ruma-push-gateway-api = { version = "0.5.0", path = "../ruma-push-gateway-api", optional = true }

View file

@ -5,7 +5,7 @@ edition = "2021"
publish = false
[dependencies]
ruma = { version = "0.6.2", path = "../../crates/ruma", features = ["client-api-c", "client-ext-client-api", "client-isahc", "rand"] }
ruma = { version = "0.6.3", path = "../../crates/ruma", features = ["client-api-c", "client-ext-client-api", "client-isahc", "rand"] }
anyhow = "1.0.37"
isahc = "1.3.1"

View file

@ -5,7 +5,7 @@ edition = "2021"
publish = false
[dependencies]
ruma = { version = "0.6.2", path = "../../crates/ruma", features = ["client-api-c", "client-ext-client-api", "client-hyper-native-tls", "rand"] }
ruma = { version = "0.6.3", path = "../../crates/ruma", features = ["client-api-c", "client-ext-client-api", "client-hyper-native-tls", "rand"] }
anyhow = "1.0.37"
tokio = { version = "1.0.1", features = ["macros", "rt"] }

View file

@ -5,7 +5,7 @@ edition = "2021"
publish = false
[dependencies]
ruma = { version = "0.6.2", path = "../../crates/ruma", features = ["client-api-c", "client-ext-client-api", "client-hyper-native-tls", "rand"] }
ruma = { version = "0.6.3", path = "../../crates/ruma", features = ["client-api-c", "client-ext-client-api", "client-hyper-native-tls", "rand"] }
# For building locally: use the git dependencies below.
# Browse the source at this revision here: https://github.com/ruma/ruma/tree/f161c8117c706fc52089999e1f406cf34276ec9d
# ruma = { git = "https://github.com/ruma/ruma", rev = "f161c8117c706fc52089999e1f406cf34276ec9d", features = ["client-api-c", "client", "client-hyper-native-tls", "events"] }

View file

@ -5,7 +5,7 @@ edition = "2021"
publish = false
[dependencies]
ruma = { version = "0.6.2", path = "../../crates/ruma", features = ["client-api-c", "client-ext-client-api", "client-hyper-native-tls"] }
ruma = { version = "0.6.3", path = "../../crates/ruma", features = ["client-api-c", "client-ext-client-api", "client-hyper-native-tls"] }
anyhow = "1.0.37"
assign = "1.1.1"