diff --git a/Cargo.lock b/Cargo.lock index 59e787861..924caf07c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3410,7 +3410,7 @@ dependencies = [ "byteorder", "image", "qrcode", - "ruma-common", + "ruma", "thiserror 2.0.11", "vodozemac", ] diff --git a/Cargo.toml b/Cargo.toml index f38cc0aca..ec293038b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -79,7 +79,6 @@ ruma = { git = "https://github.com/ruma/ruma", rev = "e85e224cef32181029efa106a0 "unstable-msc4286", "unstable-msc4306" ] } -ruma-common = { git = "https://github.com/ruma/ruma", rev = "e85e224cef32181029efa106a059d277ecfbe87d" } sentry = "0.36.0" sentry-tracing = "0.36.0" serde = { version = "1.0.217", features = ["rc"] } diff --git a/crates/matrix-sdk-qrcode/Cargo.toml b/crates/matrix-sdk-qrcode/Cargo.toml index a8786b9f6..6e7b9cab6 100644 --- a/crates/matrix-sdk-qrcode/Cargo.toml +++ b/crates/matrix-sdk-qrcode/Cargo.toml @@ -21,7 +21,7 @@ js = ["vodozemac/js"] [dependencies] byteorder.workspace = true qrcode = { version = "0.14.1", default-features = false } -ruma-common.workspace = true +ruma.workspace = true thiserror.workspace = true vodozemac.workspace = true diff --git a/crates/matrix-sdk-qrcode/src/types.rs b/crates/matrix-sdk-qrcode/src/types.rs index 9053e0af7..da480b318 100644 --- a/crates/matrix-sdk-qrcode/src/types.rs +++ b/crates/matrix-sdk-qrcode/src/types.rs @@ -16,7 +16,7 @@ use std::io::{Cursor, Read}; use byteorder::{BigEndian, ReadBytesExt}; use qrcode::QrCode; -use ruma_common::serde::Base64; +use ruma::serde::Base64; use vodozemac::Ed25519PublicKey; use crate::{ diff --git a/crates/matrix-sdk-qrcode/src/utils.rs b/crates/matrix-sdk-qrcode/src/utils.rs index d39cf002a..9614daa1b 100644 --- a/crates/matrix-sdk-qrcode/src/utils.rs +++ b/crates/matrix-sdk-qrcode/src/utils.rs @@ -13,7 +13,7 @@ // limitations under the License. use qrcode::{bits::Bits, EcLevel, QrCode, Version}; -use ruma_common::serde::Base64; +use ruma::serde::Base64; use vodozemac::Ed25519PublicKey; use crate::error::EncodingError;